diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index bb8f7892cf..519da4faa9 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,34 +2,34 @@ - Only RetroArch bugs should be filed here. Not core bugs or game bugs - This is not a forum or a help section, this is strictly developer oriented -## Description - -[Description of the bug] - -### Expected behavior - -[What you expected to happen] - -### Actual behavior - -[What is actually happening] - -### Steps to reproduce the bug - -1. [First step] -2. [Second step] -3. [and so on...] - -### Bisect Results +## Description + +[Description of the bug] + +### Expected behavior + +[What you expected to happen] + +### Actual behavior + +[What is actually happening] + +### Steps to reproduce the bug + +1. [First step] +2. [Second step] +3. [and so on...] + +### Bisect Results + +[Try to bisect and tell us when this started happening] + +### Version/Commit +You can find this information under Information/System Information + +- RetroArch: [version/commit] + +### Environment information -[Try to bisect and tell us when this started happening] - -### Version/Commit -You can find this information under Information/System Information - -- RetroArch: [version/commit] - -### Environment information - - OS: [The operating system you're running] -- Compiler: [In case you are running local builds] +- Compiler: [In case you are running local builds] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 00a283e2ad..50c5bd7989 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,7 +4,6 @@ 2. If you are sending several unrelated fixes or features, use a branch and a separate pull request for each 3. If possible try squashing everything in a single commit. This is particularly beneficial in the case of feature merges since it allows easy bisecting when a problem arises - ## Description [Description of the pull request, detail any issues you are fixing or any features you are implementing] diff --git a/.gitignore b/.gitignore index e50728c20d..2a54e52181 100644 --- a/.gitignore +++ b/.gitignore @@ -87,7 +87,6 @@ wiiu/wut/elf2rpl/elf2rpl /pkg/wiiu/rpx /wiiu-devel.properties - # 3ds /.lst *.3dsx diff --git a/.vscode/launch.json b/.vscode/launch.json index d55f87de4e..62f380d489 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -24,7 +24,7 @@ } ] }, - { + { "name": "(gdb) Attach", "type": "cppdbg", "request": "attach", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a90e515b1b..e34d4bc668 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -45,7 +45,7 @@ "group": { "kind": "build", - "isDefault": true + "isDefault": true }, "command": "./configure; make -j2", diff --git a/10bpc-gl.diff b/10bpc-gl.diff index 9436f12f82..17e1878b10 100644 --- a/10bpc-gl.diff +++ b/10bpc-gl.diff @@ -48,7 +48,7 @@ index b90a8e40c3..e57c4df194 100644 +#endif + #endif - + #if defined(HAVE_OPENGL) @@ -313,6 +354,43 @@ static void create_gl_context(HWND hwnd, bool *quit) RARCH_LOG("[WGL]: Adaptive VSync supported.\n"); diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6ed2410576..faeca1adf3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,58 +1,58 @@ -# Contributing to RetroArch - -If you are a developer and want to contribute to the development of RetroArch, please read this. -If you have found a bug and want to submit a minor patch or a bug report, please read this as well. - -# Submitting a bug report -When submitting a bug report, make sure that the bug is local to RetroArch. -A bug in a libretro core or something deemed to be external is likely to be closed very fast. -If you still suspect a bug in RetroArch, make sure to test with several cores to make sure. - -If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure, -as well as config.log and shell output of make. If building on Windows, just paste shell output of make. - -If the issue occurs during runtime, make sure to paste RetroArch's verbose log. -If using Phoenix frontend, you can find log in (File -> Show Log) after running. -In console, make sure to run with verbose (-v) flag. - -# Pull Requests -Outside contributions are generally only accepted in the form of a pull request. The process is very simple. -Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser. -The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time, -note that it's possible to continue pushing up commits to your branch. - -If you want to develop a larger feature, -we'd like to discuss this first (ideally on IRC) so that you don't risk developing something -that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so. - -## libretro API -If you wish to add functionality to libretro's API, it can take some time to merge in, because changes -to libretro API will affect other projects as well, and we highly value API/ABI stability. -Features will only be added when deemed *necessary* for a concrete libretro core to function properly. -Features will not be added on basis of hypothetical libretro implementations. - -# Coding style -Having a consistent code style throughout the code base is highly valued. -Please look through the code to get a feel for the coding style. -A pull request may be asked to fix the coding style before submission. -In other cases, a pull request may be followed up with a "style nit commit". - -## Non-obvious things: - - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99. - - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions. - - Using deprecated APIs is discouraged. - -# Copyright Headers and AUTHORS -If you have contributed to a part of a source file (a chunk of code that's written by you), -you should add yourself to the copyright header in that file. -If you have contributed significantly -(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file. -We'd like your full name and email, and which features you have been part of. - -# IRC -Active development happens on IRC. (#retroarch @ irc.freenode.org) -We value discussing things in "real-time". - -# Commit Access -Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo. +# Contributing to RetroArch + +If you are a developer and want to contribute to the development of RetroArch, please read this. +If you have found a bug and want to submit a minor patch or a bug report, please read this as well. + +# Submitting a bug report +When submitting a bug report, make sure that the bug is local to RetroArch. +A bug in a libretro core or something deemed to be external is likely to be closed very fast. +If you still suspect a bug in RetroArch, make sure to test with several cores to make sure. + +If you have troubles building RetroArch on Linux/BSD/OSX, make sure to paste shell output of ./configure, +as well as config.log and shell output of make. If building on Windows, just paste shell output of make. + +If the issue occurs during runtime, make sure to paste RetroArch's verbose log. +If using Phoenix frontend, you can find log in (File -> Show Log) after running. +In console, make sure to run with verbose (-v) flag. + +# Pull Requests +Outside contributions are generally only accepted in the form of a pull request. The process is very simple. +Fork RetroArch, make your changes, and issue a pull request on GitHub. This can all be done within the browser. +The changes are reviewed, and might be merged in. If the pull request isn't acceptable at the time, +note that it's possible to continue pushing up commits to your branch. + +If you want to develop a larger feature, +we'd like to discuss this first (ideally on IRC) so that you don't risk developing something +that won't be merged. A pull request with a proof-of-concept is fine, but please indicate so. + +## libretro API +If you wish to add functionality to libretro's API, it can take some time to merge in, because changes +to libretro API will affect other projects as well, and we highly value API/ABI stability. +Features will only be added when deemed *necessary* for a concrete libretro core to function properly. +Features will not be added on basis of hypothetical libretro implementations. + +# Coding style +Having a consistent code style throughout the code base is highly valued. +Please look through the code to get a feel for the coding style. +A pull request may be asked to fix the coding style before submission. +In other cases, a pull request may be followed up with a "style nit commit". + +## Non-obvious things: + - Code should be both ISO C99 and ISO C++ compatible. This dual requirement is for XBox360 and MSVC in general. Think of it as a C++ compatible subset of C99. + - Warnings are not allowed (-Wall). Make sure your code is warning-free. Note that warning sensitivity differs a bit across compiler versions. + - Using deprecated APIs is discouraged. + +# Copyright Headers and AUTHORS +If you have contributed to a part of a source file (a chunk of code that's written by you), +you should add yourself to the copyright header in that file. +If you have contributed significantly +(a feature, a contribution you can "name", e.g. "Added audio driver foo"), you should add yourself to AUTHORS file. +We'd like your full name and email, and which features you have been part of. + +# IRC +Active development happens on IRC. (#retroarch @ irc.freenode.org) +We value discussing things in "real-time". + +# Commit Access +Contributors who show a track record of making good pull requests over time will eventually get commit access to the repo. This typically happens when the "overhead" of looking through pull requests over time becomes a burden. \ No newline at end of file diff --git a/Makefile.apple b/Makefile.apple index 8e7ae5f49a..06c52752ac 100644 --- a/Makefile.apple +++ b/Makefile.apple @@ -19,6 +19,6 @@ $(foreach x,$(join $(addsuffix :,$(MOC_SRC)),$(MOC_HEADERS)),$(eval $x)) generate: $(MOC_SRC) @echo $(MOC_SRC) - + print-%: - @echo '$*=$($*)' \ No newline at end of file + @echo '$*=$($*)' diff --git a/Makefile.classic_armv7_a7 b/Makefile.classic_armv7_a7 index ce76bb4242..77de755857 100644 --- a/Makefile.classic_armv7_a7 +++ b/Makefile.classic_armv7_a7 @@ -1,7 +1,7 @@ # This build was put together and is maintained by ModMyClassic.com for Libretro. # The purpose is to give Libretro a proper "official" build platform for classic consoles. # If you need any help in building for the classics or have any questions then please visit -# https://modmyclassic.com/comp and we will help in any way possible! +# https://modmyclassic.com/comp and we will help in any way possible! # Building Prerequisites ############## # arm-linux-gnueabihf-gcc-8 @@ -79,7 +79,7 @@ retroarch: rm -fr /tmp/$(HAKCHI_DIR) #clean up tmp #COMMODORE 64 MINI BUILD (WIP) - + #Clean down dirty files rm -f version.all version.dtd mv version_BACKUP.all version.all && mv version_BACKUP.dtd version.dtd diff --git a/Makefile.common b/Makefile.common index aea2d6d4c2..cd819e1ea7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -510,7 +510,6 @@ endif # Audio - ifeq ($(HAVE_COREAUDIO), 1) OBJ += audio/drivers/coreaudio.o HAVE_COREAUDIO_LIBS = 1 @@ -681,7 +680,7 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1) ifeq ($(HAVE_XMB),) HAVE_XMB = 1 endif - + ifeq ($(HAVE_STRIPES),) HAVE_STRIPES = 0 endif @@ -1535,8 +1534,6 @@ ifeq ($(HAVE_CHD), 1) $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \ $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_huffman.o \ $(LIBRETRO_COMM_DIR)/streams/chd_stream.o - - OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_zlib.o ifeq ($(HAVE_FLAC),1) diff --git a/Makefile.ctr.salamander b/Makefile.ctr.salamander index 090f4a0c04..d96177ff2b 100644 --- a/Makefile.ctr.salamander +++ b/Makefile.ctr.salamander @@ -40,7 +40,7 @@ OBJ := ctr/ctr_system.o \ libretro-common/hash/rhash.o \ file_path_str.o \ verbosity.o - + OBJ += ctr/exec-3dsx/exec_cia.o \ ctr/exec-3dsx/exec_3dsx.o \ ctr/exec-3dsx/mini-hb-menu/launch.o \ diff --git a/Makefile.griffin b/Makefile.griffin index c77f6c73c1..52da48a8ed 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -112,7 +112,7 @@ else ifeq ($(libogc_platform), 1) EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf INCLUDE += -I. -I$(DEVKITPRO)/libogc/include -Ideps/libz -Iwii/libogc/include - + ifeq ($(EXTERNAL_LIBOGC), 1) CFLAGS += -DEXTERNAL_LIBOGC CXXFLAGS += -DEXTERNAL_LIBOGC @@ -384,7 +384,7 @@ else ifeq ($(platform), windows_msvc2003_x86) PLATCFLAGS += -D_WIN32 -DWINVER=0x0400 -D_WIN32_WINNT=0x0400 -D__STDC_CONSTANT_MACROS -D_MBCS -D_VC80_UPGRADE=0x0710 LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib - + PATH := $(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../../Vc7/bin"):$(PATH) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS71COMNTOOLS)../IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS71COMNTOOLS)../../Vc7/include") @@ -432,7 +432,7 @@ else ifeq ($(platform), windows_msvc2005_x86) PLATCFLAGS += -D_WIN32 -D_WIN32_WINNT=0x0410 -D__STDC_CONSTANT_MACROS -D_MBCS -DHAVE_EASTEREGG LDFLAGS += shell32.lib user32.lib gdi32.lib comdlg32.lib winmm.lib ole32.lib msimg32.lib - + PATH := $(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../../VC/bin"):$(PATH) PATH := $(PATH):$(shell IFS=$$'\n'; cygpath "$(VS80COMNTOOLS)../IDE") INCLUDE := $(shell IFS=$$'\n'; cygpath -w "$(VS80COMNTOOLS)../../VC/include") @@ -766,7 +766,7 @@ else CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(PLATCFLAGS) $(INCLUDE) INCLUDE += -I./libretro-common/include \ -Ideps \ - -Ideps/stb + -Ideps/stb endif OBJ = griffin/griffin.o $(PLATOBJS) @@ -973,8 +973,8 @@ ifneq (,$(findstring msvc,$(platform))) LINKOUT = -out: LINK = link.exe else - OBJOUT = -o - LINKOUT = -o + OBJOUT = -o + LINKOUT = -o LINK = $(CXX) endif diff --git a/Makefile.libnx b/Makefile.libnx index df8a4de7cc..2ef3bb6dd0 100644 --- a/Makefile.libnx +++ b/Makefile.libnx @@ -17,9 +17,9 @@ DEBUG ?= 0 WHOLE_ARCHIVE_LINK = 0 GRIFFIN_BUILD = 0 -OBJ := +OBJ := -# For threading we need to overwrite some vars with global defines because devkitPro's includes +# For threading we need to overwrite some vars with global defines because devkitPro's includes # make it hard for us. This works for the pthread wrapper DEFINES_THREAD := -Dpthread_t=Thread -Dpthread_mutex_t=Mutex -Dpthread_mutexattr_t='void*' -Dpthread_attr_t=int -Dpthread_cond_t=CondVar -Dpthread_condattr_t='int' -D_SYS__PTHREADTYPES_H_ DEFINES := -D__SWITCH__=1 -U__linux__ -U__linux -DGLM_FORCE_PURE=1 -DRARCH_CONSOLE -DRARCH_INTERNAL -DGLOBAL_CONFIG_DIR='"/switch"' $(DEFINES_THREAD) -DHAVE_STB_VORBIS diff --git a/Makefile.libogc b/Makefile.libogc index 70c846c461..f82bb0cb8f 100644 --- a/Makefile.libogc +++ b/Makefile.libogc @@ -29,7 +29,7 @@ ifneq (,$(findstring Darwin,$(UNAME_S))) endif #--------------------------------------------------------------------------------- -# path to tools +# path to tools #--------------------------------------------------------------------------------- export PORTLIBS := $(DEVKITPRO)/portlibs/ppc export PATH := $(DEVKITPPC)/bin:$(PORTLIBS)/bin:$(PATH) @@ -56,7 +56,7 @@ ISVC=$(or $(VCBUILDHELPER_COMMAND),$(MSBUILDEXTENSIONSPATH32),$(MSBUILDEXTENSION #--------------------------------------------------------------------------------- %.o: %.cpp $(CXX) $(CXXFLAGS) -c $< -o $@ - + #--------------------------------------------------------------------------------- %.o: %.c $(CC) $(CFLAGS) -c $< -o $@ diff --git a/Makefile.orbis b/Makefile.orbis index b0cba71a20..091aa3c232 100644 --- a/Makefile.orbis +++ b/Makefile.orbis @@ -117,12 +117,12 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1) WHOLE_START := -Wl,--whole-archive WHOLE_END := -Wl,--no-whole-archive endif -CXXFLAGS := $(CFLAGS) +CXXFLAGS := $(CFLAGS) PS4_LIBS := -lps4link -ldebugnet -lorbisFile -lelfloader -lorbisKeyboard -lorbis2d -lpng -lz -lorbisGl -lorbisPad -lorbisAudio -lmod -lorbisFileBrowser -lorbisXbmFont -lSceNet_stub -lScePigletv2VSH_stub -lSceSystemService_stub -lSceUserService_stub -lScePad_stub -lSceAudioOut_stub -lSceIme_stub -lSceSysmodule_stub \ -lPs4_extension_kernel_call_standard -lPs4_extension_kernel_execute_dynlib_prepare_dlclose -lPs4_common_kernel -lPs4_common_user -lPs4_common_generic -lPs4LibCInternalAdaptive_stub -lPs4LibKernelAdaptive_stub -lSceLibcInternal_stub -lkernel_stub -lps4Kernel_stub -lPs4_base_stub_resolve_minimal -lPs4_base_kernel_dlsym_standard -lPs4_base_kernel_seek_elf_address_standard -lPs4_base_assembler_register_parameter_standard -lPs4_base_assembler_system_call_standard -LIBS := $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) +LIBS := $(WHOLE_START) -lretro_orbis $(WHOLE_END) $(PS4_LIBS) TARGETS := $(TARGET).elf @@ -157,10 +157,10 @@ $(TARGET).elf: $(OBJ) libretro_orbis.a $(LD) $(CRTFILE) $(OBJ) $(LDFLAGS) $(LIBDIRS) $(LIBS) -o $@ clean: - rm -f $(OBJ) $(TARGET).elf + rm -f $(OBJ) $(TARGET).elf rm -f $(OBJ:.o=.depend) -.PHONY: clean all +.PHONY: clean all .PRECIOUS: %.depend -include $(OBJ:.o=.depend) diff --git a/Makefile.pandora b/Makefile.pandora index 33ed75bd69..094465894f 100644 --- a/Makefile.pandora +++ b/Makefile.pandora @@ -36,7 +36,7 @@ retroarch.pnd: install pnd_make -c -p retroarch.pnd -d $(PNDDIR)/ -x $(PNDDIR)/PXML.xml -i $(PNDDIR)/icon.png clean: - rm -f *.o + rm -f *.o rm -f audio/*.o rm -f conf/*.o rm -f gfx/*.o diff --git a/Makefile.ps2 b/Makefile.ps2 index 094536e00c..0a7b51162a 100644 --- a/Makefile.ps2 +++ b/Makefile.ps2 @@ -77,7 +77,7 @@ EE_LDFLAGS = $(LDFLAGS) EE_LIBS = $(LIBS) EE_ASFLAGS = $(ASFLAGS) EE_INCS = $(INCDIR) -EE_IRX_OBJ = $(IRX_OBJ) +EE_IRX_OBJ = $(IRX_OBJ) EE_BIN = $(TARGET) EE_GPVAL = $(GPVAL) @@ -105,7 +105,7 @@ $(EE_IRX_OBJ): $(EE_BIN2O) $(EE_GPVAL) $(IRX_DIR)/$(@:.o=.irx) $@ $(@:.o=_irx) #Include preferences -include $(PS2SDK)/samples/Makefile.pref +include $(PS2SDK)/samples/Makefile.pref include $(PS2SDK)/samples/Makefile.eeglobal #Linking with C++ diff --git a/Makefile.ps3 b/Makefile.ps3 index c2270132d2..64e07841f1 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -159,7 +159,7 @@ create-core: create-npdrm-salamander: $(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH) - + create-salamander: $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra index 3a270b2dd6..fdb2ec9395 100644 --- a/Makefile.ps3.cobra +++ b/Makefile.ps3.cobra @@ -155,7 +155,7 @@ create-core: create-npdrm-salamander: $(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH) - + create-salamander: $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander index 37778bf6f4..0885f07b0b 100644 --- a/Makefile.ps3.salamander +++ b/Makefile.ps3.salamander @@ -1,91 +1,91 @@ -CELL_BUILD_TOOLS = GCC -CELL_SDK ?= /usr/local/cell -HAVE_LOGGER = 0 -CELL_MK_DIR ?= $(CELL_SDK)/samples/mk - -include $(CELL_MK_DIR)/sdk.makedef.mk - -# system platform -system_platform = unix -ifeq ($(shell uname -a),) -EXE_EXT = .exe - system_platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) - system_platform = osx -else ifneq ($(findstring MINGW,$(shell uname -a)),) - system_platform = win -endif - -ifeq ($(DEBUG), 1) - PPU_OPTIMIZE_LV := -O0 -g -else - PPU_OPTIMIZE_LV := -O2 -DNDEBUG -endif - -STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe - -INCFLAGS = -I. -Idefines -Ilibretro-common/include -Ideps/libz -DEFINES = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC - -ifeq ($(DEX_BUILD), 1) -DEFINES += -DDEX_BUILD -endif - -ifeq ($(CEX_BUILD), 1) -DEFINES += -DCEX_BUILD -endif - -ifeq ($(ODE_BUILD), 1) -DEFINES += -DODE_BUILD -endif - -PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) -PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) - -PPU_SRCS = frontend/frontend_salamander.c \ - frontend/frontend_driver.c \ - frontend/drivers/platform_ps3.c \ - frontend/drivers/platform_null.c \ - libretro-common/file/file_path.c \ - libretro-common/lists/dir_list.c \ - libretro-common/lists/string_list.c \ - libretro-common/file/retro_dirent.c \ - libretro-common/hash/rhash.c \ - libretro-common/string/stdstring.c \ - libretro-common/encodings/encoding_utf.c \ - libretro-common/compat/compat_strl.c \ - libretro-common/compat/compat_strcasestr.c \ - libretro-common/compat/fopen_utf8.c \ - libretro-common/streams/file_stream.c \ - libretro-common/vfs/vfs_implementation.c \ - libretro-common/file/config_file.c \ - file_path_str.c \ - verbosity.c - -ifeq ($(HAVE_LOGGER), 1) -PPU_CFLAGS += -DHAVE_LOGGER -PPU_SRCS += network/net_logger.c \ - libretro-common/net/net_compat.c \ - libretro-common/net/net_socket.c -endif - -PPU_TARGET = retroarch-salamander_ps3.elf - -ifeq ($(CELL_BUILD_TOOLS),SNC) - PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 - PPU_CXXFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe -else - PPU_CFLAGS += -std=gnu99 - PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe -endif - -PPU_LDLIBS += -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub - -MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe - -include $(CELL_MK_DIR)/sdk.target.mk +CELL_BUILD_TOOLS = GCC +CELL_SDK ?= /usr/local/cell +HAVE_LOGGER = 0 +CELL_MK_DIR ?= $(CELL_SDK)/samples/mk + +include $(CELL_MK_DIR)/sdk.makedef.mk + +# system platform +system_platform = unix +ifeq ($(shell uname -a),) +EXE_EXT = .exe + system_platform = win +else ifneq ($(findstring Darwin,$(shell uname -a)),) + system_platform = osx +else ifneq ($(findstring MINGW,$(shell uname -a)),) + system_platform = win +endif + +ifeq ($(DEBUG), 1) + PPU_OPTIMIZE_LV := -O0 -g +else + PPU_OPTIMIZE_LV := -O2 -DNDEBUG +endif + +STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe + +INCFLAGS = -I. -Idefines -Ilibretro-common/include -Ideps/libz +DEFINES = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC + +ifeq ($(DEX_BUILD), 1) +DEFINES += -DDEX_BUILD +endif + +ifeq ($(CEX_BUILD), 1) +DEFINES += -DCEX_BUILD +endif + +ifeq ($(ODE_BUILD), 1) +DEFINES += -DODE_BUILD +endif + +PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) +PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) + +PPU_SRCS = frontend/frontend_salamander.c \ + frontend/frontend_driver.c \ + frontend/drivers/platform_ps3.c \ + frontend/drivers/platform_null.c \ + libretro-common/file/file_path.c \ + libretro-common/lists/dir_list.c \ + libretro-common/lists/string_list.c \ + libretro-common/file/retro_dirent.c \ + libretro-common/hash/rhash.c \ + libretro-common/string/stdstring.c \ + libretro-common/encodings/encoding_utf.c \ + libretro-common/compat/compat_strl.c \ + libretro-common/compat/compat_strcasestr.c \ + libretro-common/compat/fopen_utf8.c \ + libretro-common/streams/file_stream.c \ + libretro-common/vfs/vfs_implementation.c \ + libretro-common/file/config_file.c \ + file_path_str.c \ + verbosity.c + +ifeq ($(HAVE_LOGGER), 1) +PPU_CFLAGS += -DHAVE_LOGGER +PPU_SRCS += network/net_logger.c \ + libretro-common/net/net_compat.c \ + libretro-common/net/net_socket.c +endif + +PPU_TARGET = retroarch-salamander_ps3.elf + +ifeq ($(CELL_BUILD_TOOLS),SNC) + PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 + PPU_CXXFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 + PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe + PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe + PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe +else + PPU_CFLAGS += -std=gnu99 + PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe + PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe + PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe +endif + +PPU_LDLIBS += -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub + +MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe + +include $(CELL_MK_DIR)/sdk.target.mk diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 16e06e4cb0..d4cff16cb8 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -96,7 +96,7 @@ CXXFLAGS += $(SHARED_FLAGS) ifeq ($(DEBUG), 1) CFLAGS += -O0 -g else - CFLAGS += -O3 -g + CFLAGS += -O3 -g CXXFLAGS += -03 -g endif diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander index 525d2a1ac6..7c08c5222c 100644 --- a/Makefile.psp1.salamander +++ b/Makefile.psp1.salamander @@ -25,7 +25,7 @@ ifeq ($(HAVE_FILE_LOGGER), 1) CFLAGS += -DHAVE_FILE_LOGGER endif -CFLAGS += $(RARCH_DEFINES) +CFLAGS += $(RARCH_DEFINES) EXTRA_TARGETS = EBOOT.PBP PSP_EBOOT_TITLE = RetroArch @@ -51,7 +51,7 @@ OBJS = frontend/frontend_salamander.o \ libretro-common/hash/rhash.o \ file_path_str.o \ verbosity.o \ - bootstrap/psp1/kernel_functions.o + bootstrap/psp1/kernel_functions.o PSPSDK=$(shell psp-config --pspsdk-path) include $(PSPSDK)/lib/build.mak diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander index 9003714261..acc403f449 100644 --- a/Makefile.wii.salamander +++ b/Makefile.wii.salamander @@ -32,10 +32,10 @@ ELF_TARGET := retroarch-salamander_wii.elf INCLUDE := -I. -Ilibretro-common/include -Ideps/libz ifeq ($(EXTERNAL_LIBOGC), 1) -INCLUDE += -I$(DEVKITPRO)/libogc/include +INCLUDE += -I$(DEVKITPRO)/libogc/include LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L. else -INCLUDE += -Iwii/libogc/include +INCLUDE += -Iwii/libogc/include LIBDIRS := -Lwii/libogc/libs/wii -L. endif diff --git a/README-mali_fbdev_r4p0.md b/README-mali_fbdev_r4p0.md index 522a848ac9..4449795d49 100644 --- a/README-mali_fbdev_r4p0.md +++ b/README-mali_fbdev_r4p0.md @@ -1,7 +1,7 @@ USAGE NOTES =========== -This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a +This driver is meant for devices with Allwinner SoCs with Mali400 3D block and a good fbdev implementation. It is derived from the old Android GLES driver. It was meant to be used on Cubieboard/Cubieboard2/Cubietruck, but it should not @@ -19,7 +19,7 @@ First we will clone and build the kernel: git clone https://github.com/mireq/linux-sunxi.git -b sunxi-3.4 --depth 1 Now we edit drivers/video/sunxi/disp/dev_fb.c, and uncomment the line 1074: -// Fb_wait_for_vsync(info); +// Fb_wait_for_vsync(info); It is assumed you have a cross-compiler installed, so we configure and build the kernel and modules: @@ -50,7 +50,7 @@ Now we need the headers. We can get them from here: http://malideveloper.arm.com/develop-for-mali/sdks/opengl-es-sdk-for-linux/#opengl-es-sdk-for-linux-download -Download whatever version you want. We just get the headers from here, not machine-dependant compiled code. +Download whatever version you want. We just get the headers from here, not machine-dependant compiled code. Extract the files and copy the directories inside inc to /usr/include . @@ -60,20 +60,20 @@ In the end you should have this on your system: /usr/include/EGL/ eglext.h - egl.h - eglplatform.h + egl.h + eglplatform.h fbdev_window.h /usr/include/GLES/ glext.h - gl.h + gl.h glplatform.h /usr/include/GLES2 gl2ext.h - gl2.h + gl2.h gl2platform.h /usr/include/GLES3 gl3ext.h - gl3.h + gl3.h gl3platform.h To enable mali_fbdev you must configure RetroArch with --enable-gles and --enable-mali_fbdev. diff --git a/README.md b/README.md index c7fcf261c5..77436fbd5c 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ Instructions for compiling and installing RetroArch can be found in the [Libretr ## CRT 15Khz Resolution Switching -CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60. +CRT SwitchRes will turn on, on the fly. However, you will need to restart RetroArch to disable it. With CRT SwitchRes enable RetroArch will start in 2560 x 480 @ 60. If you are running Windows, before enabling the CRT SwitchRes options please make sure you have installed CRTEmudriver and installed some modelines. The minimum modelines for all games to switch correctly are: diff --git a/audio/audio_driver.c b/audio/audio_driver.c index b3303b0e50..b1746ebacc 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -278,12 +278,12 @@ bool compute_audio_buffer_statistics(audio_statistics_t *stats) stats->samples = (unsigned)audio_driver_free_samples_count; #ifdef WARPUP - /* uint64 to double not implemented, fair chance + /* uint64 to double not implemented, fair chance * signed int64 to double doesn't exist either */ /* https://forums.libretro.com/t/unsupported-platform-help/13903/ */ (void)stddev; #elif defined(_MSC_VER) && _MSC_VER <= 1200 - /* FIXME: error C2520: conversion from unsigned __int64 + /* FIXME: error C2520: conversion from unsigned __int64 * to double not implemented, use signed __int64 */ (void)stddev; #else @@ -301,9 +301,9 @@ bool compute_audio_buffer_statistics(audio_statistics_t *stats) stddev = (unsigned) sqrt((double)accum_var / (samples - 2)); - stats->average_buffer_saturation = (1.0f - (float)avg + stats->average_buffer_saturation = (1.0f - (float)avg / audio_driver_buffer_size) * 100.0; - stats->std_deviation_percentage = ((float)stddev + stats->std_deviation_percentage = ((float)stddev / audio_driver_buffer_size) * 100.0; #endif @@ -975,7 +975,7 @@ void audio_driver_monitor_adjust_system_rates(void) float video_refresh_rate = settings->floats.video_refresh_rate; float max_timing_skew = settings->floats.audio_max_timing_skew; struct retro_system_av_info *av_info = video_viewport_get_system_av_info(); - const struct retro_system_timing *info = + const struct retro_system_timing *info = (const struct retro_system_timing*)&av_info->timing; if (info->sample_rate <= 0.0) @@ -1281,7 +1281,7 @@ bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params) if (params->stream_type == AUDIO_STREAM_TYPE_NONE) return false; - + switch (params->slot_selection_type) { case AUDIO_MIXER_SLOT_SELECTION_MANUAL: diff --git a/audio/drivers/coreaudio3.m b/audio/drivers/coreaudio3.m index 279a4f2612..298dd3cb19 100644 --- a/audio/drivers/coreaudio3.m +++ b/audio/drivers/coreaudio3.m @@ -1,382 +1,382 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2019 - Stuart Carnie - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#import -#import -#import - -#include -#include -#include -#include - -#include "../audio_driver.h" - -#pragma mark - ringbuffer - -typedef struct ringbuffer -{ - float *buffer; - size_t cap; - atomic_int len; - size_t writePtr; - size_t readPtr; -} ringbuffer_t; - -typedef ringbuffer_t * ringbuffer_h; - -static inline size_t rb_len(ringbuffer_h r) -{ - return atomic_load_explicit(&r->len, memory_order_relaxed); -} - -static inline size_t rb_cap(ringbuffer_h r) -{ - return (r->readPtr + r->cap - r->writePtr) % r->cap; -} - -static inline size_t rb_avail(ringbuffer_h r) -{ - return r->cap - rb_len(r); -} - -static inline void rb_advance_write(ringbuffer_h r) -{ - r->writePtr = (r->writePtr + 1) % r->cap; -} - -static inline void rb_advance_write_n(ringbuffer_h r, size_t n) -{ - r->writePtr = (r->writePtr + n) % r->cap; -} - -static inline void rb_advance_read(ringbuffer_h r) -{ - r->readPtr = (r->readPtr + 1) % r->cap; -} - -static inline void rb_len_add(ringbuffer_h r, int n) -{ - atomic_fetch_add(&r->len, n); -} - -static inline void rb_len_sub(ringbuffer_h r, int n) -{ - atomic_fetch_sub(&r->len, n); -} - -static void rb_init(ringbuffer_h r, size_t cap) -{ - r->buffer = malloc(cap * sizeof(float)); - r->cap = cap; - atomic_init(&r->len, 0); - r->writePtr = 0; - r->readPtr = 0; -} - -static void rb_free(ringbuffer_h r) -{ - free(r->buffer); - bzero(r, sizeof(*r)); -} - -#define UNLIKELY(x) __builtin_expect((x), 0) -#define LIKELY(x) __builtin_expect((x), 1) - -static void rb_write_data(ringbuffer_h r, const float *data, size_t len) -{ - size_t avail = rb_avail(r); - size_t n = MIN(len, avail); - size_t first_write = n; - size_t rest_write = 0; - - if (r->writePtr + n > r->cap) - { - first_write = r->cap - r->writePtr; - rest_write = n - first_write; - } - - memcpy(r->buffer + r->writePtr, data, first_write*sizeof(float)); - memcpy(r->buffer, data + first_write, rest_write*sizeof(float)); - - rb_advance_write_n(r, n); - rb_len_add(r, (int)n); -} - -static void rb_read_data(ringbuffer_h r, float *d0, float *d1, size_t len) -{ - size_t need = len*2; - - do { - size_t have = rb_len(r); - size_t n = MIN(have, need); - int i = 0; - for (; i < n/2; i++) - { - d0[i] = r->buffer[r->readPtr]; - rb_advance_read(r); - d1[i] = r->buffer[r->readPtr]; - rb_advance_read(r); - } - - need -= n; - rb_len_sub(r, (int)n); - - if (UNLIKELY(need > 0)) - { - /* we got more data */ - if (rb_len(r) > 0) - continue; - - // underflow - const float quiet = 0.0f; - size_t fill = (need/2)*sizeof(float); - memset_pattern4(&d0[i], &quiet, fill); - memset_pattern4(&d1[i], &quiet, fill); - } - } while (0); -} - -#pragma mark - CoreAudio3 - -static bool g_interrupted; - -@interface CoreAudio3 : NSObject { - ringbuffer_t _rb; - dispatch_semaphore_t _sema; - AUAudioUnit *_au; - size_t _bufferSize; - BOOL _nonBlock; -} - -@property (nonatomic, readwrite) BOOL nonBlock; -@property (nonatomic, readonly) BOOL paused; -@property (nonatomic, readonly) size_t writeAvailableInBytes; -@property (nonatomic, readonly) size_t bufferSizeInBytes; - -- (instancetype)initWithRate:(NSUInteger)rate - latency:(NSUInteger)latency; -- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples; -- (void)start; -- (void)stop; - -@end - -@implementation CoreAudio3 - -- (instancetype)initWithRate:(NSUInteger)rate - latency:(NSUInteger)latency { - if (self = [super init]) - { - _sema = dispatch_semaphore_create(0); - - _bufferSize = (latency * rate) / 1000; - _bufferSize *= 2; // stereo - rb_init(&_rb, _bufferSize); - - AudioComponentDescription desc = { - .componentType = kAudioUnitType_Output, - .componentSubType = kAudioUnitSubType_DefaultOutput, - .componentManufacturer = kAudioUnitManufacturer_Apple, - }; - - NSError *err; - AUAudioUnit *au = [[AUAudioUnit alloc] initWithComponentDescription:desc error:&err]; - if (err != nil) - return nil; - - AVAudioFormat *format = au.outputBusses[0].format; - if (format.channelCount != 2) - return nil; - - AVAudioFormat *renderFormat = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:rate channels:2]; - [au.inputBusses[0] setFormat:renderFormat error:&err]; - if (err != nil) - return nil; - - ringbuffer_h rb = &_rb; - __block dispatch_semaphore_t sema = _sema; - au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData) { - rb_read_data(rb, inputData->mBuffers[0].mData, inputData->mBuffers[1].mData, frameCount); - dispatch_semaphore_signal(sema); - return 0; - }; - - [au allocateRenderResourcesAndReturnError:&err]; - if (err != nil) - return nil; - - _au = au; - - RARCH_LOG("[CoreAudio3]: Using buffer size of %u bytes: (latency = %u ms)\n", (unsigned)self.bufferSizeInBytes, latency); - - [self start]; - } - return self; -} - -- (void)dealloc { - rb_free(&_rb); -} - -- (BOOL)paused { - return !_au.running; -} - -- (size_t)bufferSizeInBytes { - return _bufferSize * sizeof(float); -} - -- (size_t)writeAvailableInBytes { - return rb_avail(&_rb) * sizeof(float); -} - -- (void)start { - NSError *err; - [_au startHardwareAndReturnError:&err]; -} - -- (void)stop { - [_au stopHardware]; -} - -- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples { - size_t written = 0; - while (!g_interrupted && samples > 0) - { - size_t write_avail = rb_avail(&_rb); - if (write_avail > samples) - write_avail = samples; - - rb_write_data(&_rb, data, write_avail); - data += write_avail; - written += write_avail; - samples -= write_avail; - - if (_nonBlock) - break; - - if (write_avail == 0) - dispatch_semaphore_wait(_sema, DISPATCH_TIME_FOREVER); - } - - return written; -} - -@end - -static void coreaudio3_free(void *data) -{ - CoreAudio3 *dev = (__bridge_transfer CoreAudio3 *)data; - if (dev == nil) - return; - - [dev stop]; - dev = nil; -} - -static void *coreaudio3_init(const char *device, - unsigned rate, unsigned latency, - unsigned block_frames, - unsigned *new_rate) -{ - CoreAudio3 *dev = [[CoreAudio3 alloc] initWithRate:rate - latency:latency]; - - *new_rate = rate; - - return (__bridge_retained void *)dev; -} - -static ssize_t coreaudio3_write(void *data, const void *buf_, size_t size) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - return [dev writeFloat:(const float *)buf_ samples:size/sizeof(float)] * sizeof(float); -} - -static void coreaudio3_set_nonblock_state(void *data, bool state) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return; - - dev.nonBlock = state; -} - -static bool coreaudio3_alive(void *data) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return NO; - - return !dev.paused; -} - -static bool coreaudio3_stop(void *data) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return NO; - - [dev stop]; - return dev.paused; -} - -static bool coreaudio3_start(void *data, bool is_shutdown) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return NO; - - [dev start]; - return !dev.paused; -} - -static bool coreaudio3_use_float(void *data) -{ - return YES; -} - -static size_t coreaudio3_write_avail(void *data) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return 0; - - return dev.writeAvailableInBytes; -} - -static size_t coreaudio3_buffer_size(void *data) -{ - CoreAudio3 *dev = (__bridge CoreAudio3 *)data; - if (dev == nil) - return 0; - - return dev.bufferSizeInBytes; -} - -audio_driver_t audio_coreaudio3 = { - coreaudio3_init, - coreaudio3_write, - coreaudio3_stop, - coreaudio3_start, - coreaudio3_alive, - coreaudio3_set_nonblock_state, - coreaudio3_free, - coreaudio3_use_float, - "coreaudio3", - coreaudio3_write_avail, - coreaudio3_buffer_size, -}; +/* RetroArch - A frontend for libretro. + * Copyright (C) 2019 - Stuart Carnie + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#import +#import +#import + +#include +#include +#include +#include + +#include "../audio_driver.h" + +#pragma mark - ringbuffer + +typedef struct ringbuffer +{ + float *buffer; + size_t cap; + atomic_int len; + size_t writePtr; + size_t readPtr; +} ringbuffer_t; + +typedef ringbuffer_t * ringbuffer_h; + +static inline size_t rb_len(ringbuffer_h r) +{ + return atomic_load_explicit(&r->len, memory_order_relaxed); +} + +static inline size_t rb_cap(ringbuffer_h r) +{ + return (r->readPtr + r->cap - r->writePtr) % r->cap; +} + +static inline size_t rb_avail(ringbuffer_h r) +{ + return r->cap - rb_len(r); +} + +static inline void rb_advance_write(ringbuffer_h r) +{ + r->writePtr = (r->writePtr + 1) % r->cap; +} + +static inline void rb_advance_write_n(ringbuffer_h r, size_t n) +{ + r->writePtr = (r->writePtr + n) % r->cap; +} + +static inline void rb_advance_read(ringbuffer_h r) +{ + r->readPtr = (r->readPtr + 1) % r->cap; +} + +static inline void rb_len_add(ringbuffer_h r, int n) +{ + atomic_fetch_add(&r->len, n); +} + +static inline void rb_len_sub(ringbuffer_h r, int n) +{ + atomic_fetch_sub(&r->len, n); +} + +static void rb_init(ringbuffer_h r, size_t cap) +{ + r->buffer = malloc(cap * sizeof(float)); + r->cap = cap; + atomic_init(&r->len, 0); + r->writePtr = 0; + r->readPtr = 0; +} + +static void rb_free(ringbuffer_h r) +{ + free(r->buffer); + bzero(r, sizeof(*r)); +} + +#define UNLIKELY(x) __builtin_expect((x), 0) +#define LIKELY(x) __builtin_expect((x), 1) + +static void rb_write_data(ringbuffer_h r, const float *data, size_t len) +{ + size_t avail = rb_avail(r); + size_t n = MIN(len, avail); + size_t first_write = n; + size_t rest_write = 0; + + if (r->writePtr + n > r->cap) + { + first_write = r->cap - r->writePtr; + rest_write = n - first_write; + } + + memcpy(r->buffer + r->writePtr, data, first_write*sizeof(float)); + memcpy(r->buffer, data + first_write, rest_write*sizeof(float)); + + rb_advance_write_n(r, n); + rb_len_add(r, (int)n); +} + +static void rb_read_data(ringbuffer_h r, float *d0, float *d1, size_t len) +{ + size_t need = len*2; + + do { + size_t have = rb_len(r); + size_t n = MIN(have, need); + int i = 0; + for (; i < n/2; i++) + { + d0[i] = r->buffer[r->readPtr]; + rb_advance_read(r); + d1[i] = r->buffer[r->readPtr]; + rb_advance_read(r); + } + + need -= n; + rb_len_sub(r, (int)n); + + if (UNLIKELY(need > 0)) + { + /* we got more data */ + if (rb_len(r) > 0) + continue; + + // underflow + const float quiet = 0.0f; + size_t fill = (need/2)*sizeof(float); + memset_pattern4(&d0[i], &quiet, fill); + memset_pattern4(&d1[i], &quiet, fill); + } + } while (0); +} + +#pragma mark - CoreAudio3 + +static bool g_interrupted; + +@interface CoreAudio3 : NSObject { + ringbuffer_t _rb; + dispatch_semaphore_t _sema; + AUAudioUnit *_au; + size_t _bufferSize; + BOOL _nonBlock; +} + +@property (nonatomic, readwrite) BOOL nonBlock; +@property (nonatomic, readonly) BOOL paused; +@property (nonatomic, readonly) size_t writeAvailableInBytes; +@property (nonatomic, readonly) size_t bufferSizeInBytes; + +- (instancetype)initWithRate:(NSUInteger)rate + latency:(NSUInteger)latency; +- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples; +- (void)start; +- (void)stop; + +@end + +@implementation CoreAudio3 + +- (instancetype)initWithRate:(NSUInteger)rate + latency:(NSUInteger)latency { + if (self = [super init]) + { + _sema = dispatch_semaphore_create(0); + + _bufferSize = (latency * rate) / 1000; + _bufferSize *= 2; // stereo + rb_init(&_rb, _bufferSize); + + AudioComponentDescription desc = { + .componentType = kAudioUnitType_Output, + .componentSubType = kAudioUnitSubType_DefaultOutput, + .componentManufacturer = kAudioUnitManufacturer_Apple, + }; + + NSError *err; + AUAudioUnit *au = [[AUAudioUnit alloc] initWithComponentDescription:desc error:&err]; + if (err != nil) + return nil; + + AVAudioFormat *format = au.outputBusses[0].format; + if (format.channelCount != 2) + return nil; + + AVAudioFormat *renderFormat = [[AVAudioFormat alloc] initStandardFormatWithSampleRate:rate channels:2]; + [au.inputBusses[0] setFormat:renderFormat error:&err]; + if (err != nil) + return nil; + + ringbuffer_h rb = &_rb; + __block dispatch_semaphore_t sema = _sema; + au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData) { + rb_read_data(rb, inputData->mBuffers[0].mData, inputData->mBuffers[1].mData, frameCount); + dispatch_semaphore_signal(sema); + return 0; + }; + + [au allocateRenderResourcesAndReturnError:&err]; + if (err != nil) + return nil; + + _au = au; + + RARCH_LOG("[CoreAudio3]: Using buffer size of %u bytes: (latency = %u ms)\n", (unsigned)self.bufferSizeInBytes, latency); + + [self start]; + } + return self; +} + +- (void)dealloc { + rb_free(&_rb); +} + +- (BOOL)paused { + return !_au.running; +} + +- (size_t)bufferSizeInBytes { + return _bufferSize * sizeof(float); +} + +- (size_t)writeAvailableInBytes { + return rb_avail(&_rb) * sizeof(float); +} + +- (void)start { + NSError *err; + [_au startHardwareAndReturnError:&err]; +} + +- (void)stop { + [_au stopHardware]; +} + +- (ssize_t)writeFloat:(const float *)data samples:(size_t)samples { + size_t written = 0; + while (!g_interrupted && samples > 0) + { + size_t write_avail = rb_avail(&_rb); + if (write_avail > samples) + write_avail = samples; + + rb_write_data(&_rb, data, write_avail); + data += write_avail; + written += write_avail; + samples -= write_avail; + + if (_nonBlock) + break; + + if (write_avail == 0) + dispatch_semaphore_wait(_sema, DISPATCH_TIME_FOREVER); + } + + return written; +} + +@end + +static void coreaudio3_free(void *data) +{ + CoreAudio3 *dev = (__bridge_transfer CoreAudio3 *)data; + if (dev == nil) + return; + + [dev stop]; + dev = nil; +} + +static void *coreaudio3_init(const char *device, + unsigned rate, unsigned latency, + unsigned block_frames, + unsigned *new_rate) +{ + CoreAudio3 *dev = [[CoreAudio3 alloc] initWithRate:rate + latency:latency]; + + *new_rate = rate; + + return (__bridge_retained void *)dev; +} + +static ssize_t coreaudio3_write(void *data, const void *buf_, size_t size) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + return [dev writeFloat:(const float *)buf_ samples:size/sizeof(float)] * sizeof(float); +} + +static void coreaudio3_set_nonblock_state(void *data, bool state) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return; + + dev.nonBlock = state; +} + +static bool coreaudio3_alive(void *data) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return NO; + + return !dev.paused; +} + +static bool coreaudio3_stop(void *data) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return NO; + + [dev stop]; + return dev.paused; +} + +static bool coreaudio3_start(void *data, bool is_shutdown) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return NO; + + [dev start]; + return !dev.paused; +} + +static bool coreaudio3_use_float(void *data) +{ + return YES; +} + +static size_t coreaudio3_write_avail(void *data) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return 0; + + return dev.writeAvailableInBytes; +} + +static size_t coreaudio3_buffer_size(void *data) +{ + CoreAudio3 *dev = (__bridge CoreAudio3 *)data; + if (dev == nil) + return 0; + + return dev.bufferSizeInBytes; +} + +audio_driver_t audio_coreaudio3 = { + coreaudio3_init, + coreaudio3_write, + coreaudio3_stop, + coreaudio3_start, + coreaudio3_alive, + coreaudio3_set_nonblock_state, + coreaudio3_free, + coreaudio3_use_float, + "coreaudio3", + coreaudio3_write_avail, + coreaudio3_buffer_size, +}; diff --git a/audio/drivers/ps2_audio.c b/audio/drivers/ps2_audio.c index 959941ca63..1fca4b2916 100644 --- a/audio/drivers/ps2_audio.c +++ b/audio/drivers/ps2_audio.c @@ -53,7 +53,7 @@ static void audioMainLoop(void *data) size_t size; WaitSema(ps2->lock); - size = MIN(fifo_read_avail(ps2->buffer), sizeof(out_tmp)); + size = MIN(fifo_read_avail(ps2->buffer), sizeof(out_tmp)); fifo_read(ps2->buffer, out_tmp, size); iSignalSema(ps2->lock); iSignalSema(ps2->cond_lock); @@ -262,7 +262,7 @@ static size_t ps2_audio_write_avail(void *data) { size_t size; WaitSema(ps2->lock); - size = AUDIO_BUFFER - fifo_read_avail(ps2->buffer); + size = AUDIO_BUFFER - fifo_read_avail(ps2->buffer); iSignalSema(ps2->lock); return size; } diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c index 54e6d84a75..5c979033bc 100644 --- a/audio/drivers/psp_audio.c +++ b/audio/drivers/psp_audio.c @@ -186,7 +186,7 @@ static void psp_audio_free(void *data) psp->running = false; sthread_join(psp->worker_thread); } - + if (psp->cond) scond_free(psp->cond); if (psp->fifo_lock) @@ -205,7 +205,7 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size) psp_audio_t* psp = (psp_audio_t*)data; uint16_t write_pos = psp->write_pos; uint16_t sampleCount = size / sizeof(uint32_t); - + if (!psp->running) return -1; @@ -241,7 +241,6 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size) slock_unlock(psp->fifo_lock); return size; - } static bool psp_audio_alive(void *data) diff --git a/audio/drivers/switch_audio.c b/audio/drivers/switch_audio.c index e0f5bd95b6..a43d97c78b 100644 --- a/audio/drivers/switch_audio.c +++ b/audio/drivers/switch_audio.c @@ -120,7 +120,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size) if (to_write > switch_audio_buffer_size(NULL) - swa->current_buffer->data_size) to_write = switch_audio_buffer_size(NULL) - swa->current_buffer->data_size; - + #ifndef HAVE_LIBNX memcpy(((uint8_t*) swa->current_buffer->sample_data) + swa->current_buffer->data_size, buf, to_write); #else @@ -137,7 +137,7 @@ static ssize_t switch_audio_write(void *data, const void *buf, size_t size) } swa->last_append = svcGetSystemTick(); - + return to_write; } @@ -328,7 +328,7 @@ static void *switch_audio_init(const char *device, swa->is_paused = true; RARCH_LOG("[Audio]: Audio initialized\n"); - + return swa; fail_audio_output: diff --git a/audio/drivers/switch_thread_audio.c b/audio/drivers/switch_thread_audio.c index 756a69ae90..3bb8ba38fe 100644 --- a/audio/drivers/switch_thread_audio.c +++ b/audio/drivers/switch_thread_audio.c @@ -237,7 +237,7 @@ static void *switch_thread_audio_init(const char *device, unsigned rate, unsigne if (switch_audio_ipc_output_append_buffer(swa, &swa->buffers[i]) != 0) goto fail_audio_output; } - + compat_mutex_create(&swa->fifoLock); swa->fifo = fifo_new(swa->fifoSize); diff --git a/audio/drivers/xaudio29.h b/audio/drivers/xaudio29.h index 46f5d616ca..a918c57608 100644 --- a/audio/drivers/xaudio29.h +++ b/audio/drivers/xaudio29.h @@ -1,1306 +1,1290 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2018 - Krzysztof Haładyn - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - - /************************************************************************** - * - * Copyright (c) Microsoft Corporation. All rights reserved. - * - * File: xaudio2.h - * Content: Declarations for the XAudio2 game audio API. - * - **************************************************************************/ - - /* Modified slightly to build without requiring the WinRT compiler since that is only available in C++ sources */ - -#ifdef _MSC_VER -#pragma once -#endif - -#ifndef __XAUDIO2_INCLUDED__ -#define __XAUDIO2_INCLUDED__ - -#include - -#include - -#if(_WIN32_WINNT < _WIN32_WINNT_WIN8) -#error "This version of XAudio2 is available only in Windows 8 or later. Use the XAudio2 headers and libraries from the DirectX SDK with applications that target Windows 7 and earlier versions." -#endif // (_WIN32_WINNT < _WIN32_WINNT_WIN8) - -#include - -#pragma region Application Family -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_TV_APP | WINAPI_PARTITION_TV_TITLE) - -// Current name of the DLL shipped in the same SDK as this header. -// The name reflects the current version -#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) -#define XAUDIO2_DLL_A "xaudio2_9.dll" -#define XAUDIO2_DLL_W L"xaudio2_9.dll" -#define XAUDIO2D_DLL_A "xaudio2_9d.dll" -#define XAUDIO2D_DLL_W L"xaudio2_9d.dll" -#else -#define XAUDIO2_DLL_A "xaudio2_8.dll" -#define XAUDIO2_DLL_W L"xaudio2_8.dll" -#define XAUDIO2D_DLL_A "xaudio2_8.dll" -#define XAUDIO2D_DLL_W L"xaudio2_8.dll" -#endif - -#ifdef UNICODE -#define XAUDIO2_DLL XAUDIO2_DLL_W -#define XAUDIO2D_DLL XAUDIO2D_DLL_W -#else -#define XAUDIO2_DLL XAUDIO2_DLL_A -#define XAUDIO2D_DLL XAUDIO2D_DLL_A -#endif - - -/************************************************************************** - * - * XAudio2 COM object class and interface IDs. - * - **************************************************************************/ - -#include - -#if defined(__cplusplus__) && defined(__WINRT__) - -#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) - // XAudio 2.9 -interface __declspec(uuid("2B02E3CF-2E0B-4ec3-BE45-1B2A3FE7210D")) IXAudio2; -#else - // XAudio 2.8 -interface __declspec(uuid("60d8dac8-5aa1-4e8e-b597-2f5e2883d484")) IXAudio2; -#endif - -#else - - /* Modified for C support */ -#define DEFINE_GUID_X(n, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - static const GUID n = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } -#define DEFINE_CLSID_X(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - DEFINE_GUID_X(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) -#define DEFINE_IID_X(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - DEFINE_GUID_X(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) - -#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) -DEFINE_IID_X(IXAudio2, 2B02E3CF, 2E0B, 4ec3, BE, 45, 1B, 2A, 3F, E7, 21, 0D); -#else -DEFINE_IID_X(IXAudio2, 60d8dac8, 5aa1, 4e8e, b5, 97, 2f, 5e, 28, 83, d4, 84); -#endif - -#endif - - -// Ignore the rest of this header if only the GUID definitions were requested -#ifndef GUID_DEFS_ONLY - -#include // Windows COM declarations -#include // Markers for documenting API semantics -#include // Basic data types and constants for audio work -#include // For AUDIO_STREAM_CATEGORY - -// All structures defined in this file use tight field packing -#pragma pack(push, 1) - - -/************************************************************************** - * - * XAudio2 constants, flags and error codes. - * - **************************************************************************/ - - // Numeric boundary values -#define XAUDIO2_MAX_BUFFER_BYTES 0x80000000 // Maximum bytes allowed in a source buffer -#define XAUDIO2_MAX_QUEUED_BUFFERS 64 // Maximum buffers allowed in a voice queue -#define XAUDIO2_MAX_BUFFERS_SYSTEM 2 // Maximum buffers allowed for system threads (Xbox 360 only) -#define XAUDIO2_MAX_AUDIO_CHANNELS 64 // Maximum channels in an audio stream -#define XAUDIO2_MIN_SAMPLE_RATE 1000 // Minimum audio sample rate supported -#define XAUDIO2_MAX_SAMPLE_RATE 200000 // Maximum audio sample rate supported -#define XAUDIO2_MAX_VOLUME_LEVEL 16777216.0f // Maximum acceptable volume level (2^24) -#define XAUDIO2_MIN_FREQ_RATIO (1/1024.0f) // Minimum SetFrequencyRatio argument -#define XAUDIO2_MAX_FREQ_RATIO 1024.0f // Maximum MaxFrequencyRatio argument -#define XAUDIO2_DEFAULT_FREQ_RATIO 2.0f // Default MaxFrequencyRatio argument -#define XAUDIO2_MAX_FILTER_ONEOVERQ 1.5f // Maximum XAUDIO2_FILTER_PARAMETERS.OneOverQ -#define XAUDIO2_MAX_FILTER_FREQUENCY 1.0f // Maximum XAUDIO2_FILTER_PARAMETERS.Frequency -#define XAUDIO2_MAX_LOOP_COUNT 254 // Maximum non-infinite XAUDIO2_BUFFER.LoopCount -#define XAUDIO2_MAX_INSTANCES 8 // Maximum simultaneous XAudio2 objects on Xbox 360 - -// For XMA voices on Xbox 360 there is an additional restriction on the MaxFrequencyRatio -// argument and the voice's sample rate: the product of these numbers cannot exceed 600000 -// for one-channel voices or 300000 for voices with more than one channel. -#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MONO 600000 -#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MULTICHANNEL 300000 - -// Numeric values with special meanings -#define XAUDIO2_COMMIT_NOW 0 // Used as an OperationSet argument -#define XAUDIO2_COMMIT_ALL 0 // Used in IXAudio2::CommitChanges -#define XAUDIO2_INVALID_OPSET (UINT32)(-1) // Not allowed for OperationSet arguments -#define XAUDIO2_NO_LOOP_REGION 0 // Used in XAUDIO2_BUFFER.LoopCount -#define XAUDIO2_LOOP_INFINITE 255 // Used in XAUDIO2_BUFFER.LoopCount -#define XAUDIO2_DEFAULT_CHANNELS 0 // Used in CreateMasteringVoice -#define XAUDIO2_DEFAULT_SAMPLERATE 0 // Used in CreateMasteringVoice - -// Flags -#define XAUDIO2_DEBUG_ENGINE 0x0001 // Used in XAudio2Create -#define XAUDIO2_VOICE_NOPITCH 0x0002 // Used in IXAudio2::CreateSourceVoice -#define XAUDIO2_VOICE_NOSRC 0x0004 // Used in IXAudio2::CreateSourceVoice -#define XAUDIO2_VOICE_USEFILTER 0x0008 // Used in IXAudio2::CreateSource/SubmixVoice -#define XAUDIO2_PLAY_TAILS 0x0020 // Used in IXAudio2SourceVoice::Stop -#define XAUDIO2_END_OF_STREAM 0x0040 // Used in XAUDIO2_BUFFER.Flags -#define XAUDIO2_SEND_USEFILTER 0x0080 // Used in XAUDIO2_SEND_DESCRIPTOR.Flags -#define XAUDIO2_VOICE_NOSAMPLESPLAYED 0x0100 // Used in IXAudio2SourceVoice::GetState -#define XAUDIO2_STOP_ENGINE_WHEN_IDLE 0x2000 // Used in XAudio2Create to force the engine to Stop when no source voices are Started, and Start when a voice is Started -#define XAUDIO2_1024_QUANTUM 0x8000 // Used in XAudio2Create to specify nondefault processing quantum of 21.33 ms (1024 samples at 48KHz) -#define XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT 0x10000 // Used in CreateMasteringVoice to create a virtual audio client - -// Default parameters for the built-in filter -#define XAUDIO2_DEFAULT_FILTER_TYPE LowPassFilter -#define XAUDIO2_DEFAULT_FILTER_FREQUENCY XAUDIO2_MAX_FILTER_FREQUENCY -#define XAUDIO2_DEFAULT_FILTER_ONEOVERQ 1.0f - -// Internal XAudio2 constants -// The audio frame quantum can be calculated by reducing the fraction: -// SamplesPerAudioFrame / SamplesPerSecond -#define XAUDIO2_QUANTUM_NUMERATOR 1 // On Windows, XAudio2 processes audio -#define XAUDIO2_QUANTUM_DENOMINATOR 100 // in 10ms chunks (= 1/100 seconds) -#define XAUDIO2_QUANTUM_MS (1000.0f * XAUDIO2_QUANTUM_NUMERATOR / XAUDIO2_QUANTUM_DENOMINATOR) - -// XAudio2 error codes -#define FACILITY_XAUDIO2 0x896 -#define XAUDIO2_E_INVALID_CALL 0x88960001 // An API call or one of its arguments was illegal -#define XAUDIO2_E_XMA_DECODER_ERROR 0x88960002 // The XMA hardware suffered an unrecoverable error -#define XAUDIO2_E_XAPO_CREATION_FAILED 0x88960003 // XAudio2 failed to initialize an XAPO effect -#define XAUDIO2_E_DEVICE_INVALIDATED 0x88960004 // An audio device became unusable (unplugged, etc) - -/************************************************************************** - * - * Forward declarations for the XAudio2 interfaces. - * - **************************************************************************/ - -#ifdef __cplusplus -#define FWD_DECLARE(x) interface x -#else -#define FWD_DECLARE(x) typedef interface x x -#endif - -FWD_DECLARE(IXAudio2); -FWD_DECLARE(IXAudio2Voice); -FWD_DECLARE(IXAudio2SourceVoice); -FWD_DECLARE(IXAudio2SubmixVoice); -FWD_DECLARE(IXAudio2MasteringVoice); -FWD_DECLARE(IXAudio2EngineCallback); -FWD_DECLARE(IXAudio2VoiceCallback); - - -/************************************************************************** - * - * XAudio2 structures and enumerations. - * - **************************************************************************/ - - // Used in XAudio2Create, specifies which CPU(s) to use. -typedef UINT32 XAUDIO2_PROCESSOR; -#define Processor1 0x00000001 -#define Processor2 0x00000002 -#define Processor3 0x00000004 -#define Processor4 0x00000008 -#define Processor5 0x00000010 -#define Processor6 0x00000020 -#define Processor7 0x00000040 -#define Processor8 0x00000080 -#define Processor9 0x00000100 -#define Processor10 0x00000200 -#define Processor11 0x00000400 -#define Processor12 0x00000800 -#define Processor13 0x00001000 -#define Processor14 0x00002000 -#define Processor15 0x00004000 -#define Processor16 0x00008000 -#define Processor17 0x00010000 -#define Processor18 0x00020000 -#define Processor19 0x00040000 -#define Processor20 0x00080000 -#define Processor21 0x00100000 -#define Processor22 0x00200000 -#define Processor23 0x00400000 -#define Processor24 0x00800000 -#define Processor25 0x01000000 -#define Processor26 0x02000000 -#define Processor27 0x04000000 -#define Processor28 0x08000000 -#define Processor29 0x10000000 -#define Processor30 0x20000000 -#define Processor31 0x40000000 -#define Processor32 0x80000000 -#define XAUDIO2_ANY_PROCESSOR 0xffffffff -#define XAUDIO2_DEFAULT_PROCESSOR Processor1 - -// Returned by IXAudio2Voice::GetVoiceDetails -typedef struct XAUDIO2_VOICE_DETAILS -{ - UINT32 CreationFlags; // Flags the voice was created with. - UINT32 ActiveFlags; // Flags currently active. - UINT32 InputChannels; // Channels in the voice's input audio. - UINT32 InputSampleRate; // Sample rate of the voice's input audio. -} XAUDIO2_VOICE_DETAILS; - -// Used in XAUDIO2_VOICE_SENDS below -typedef struct XAUDIO2_SEND_DESCRIPTOR -{ - UINT32 Flags; // Either 0 or XAUDIO2_SEND_USEFILTER. - IXAudio2Voice* pOutputVoice; // This send's destination voice. -} XAUDIO2_SEND_DESCRIPTOR; - -// Used in the voice creation functions and in IXAudio2Voice::SetOutputVoices -typedef struct XAUDIO2_VOICE_SENDS -{ - UINT32 SendCount; // Number of sends from this voice. - XAUDIO2_SEND_DESCRIPTOR* pSends; // Array of SendCount send descriptors. -} XAUDIO2_VOICE_SENDS; - -// Used in XAUDIO2_EFFECT_CHAIN below -typedef struct XAUDIO2_EFFECT_DESCRIPTOR -{ - IUnknown* pEffect; // Pointer to the effect object's IUnknown interface. - BOOL InitialState; // TRUE if the effect should begin in the enabled state. - UINT32 OutputChannels; // How many output channels the effect should produce. -} XAUDIO2_EFFECT_DESCRIPTOR; - -// Used in the voice creation functions and in IXAudio2Voice::SetEffectChain -typedef struct XAUDIO2_EFFECT_CHAIN -{ - UINT32 EffectCount; // Number of effects in this voice's effect chain. - XAUDIO2_EFFECT_DESCRIPTOR* pEffectDescriptors; // Array of effect descriptors. -} XAUDIO2_EFFECT_CHAIN; - -// Used in XAUDIO2_FILTER_PARAMETERS below -typedef enum XAUDIO2_FILTER_TYPE -{ - LowPassFilter, // Attenuates frequencies above the cutoff frequency (state-variable filter). - BandPassFilter, // Attenuates frequencies outside a given range (state-variable filter). - HighPassFilter, // Attenuates frequencies below the cutoff frequency (state-variable filter). - NotchFilter, // Attenuates frequencies inside a given range (state-variable filter). - LowPassOnePoleFilter, // Attenuates frequencies above the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect) - HighPassOnePoleFilter // Attenuates frequencies below the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect) -} XAUDIO2_FILTER_TYPE; - -// Used in IXAudio2Voice::Set/GetFilterParameters and Set/GetOutputFilterParameters -typedef struct XAUDIO2_FILTER_PARAMETERS -{ - XAUDIO2_FILTER_TYPE Type; // Filter type. - float Frequency; // Filter coefficient. - // must be >= 0 and <= XAUDIO2_MAX_FILTER_FREQUENCY - // See XAudio2CutoffFrequencyToRadians() for state-variable filter types and - // XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types. - float OneOverQ; // Reciprocal of the filter's quality factor Q; - // must be > 0 and <= XAUDIO2_MAX_FILTER_ONEOVERQ. - // Has no effect for one-pole filters. -} XAUDIO2_FILTER_PARAMETERS; - -// Used in IXAudio2SourceVoice::SubmitSourceBuffer -typedef struct XAUDIO2_BUFFER -{ - UINT32 Flags; // Either 0 or XAUDIO2_END_OF_STREAM. - UINT32 AudioBytes; // Size of the audio data buffer in bytes. - const BYTE* pAudioData; // Pointer to the audio data buffer. - UINT32 PlayBegin; // First sample in this buffer to be played. - UINT32 PlayLength; // Length of the region to be played in samples, - // or 0 to play the whole buffer. - UINT32 LoopBegin; // First sample of the region to be looped. - UINT32 LoopLength; // Length of the desired loop region in samples, - // or 0 to loop the entire buffer. - UINT32 LoopCount; // Number of times to repeat the loop region, - // or XAUDIO2_LOOP_INFINITE to loop forever. - void* pContext; // Context value to be passed back in callbacks. -} XAUDIO2_BUFFER; - -// Used in IXAudio2SourceVoice::SubmitSourceBuffer when submitting XWMA data. -// NOTE: If an XWMA sound is submitted in more than one buffer, each buffer's -// pDecodedPacketCumulativeBytes[PacketCount-1] value must be subtracted from -// all the entries in the next buffer's pDecodedPacketCumulativeBytes array. -// And whether a sound is submitted in more than one buffer or not, the final -// buffer of the sound should use the XAUDIO2_END_OF_STREAM flag, or else the -// client must call IXAudio2SourceVoice::Discontinuity after submitting it. -typedef struct XAUDIO2_BUFFER_WMA -{ - const UINT32* pDecodedPacketCumulativeBytes; // Decoded packet's cumulative size array. - // Each element is the number of bytes accumulated - // when the corresponding XWMA packet is decoded in - // order. The array must have PacketCount elements. - UINT32 PacketCount; // Number of XWMA packets submitted. Must be >= 1 and - // divide evenly into XAUDIO2_BUFFER.AudioBytes. -} XAUDIO2_BUFFER_WMA; - -// Returned by IXAudio2SourceVoice::GetState -typedef struct XAUDIO2_VOICE_STATE -{ - void* pCurrentBufferContext; // The pContext value provided in the XAUDIO2_BUFFER - // that is currently being processed, or NULL if - // there are no buffers in the queue. - UINT32 BuffersQueued; // Number of buffers currently queued on the voice - // (including the one that is being processed). - UINT64 SamplesPlayed; // Total number of samples produced by the voice since - // it began processing the current audio stream. - // If XAUDIO2_VOICE_NOSAMPLESPLAYED is specified - // in the call to IXAudio2SourceVoice::GetState, - // this member will not be calculated, saving CPU. -} XAUDIO2_VOICE_STATE; - -// Returned by IXAudio2::GetPerformanceData -typedef struct XAUDIO2_PERFORMANCE_DATA -{ - // CPU usage information - UINT64 AudioCyclesSinceLastQuery; // CPU cycles spent on audio processing since the - // last call to StartEngine or GetPerformanceData. - UINT64 TotalCyclesSinceLastQuery; // Total CPU cycles elapsed since the last call - // (only counts the CPU XAudio2 is running on). - UINT32 MinimumCyclesPerQuantum; // Fewest CPU cycles spent processing any one - // audio quantum since the last call. - UINT32 MaximumCyclesPerQuantum; // Most CPU cycles spent processing any one - // audio quantum since the last call. - - // Memory usage information - UINT32 MemoryUsageInBytes; // Total heap space currently in use. - - // Audio latency and glitching information - UINT32 CurrentLatencyInSamples; // Minimum delay from when a sample is read from a - // source buffer to when it reaches the speakers. - UINT32 GlitchesSinceEngineStarted; // Audio dropouts since the engine was started. - - // Data about XAudio2's current workload - UINT32 ActiveSourceVoiceCount; // Source voices currently playing. - UINT32 TotalSourceVoiceCount; // Source voices currently existing. - UINT32 ActiveSubmixVoiceCount; // Submix voices currently playing/existing. - - UINT32 ActiveResamplerCount; // Resample xAPOs currently active. - UINT32 ActiveMatrixMixCount; // MatrixMix xAPOs currently active. - - // Usage of the hardware XMA decoder (Xbox 360 only) - UINT32 ActiveXmaSourceVoices; // Number of source voices decoding XMA data. - UINT32 ActiveXmaStreams; // A voice can use more than one XMA stream. -} XAUDIO2_PERFORMANCE_DATA; - -// Used in IXAudio2::SetDebugConfiguration -typedef struct XAUDIO2_DEBUG_CONFIGURATION -{ - UINT32 TraceMask; // Bitmap of enabled debug message types. - UINT32 BreakMask; // Message types that will break into the debugger. - BOOL LogThreadID; // Whether to log the thread ID with each message. - BOOL LogFileline; // Whether to log the source file and line number. - BOOL LogFunctionName; // Whether to log the function name. - BOOL LogTiming; // Whether to log message timestamps. -} XAUDIO2_DEBUG_CONFIGURATION; - -// Values for the TraceMask and BreakMask bitmaps. Only ERRORS and WARNINGS -// are valid in BreakMask. WARNINGS implies ERRORS, DETAIL implies INFO, and -// FUNC_CALLS implies API_CALLS. By default, TraceMask is ERRORS and WARNINGS -// and all the other settings are zero. -#define XAUDIO2_LOG_ERRORS 0x0001 // For handled errors with serious effects. -#define XAUDIO2_LOG_WARNINGS 0x0002 // For handled errors that may be recoverable. -#define XAUDIO2_LOG_INFO 0x0004 // Informational chit-chat (e.g. state changes). -#define XAUDIO2_LOG_DETAIL 0x0008 // More detailed chit-chat. -#define XAUDIO2_LOG_API_CALLS 0x0010 // Public API function entries and exits. -#define XAUDIO2_LOG_FUNC_CALLS 0x0020 // Internal function entries and exits. -#define XAUDIO2_LOG_TIMING 0x0040 // Delays detected and other timing data. -#define XAUDIO2_LOG_LOCKS 0x0080 // Usage of critical sections and mutexes. -#define XAUDIO2_LOG_MEMORY 0x0100 // Memory heap usage information. -#define XAUDIO2_LOG_STREAMING 0x1000 // Audio streaming information. - - -/************************************************************************** - * - * IXAudio2: Top-level XAudio2 COM interface. - * - **************************************************************************/ - - // Use default arguments if compiling as C++ -#ifdef __cplusplus -#define X2DEFAULT(x) =x -#else -#define X2DEFAULT(x) -#endif - -#undef INTERFACE -#define INTERFACE IXAudio2 -DECLARE_INTERFACE_(IXAudio2, IUnknown) -{ - // NAME: IXAudio2::QueryInterface - // DESCRIPTION: Queries for a given COM interface on the XAudio2 object. - // Only IID_IUnknown and IID_IXAudio2 are supported. - // - // ARGUMENTS: - // riid - IID of the interface to be obtained. - // ppvInterface - Returns a pointer to the requested interface. - // - STDMETHOD(QueryInterface) (THIS_ REFIID riid, _Outptr_ void** ppvInterface) PURE; - - // NAME: IXAudio2::AddRef - // DESCRIPTION: Adds a reference to the XAudio2 object. - // - STDMETHOD_(ULONG, AddRef) (THIS) PURE; - - // NAME: IXAudio2::Release - // DESCRIPTION: Releases a reference to the XAudio2 object. - // - STDMETHOD_(ULONG, Release) (THIS) PURE; - - // NAME: IXAudio2::RegisterForCallbacks - // DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks. - // - // ARGUMENTS: - // pCallback - Callback interface to be called during each processing pass. - // - STDMETHOD(RegisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; - - // NAME: IXAudio2::UnregisterForCallbacks - // DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks. - // - // ARGUMENTS: - // pCallback - Previously registered callback interface to be removed. - // - STDMETHOD_(void, UnregisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; - - // NAME: IXAudio2::CreateSourceVoice - // DESCRIPTION: Creates and configures a source voice. - // - // ARGUMENTS: - // ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface. - // pSourceFormat - Format of the audio that will be fed to the voice. - // Flags - XAUDIO2_VOICE flags specifying the source voice's behavior. - // MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed. - // pCallback - Optional pointer to a client-provided callback interface. - // pSendList - Optional list of voices this voice should send audio to. - // pEffectChain - Optional list of effects to apply to the audio data. - // - STDMETHOD(CreateSourceVoice) (THIS_ _Outptr_ IXAudio2SourceVoice** ppSourceVoice, - _In_ const WAVEFORMATEX* pSourceFormat, - UINT32 Flags X2DEFAULT(0), - float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO), - _In_opt_ IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL), - _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL), - _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE; - - // NAME: IXAudio2::CreateSubmixVoice - // DESCRIPTION: Creates and configures a submix voice. - // - // ARGUMENTS: - // ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface. - // InputChannels - Number of channels in this voice's input audio data. - // InputSampleRate - Sample rate of this voice's input audio data. - // Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior. - // ProcessingStage - Arbitrary number that determines the processing order. - // pSendList - Optional list of voices this voice should send audio to. - // pEffectChain - Optional list of effects to apply to the audio data. - // - STDMETHOD(CreateSubmixVoice) (THIS_ _Outptr_ IXAudio2SubmixVoice** ppSubmixVoice, - UINT32 InputChannels, UINT32 InputSampleRate, - UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0), - _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL), - _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE; - - - // NAME: IXAudio2::CreateMasteringVoice - // DESCRIPTION: Creates and configures a mastering voice. - // - // ARGUMENTS: - // ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface. - // InputChannels - Number of channels in this voice's input audio data. - // InputSampleRate - Sample rate of this voice's input audio data. - // Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior. - // szDeviceId - Identifier of the device to receive the output audio. - // pEffectChain - Optional list of effects to apply to the audio data. - // StreamCategory - The audio stream category to use for this mastering voice - // - STDMETHOD(CreateMasteringVoice) (THIS_ _Outptr_ IXAudio2MasteringVoice** ppMasteringVoice, - UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS), - UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE), - UINT32 Flags X2DEFAULT(0), _In_opt_z_ LPCWSTR szDeviceId X2DEFAULT(NULL), - _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL), - _In_ AUDIO_STREAM_CATEGORY StreamCategory X2DEFAULT(AudioCategory_GameEffects)) PURE; - - // NAME: IXAudio2::StartEngine - // DESCRIPTION: Creates and starts the audio processing thread. - // - STDMETHOD(StartEngine) (THIS) PURE; - - // NAME: IXAudio2::StopEngine - // DESCRIPTION: Stops and destroys the audio processing thread. - // - STDMETHOD_(void, StopEngine) (THIS) PURE; - - // NAME: IXAudio2::CommitChanges - // DESCRIPTION: Atomically applies a set of operations previously tagged - // with a given identifier. - // - // ARGUMENTS: - // OperationSet - Identifier of the set of operations to be applied. - // - STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE; - - // NAME: IXAudio2::GetPerformanceData - // DESCRIPTION: Returns current resource usage details: memory, CPU, etc. - // - // ARGUMENTS: - // pPerfData - Returns the performance data structure. - // - STDMETHOD_(void, GetPerformanceData) (THIS_ _Out_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE; - - // NAME: IXAudio2::SetDebugConfiguration - // DESCRIPTION: Configures XAudio2's debug output (in debug builds only). - // - // ARGUMENTS: - // pDebugConfiguration - Structure describing the debug output behavior. - // pReserved - Optional parameter; must be NULL. - // - STDMETHOD_(void, SetDebugConfiguration) (THIS_ _In_opt_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration, - _Reserved_ void* pReserved X2DEFAULT(NULL)) PURE; -}; - - -/************************************************************************** - * - * IXAudio2Voice: Base voice management interface. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2Voice -DECLARE_INTERFACE(IXAudio2Voice) -{ - // These methods are declared in a macro so that the same declarations - // can be used in the derived voice types (IXAudio2SourceVoice, etc). - -#define Declare_IXAudio2Voice_Methods() \ - \ - /* NAME: IXAudio2Voice::GetVoiceDetails - // DESCRIPTION: Returns the basic characteristics of this voice. - // - // ARGUMENTS: - // pVoiceDetails - Returns the voice's details. - */\ - STDMETHOD_(void, GetVoiceDetails) (THIS_ _Out_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \ - \ - /* NAME: IXAudio2Voice::SetOutputVoices - // DESCRIPTION: Replaces the set of submix/mastering voices that receive - // this voice's output. - // - // ARGUMENTS: - // pSendList - Optional list of voices this voice should send audio to. - */\ - STDMETHOD(SetOutputVoices) (THIS_ _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList) PURE; \ - \ - /* NAME: IXAudio2Voice::SetEffectChain - // DESCRIPTION: Replaces this voice's current effect chain with a new one. - // - // ARGUMENTS: - // pEffectChain - Structure describing the new effect chain to be used. - */\ - STDMETHOD(SetEffectChain) (THIS_ _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \ - \ - /* NAME: IXAudio2Voice::EnableEffect - // DESCRIPTION: Enables an effect in this voice's effect chain. - // - // ARGUMENTS: - // EffectIndex - Index of an effect within this voice's effect chain. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::DisableEffect - // DESCRIPTION: Disables an effect in this voice's effect chain. - // - // ARGUMENTS: - // EffectIndex - Index of an effect within this voice's effect chain. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetEffectState - // DESCRIPTION: Returns the running state of an effect. - // - // ARGUMENTS: - // EffectIndex - Index of an effect within this voice's effect chain. - // pEnabled - Returns the enabled/disabled state of the given effect. - */\ - STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, _Out_ BOOL* pEnabled) PURE; \ - \ - /* NAME: IXAudio2Voice::SetEffectParameters - // DESCRIPTION: Sets effect-specific parameters. - // - // REMARKS: Unlike IXAPOParameters::SetParameters, this method may - // be called from any thread. XAudio2 implements - // appropriate synchronization to copy the parameters to the - // realtime audio processing thread. - // - // ARGUMENTS: - // EffectIndex - Index of an effect within this voice's effect chain. - // pParameters - Pointer to an effect-specific parameters block. - // ParametersByteSize - Size of the pParameters array in bytes. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \ - _In_reads_bytes_(ParametersByteSize) const void* pParameters, \ - UINT32 ParametersByteSize, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetEffectParameters - // DESCRIPTION: Obtains the current effect-specific parameters. - // - // ARGUMENTS: - // EffectIndex - Index of an effect within this voice's effect chain. - // pParameters - Returns the current values of the effect-specific parameters. - // ParametersByteSize - Size of the pParameters array in bytes. - */\ - STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, \ - _Out_writes_bytes_(ParametersByteSize) void* pParameters, \ - UINT32 ParametersByteSize) PURE; \ - \ - /* NAME: IXAudio2Voice::SetFilterParameters - // DESCRIPTION: Sets this voice's filter parameters. - // - // ARGUMENTS: - // pParameters - Pointer to the filter's parameter structure. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetFilterParameters) (THIS_ _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetFilterParameters - // DESCRIPTION: Returns this voice's current filter parameters. - // - // ARGUMENTS: - // pParameters - Returns the filter parameters. - */\ - STDMETHOD_(void, GetFilterParameters) (THIS_ _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \ - \ - /* NAME: IXAudio2Voice::SetOutputFilterParameters - // DESCRIPTION: Sets the filter parameters on one of this voice's sends. - // - // ARGUMENTS: - // pDestinationVoice - Destination voice of the send whose filter parameters will be set. - // pParameters - Pointer to the filter's parameter structure. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ - _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetOutputFilterParameters - // DESCRIPTION: Returns the filter parameters from one of this voice's sends. - // - // ARGUMENTS: - // pDestinationVoice - Destination voice of the send whose filter parameters will be read. - // pParameters - Returns the filter parameters. - */\ - STDMETHOD_(void, GetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ - _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \ - \ - /* NAME: IXAudio2Voice::SetVolume - // DESCRIPTION: Sets this voice's overall volume level. - // - // ARGUMENTS: - // Volume - New overall volume level to be used, as an amplitude factor. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetVolume) (THIS_ float Volume, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetVolume - // DESCRIPTION: Obtains this voice's current overall volume level. - // - // ARGUMENTS: - // pVolume: Returns the voice's current overall volume level. - */\ - STDMETHOD_(void, GetVolume) (THIS_ _Out_ float* pVolume) PURE; \ - \ - /* NAME: IXAudio2Voice::SetChannelVolumes - // DESCRIPTION: Sets this voice's per-channel volume levels. - // - // ARGUMENTS: - // Channels - Used to confirm the voice's channel count. - // pVolumes - Array of per-channel volume levels to be used. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, _In_reads_(Channels) const float* pVolumes, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetChannelVolumes - // DESCRIPTION: Returns this voice's current per-channel volume levels. - // - // ARGUMENTS: - // Channels - Used to confirm the voice's channel count. - // pVolumes - Returns an array of the current per-channel volume levels. - */\ - STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, _Out_writes_(Channels) float* pVolumes) PURE; \ - \ - /* NAME: IXAudio2Voice::SetOutputMatrix - // DESCRIPTION: Sets the volume levels used to mix from each channel of this - // voice's output audio to each channel of a given destination - // voice's input audio. - // - // ARGUMENTS: - // pDestinationVoice - The destination voice whose mix matrix to change. - // SourceChannels - Used to confirm this voice's output channel count - // (the number of channels produced by the last effect in the chain). - // DestinationChannels - Confirms the destination voice's input channels. - // pLevelMatrix - Array of [SourceChannels * DestinationChannels] send - // levels. The level used to send from source channel S to destination - // channel D should be in pLevelMatrix[S + SourceChannels * D]. - // OperationSet - Used to identify this call as part of a deferred batch. - */\ - STDMETHOD(SetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ - UINT32 SourceChannels, UINT32 DestinationChannels, \ - _In_reads_(SourceChannels * DestinationChannels) const float* pLevelMatrix, \ - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ - \ - /* NAME: IXAudio2Voice::GetOutputMatrix - // DESCRIPTION: Obtains the volume levels used to send each channel of this - // voice's output audio to each channel of a given destination - // voice's input audio. - // - // ARGUMENTS: - // pDestinationVoice - The destination voice whose mix matrix to obtain. - // SourceChannels - Used to confirm this voice's output channel count - // (the number of channels produced by the last effect in the chain). - // DestinationChannels - Confirms the destination voice's input channels. - // pLevelMatrix - Array of send levels, as above. - */\ - STDMETHOD_(void, GetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ - UINT32 SourceChannels, UINT32 DestinationChannels, \ - _Out_writes_(SourceChannels * DestinationChannels) float* pLevelMatrix) PURE; \ - \ - /* NAME: IXAudio2Voice::DestroyVoice - // DESCRIPTION: Destroys this voice, stopping it if necessary and removing - // it from the XAudio2 graph. - */\ - STDMETHOD_(void, DestroyVoice) (THIS) PURE - - Declare_IXAudio2Voice_Methods(); -}; - - -/************************************************************************** - * - * IXAudio2SourceVoice: Source voice management interface. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2SourceVoice -DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice) -{ - // Methods from IXAudio2Voice base interface - Declare_IXAudio2Voice_Methods(); - - // NAME: IXAudio2SourceVoice::Start - // DESCRIPTION: Makes this voice start consuming and processing audio. - // - // ARGUMENTS: - // Flags - Flags controlling how the voice should be started. - // OperationSet - Used to identify this call as part of a deferred batch. - // - STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; - - // NAME: IXAudio2SourceVoice::Stop - // DESCRIPTION: Makes this voice stop consuming audio. - // - // ARGUMENTS: - // Flags - Flags controlling how the voice should be stopped. - // OperationSet - Used to identify this call as part of a deferred batch. - // - STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; - - // NAME: IXAudio2SourceVoice::SubmitSourceBuffer - // DESCRIPTION: Adds a new audio buffer to this voice's input queue. - // - // ARGUMENTS: - // pBuffer - Pointer to the buffer structure to be queued. - // pBufferWMA - Additional structure used only when submitting XWMA data. - // - STDMETHOD(SubmitSourceBuffer) (THIS_ _In_ const XAUDIO2_BUFFER* pBuffer, _In_opt_ const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE; - - // NAME: IXAudio2SourceVoice::FlushSourceBuffers - // DESCRIPTION: Removes all pending audio buffers from this voice's queue. - // - STDMETHOD(FlushSourceBuffers) (THIS) PURE; - - // NAME: IXAudio2SourceVoice::Discontinuity - // DESCRIPTION: Notifies the voice of an intentional break in the stream of - // audio buffers (e.g. the end of a sound), to prevent XAudio2 - // from interpreting an empty buffer queue as a glitch. - // - STDMETHOD(Discontinuity) (THIS) PURE; - - // NAME: IXAudio2SourceVoice::ExitLoop - // DESCRIPTION: Breaks out of the current loop when its end is reached. - // - // ARGUMENTS: - // OperationSet - Used to identify this call as part of a deferred batch. - // - STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; - - // NAME: IXAudio2SourceVoice::GetState - // DESCRIPTION: Returns the number of buffers currently queued on this voice, - // the pContext value associated with the currently processing - // buffer (if any), and other voice state information. - // - // ARGUMENTS: - // pVoiceState - Returns the state information. - // Flags - Flags controlling what voice state is returned. - // - STDMETHOD_(void, GetState) (THIS_ _Out_ XAUDIO2_VOICE_STATE* pVoiceState, UINT32 Flags X2DEFAULT(0)) PURE; - - // NAME: IXAudio2SourceVoice::SetFrequencyRatio - // DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch. - // - // ARGUMENTS: - // Ratio - Frequency change, expressed as source frequency / target frequency. - // OperationSet - Used to identify this call as part of a deferred batch. - // - STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio, - UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; - - // NAME: IXAudio2SourceVoice::GetFrequencyRatio - // DESCRIPTION: Returns this voice's current frequency adjustment ratio. - // - // ARGUMENTS: - // pRatio - Returns the frequency adjustment. - // - STDMETHOD_(void, GetFrequencyRatio) (THIS_ _Out_ float* pRatio) PURE; - - // NAME: IXAudio2SourceVoice::SetSourceSampleRate - // DESCRIPTION: Reconfigures this voice to treat its source data as being - // at a different sample rate than the original one specified - // in CreateSourceVoice's pSourceFormat argument. - // - // ARGUMENTS: - // UINT32 - The intended sample rate of further submitted source data. - // - STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE; -}; - - -/************************************************************************** - * - * IXAudio2SubmixVoice: Submixing voice management interface. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2SubmixVoice -DECLARE_INTERFACE_(IXAudio2SubmixVoice, IXAudio2Voice) -{ - // Methods from IXAudio2Voice base interface - Declare_IXAudio2Voice_Methods(); - - // There are currently no methods specific to submix voices. -}; - - -/************************************************************************** - * - * IXAudio2MasteringVoice: Mastering voice management interface. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2MasteringVoice -DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice) -{ - // Methods from IXAudio2Voice base interface - Declare_IXAudio2Voice_Methods(); - - // NAME: IXAudio2MasteringVoice::GetChannelMask - // DESCRIPTION: Returns the channel mask for this voice - // - // ARGUMENTS: - // pChannelMask - returns the channel mask for this voice. This corresponds - // to the dwChannelMask member of WAVEFORMATEXTENSIBLE. - // - STDMETHOD(GetChannelMask) (THIS_ _Out_ DWORD* pChannelmask) PURE; -}; - - -/************************************************************************** - * - * IXAudio2EngineCallback: Client notification interface for engine events. - * - * REMARKS: Contains methods to notify the client when certain events happen - * in the XAudio2 engine. This interface should be implemented by - * the client. XAudio2 will call these methods via the interface - * pointer provided by the client when it calls - * IXAudio2::RegisterForCallbacks. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2EngineCallback -DECLARE_INTERFACE(IXAudio2EngineCallback) -{ - // Called by XAudio2 just before an audio processing pass begins. - STDMETHOD_(void, OnProcessingPassStart) (THIS) PURE; - - // Called just after an audio processing pass ends. - STDMETHOD_(void, OnProcessingPassEnd) (THIS) PURE; - - // Called in the event of a critical system error which requires XAudio2 - // to be closed down and restarted. The error code is given in Error. - STDMETHOD_(void, OnCriticalError) (THIS_ HRESULT Error) PURE; -}; - - -/************************************************************************** - * - * IXAudio2VoiceCallback: Client notification interface for voice events. - * - * REMARKS: Contains methods to notify the client when certain events happen - * in an XAudio2 voice. This interface should be implemented by the - * client. XAudio2 will call these methods via an interface pointer - * provided by the client in the IXAudio2::CreateSourceVoice call. - * - **************************************************************************/ - -#undef INTERFACE -#define INTERFACE IXAudio2VoiceCallback -DECLARE_INTERFACE(IXAudio2VoiceCallback) -{ - // Called just before this voice's processing pass begins. - STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE; - - // Called just after this voice's processing pass ends. - STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE; - - // Called when this voice has just finished playing a buffer stream - // (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer). - STDMETHOD_(void, OnStreamEnd) (THIS) PURE; - - // Called when this voice is about to start processing a new buffer. - STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) PURE; - - // Called when this voice has just finished processing a buffer. - // The buffer can now be reused or destroyed. - STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext) PURE; - - // Called when this voice has just reached the end position of a loop. - STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext) PURE; - - // Called in the event of a critical error during voice processing, - // such as a failing xAPO or an error from the hardware XMA decoder. - // The voice may have to be destroyed and re-created to recover from - // the error. The callback arguments report which buffer was being - // processed when the error occurred, and its HRESULT code. - STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) PURE; -}; - - -/************************************************************************** - * - * Macros to make it easier to use the XAudio2 COM interfaces in C code. - * - **************************************************************************/ - -#ifndef __cplusplus - - // IXAudio2 -#define IXAudio2_QueryInterface(This,riid,ppvInterface) ((This)->lpVtbl->QueryInterface(This,riid,ppvInterface)) -#define IXAudio2_AddRef(This) ((This)->lpVtbl->AddRef(This)) -#define IXAudio2_Release(This) ((This)->lpVtbl->Release(This)) -#define IXAudio2_CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) ((This)->lpVtbl->CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)) -#define IXAudio2_CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain) ((This)->lpVtbl->CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain)) -#define IXAudio2_CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory) ((This)->lpVtbl->CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory)) -#define IXAudio2_StartEngine(This) ((This)->lpVtbl->StartEngine(This)) -#define IXAudio2_StopEngine(This) ((This)->lpVtbl->StopEngine(This)) -#define IXAudio2_CommitChanges(This,OperationSet) ((This)->lpVtbl->CommitChanges(This,OperationSet)) -#define IXAudio2_GetPerformanceData(This,pPerfData) ((This)->lpVtbl->GetPerformanceData(This,pPerfData)) -#define IXAudio2_SetDebugConfiguration(This,pDebugConfiguration,pReserved) ((This)->lpVtbl->SetDebugConfiguration(This,pDebugConfiguration,pReserved)) - -// IXAudio2Voice -#define IXAudio2Voice_GetVoiceDetails(This,pVoiceDetails) ((This)->lpVtbl->GetVoiceDetails(This,pVoiceDetails)) -#define IXAudio2Voice_SetOutputVoices(This,pSendList) ((This)->lpVtbl->SetOutputVoices(This,pSendList)) -#define IXAudio2Voice_SetEffectChain(This,pEffectChain) ((This)->lpVtbl->SetEffectChain(This,pEffectChain)) -#define IXAudio2Voice_EnableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->EnableEffect(This,EffectIndex,OperationSet)) -#define IXAudio2Voice_DisableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->DisableEffect(This,EffectIndex,OperationSet)) -#define IXAudio2Voice_GetEffectState(This,EffectIndex,pEnabled) ((This)->lpVtbl->GetEffectState(This,EffectIndex,pEnabled)) -#define IXAudio2Voice_SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize, OperationSet) ((This)->lpVtbl->SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize,OperationSet)) -#define IXAudio2Voice_GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize) ((This)->lpVtbl->GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize)) -#define IXAudio2Voice_SetFilterParameters(This,pParameters,OperationSet) ((This)->lpVtbl->SetFilterParameters(This,pParameters,OperationSet)) -#define IXAudio2Voice_GetFilterParameters(This,pParameters) ((This)->lpVtbl->GetFilterParameters(This,pParameters)) -#define IXAudio2Voice_SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet) ((This)->lpVtbl->SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet)) -#define IXAudio2Voice_GetOutputFilterParameters(This,pDestinationVoice,pParameters) ((This)->lpVtbl->GetOutputFilterParameters(This,pDestinationVoice,pParameters)) -#define IXAudio2Voice_SetVolume(This,Volume,OperationSet) ((This)->lpVtbl->SetVolume(This,Volume,OperationSet)) -#define IXAudio2Voice_GetVolume(This,pVolume) ((This)->lpVtbl->GetVolume(This,pVolume)) -#define IXAudio2Voice_SetChannelVolumes(This,Channels,pVolumes,OperationSet) ((This)->lpVtbl->SetChannelVolumes(This,Channels,pVolumes,OperationSet)) -#define IXAudio2Voice_GetChannelVolumes(This,Channels,pVolumes) ((This)->lpVtbl->GetChannelVolumes(This,Channels,pVolumes)) -#define IXAudio2Voice_SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet) ((This)->lpVtbl->SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet)) -#define IXAudio2Voice_GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix) ((This)->lpVtbl->GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix)) -#define IXAudio2Voice_DestroyVoice(This) ((This)->lpVtbl->DestroyVoice(This)) - -// IXAudio2SourceVoice -#define IXAudio2SourceVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails -#define IXAudio2SourceVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices -#define IXAudio2SourceVoice_SetEffectChain IXAudio2Voice_SetEffectChain -#define IXAudio2SourceVoice_EnableEffect IXAudio2Voice_EnableEffect -#define IXAudio2SourceVoice_DisableEffect IXAudio2Voice_DisableEffect -#define IXAudio2SourceVoice_GetEffectState IXAudio2Voice_GetEffectState -#define IXAudio2SourceVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters -#define IXAudio2SourceVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters -#define IXAudio2SourceVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters -#define IXAudio2SourceVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters -#define IXAudio2SourceVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters -#define IXAudio2SourceVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters -#define IXAudio2SourceVoice_SetVolume IXAudio2Voice_SetVolume -#define IXAudio2SourceVoice_GetVolume IXAudio2Voice_GetVolume -#define IXAudio2SourceVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes -#define IXAudio2SourceVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes -#define IXAudio2SourceVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix -#define IXAudio2SourceVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix -#define IXAudio2SourceVoice_DestroyVoice IXAudio2Voice_DestroyVoice -#define IXAudio2SourceVoice_Start(This,Flags,OperationSet) ((This)->lpVtbl->Start(This,Flags,OperationSet)) -#define IXAudio2SourceVoice_Stop(This,Flags,OperationSet) ((This)->lpVtbl->Stop(This,Flags,OperationSet)) -#define IXAudio2SourceVoice_SubmitSourceBuffer(This,pBuffer,pBufferWMA) ((This)->lpVtbl->SubmitSourceBuffer(This,pBuffer,pBufferWMA)) -#define IXAudio2SourceVoice_FlushSourceBuffers(This) ((This)->lpVtbl->FlushSourceBuffers(This)) -#define IXAudio2SourceVoice_Discontinuity(This) ((This)->lpVtbl->Discontinuity(This)) -#define IXAudio2SourceVoice_ExitLoop(This,OperationSet) ((This)->lpVtbl->ExitLoop(This,OperationSet)) -#define IXAudio2SourceVoice_GetState(This,pVoiceState,Flags) ((This)->lpVtbl->GetState(This,pVoiceState,Flags)) -#define IXAudio2SourceVoice_SetFrequencyRatio(This,Ratio,OperationSet) ((This)->lpVtbl->SetFrequencyRatio(This,Ratio,OperationSet)) -#define IXAudio2SourceVoice_GetFrequencyRatio(This,pRatio) ((This)->lpVtbl->GetFrequencyRatio(This,pRatio)) -#define IXAudio2SourceVoice_SetSourceSampleRate(This,NewSourceSampleRate) ((This)->lpVtbl->SetSourceSampleRate(This,NewSourceSampleRate)) - -// IXAudio2SubmixVoice -#define IXAudio2SubmixVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails -#define IXAudio2SubmixVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices -#define IXAudio2SubmixVoice_SetEffectChain IXAudio2Voice_SetEffectChain -#define IXAudio2SubmixVoice_EnableEffect IXAudio2Voice_EnableEffect -#define IXAudio2SubmixVoice_DisableEffect IXAudio2Voice_DisableEffect -#define IXAudio2SubmixVoice_GetEffectState IXAudio2Voice_GetEffectState -#define IXAudio2SubmixVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters -#define IXAudio2SubmixVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters -#define IXAudio2SubmixVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters -#define IXAudio2SubmixVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters -#define IXAudio2SubmixVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters -#define IXAudio2SubmixVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters -#define IXAudio2SubmixVoice_SetVolume IXAudio2Voice_SetVolume -#define IXAudio2SubmixVoice_GetVolume IXAudio2Voice_GetVolume -#define IXAudio2SubmixVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes -#define IXAudio2SubmixVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes -#define IXAudio2SubmixVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix -#define IXAudio2SubmixVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix -#define IXAudio2SubmixVoice_DestroyVoice IXAudio2Voice_DestroyVoice - -/* IXAudio2MasteringVoice */ -#define IXAudio2MasteringVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails -#define IXAudio2MasteringVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices -#define IXAudio2MasteringVoice_SetEffectChain IXAudio2Voice_SetEffectChain -#define IXAudio2MasteringVoice_EnableEffect IXAudio2Voice_EnableEffect -#define IXAudio2MasteringVoice_DisableEffect IXAudio2Voice_DisableEffect -#define IXAudio2MasteringVoice_GetEffectState IXAudio2Voice_GetEffectState -#define IXAudio2MasteringVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters -#define IXAudio2MasteringVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters -#define IXAudio2MasteringVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters -#define IXAudio2MasteringVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters -#define IXAudio2MasteringVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters -#define IXAudio2MasteringVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters -#define IXAudio2MasteringVoice_SetVolume IXAudio2Voice_SetVolume -#define IXAudio2MasteringVoice_GetVolume IXAudio2Voice_GetVolume -#define IXAudio2MasteringVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes -#define IXAudio2MasteringVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes -#define IXAudio2MasteringVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix -#define IXAudio2MasteringVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix -#define IXAudio2MasteringVoice_DestroyVoice IXAudio2Voice_DestroyVoice -#define IXAudio2MasteringVoice_GetChannelMask(This,pChannelMask) ((This)->lpVtbl->GetChannelMask(This,pChannelMask)) - -#endif /* #ifndef __cplusplus */ - - -/************************************************************************** - * - * Utility functions used to convert from pitch in semitones and volume - * in decibels to the frequency and amplitude ratio units used by XAudio2. - * These are only defined if the client #defines XAUDIO2_HELPER_FUNCTIONS - * prior to #including xaudio2.h. - * - **************************************************************************/ - -#ifdef XAUDIO2_HELPER_FUNCTIONS - -#define _USE_MATH_DEFINES /* Make math.h define M_PI */ -#include /* For powf, log10f, sinf and asinf */ - -/* Calculate the argument to SetVolume from a decibel value */ -static INLINE float XAudio2DecibelsToAmplitudeRatio(float Decibels) -{ - return powf(10.0f, Decibels / 20.0f); -} - -/* Recover a volume in decibels from an amplitude factor */ -static INLINE float XAudio2AmplitudeRatioToDecibels(float Volume) -{ - if (Volume == 0) - return -3.402823466e+38f; /* Smallest float value (-FLT_MAX) */ - return 20.0f * log10f(Volume); -} - -/* Calculate the argument to SetFrequencyRatio from a semitone value */ -static INLINE float XAudio2SemitonesToFrequencyRatio(float Semitones) -{ - /* FrequencyRatio = 2 ^ Octaves +/* RetroArch - A frontend for libretro. + * Copyright (C) 2018 - Krzysztof Haładyn + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + + /************************************************************************** + * + * Copyright (c) Microsoft Corporation. All rights reserved. + * + * File: xaudio2.h + * Content: Declarations for the XAudio2 game audio API. + * + **************************************************************************/ + + /* Modified slightly to build without requiring the WinRT compiler since that is only available in C++ sources */ + +#ifdef _MSC_VER +#pragma once +#endif + +#ifndef __XAUDIO2_INCLUDED__ +#define __XAUDIO2_INCLUDED__ + +#include + +#include + +#if(_WIN32_WINNT < _WIN32_WINNT_WIN8) +#error "This version of XAudio2 is available only in Windows 8 or later. Use the XAudio2 headers and libraries from the DirectX SDK with applications that target Windows 7 and earlier versions." +#endif // (_WIN32_WINNT < _WIN32_WINNT_WIN8) + +#include + +#pragma region Application Family +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_TV_APP | WINAPI_PARTITION_TV_TITLE) + +// Current name of the DLL shipped in the same SDK as this header. +// The name reflects the current version +#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) +#define XAUDIO2_DLL_A "xaudio2_9.dll" +#define XAUDIO2_DLL_W L"xaudio2_9.dll" +#define XAUDIO2D_DLL_A "xaudio2_9d.dll" +#define XAUDIO2D_DLL_W L"xaudio2_9d.dll" +#else +#define XAUDIO2_DLL_A "xaudio2_8.dll" +#define XAUDIO2_DLL_W L"xaudio2_8.dll" +#define XAUDIO2D_DLL_A "xaudio2_8.dll" +#define XAUDIO2D_DLL_W L"xaudio2_8.dll" +#endif + +#ifdef UNICODE +#define XAUDIO2_DLL XAUDIO2_DLL_W +#define XAUDIO2D_DLL XAUDIO2D_DLL_W +#else +#define XAUDIO2_DLL XAUDIO2_DLL_A +#define XAUDIO2D_DLL XAUDIO2D_DLL_A +#endif + +/************************************************************************** + * + * XAudio2 COM object class and interface IDs. + * + **************************************************************************/ + +#include + +#if defined(__cplusplus__) && defined(__WINRT__) + +#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) + // XAudio 2.9 +interface __declspec(uuid("2B02E3CF-2E0B-4ec3-BE45-1B2A3FE7210D")) IXAudio2; +#else + // XAudio 2.8 +interface __declspec(uuid("60d8dac8-5aa1-4e8e-b597-2f5e2883d484")) IXAudio2; +#endif + +#else + + /* Modified for C support */ +#define DEFINE_GUID_X(n, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + static const GUID n = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } +#define DEFINE_CLSID_X(className, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + DEFINE_GUID_X(CLSID_##className, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) +#define DEFINE_IID_X(interfaceName, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ + DEFINE_GUID_X(IID_##interfaceName, 0x##l, 0x##w1, 0x##w2, 0x##b1, 0x##b2, 0x##b3, 0x##b4, 0x##b5, 0x##b6, 0x##b7, 0x##b8) + +#if(_WIN32_WINNT >= _WIN32_WINNT_WIN10) +DEFINE_IID_X(IXAudio2, 2B02E3CF, 2E0B, 4ec3, BE, 45, 1B, 2A, 3F, E7, 21, 0D); +#else +DEFINE_IID_X(IXAudio2, 60d8dac8, 5aa1, 4e8e, b5, 97, 2f, 5e, 28, 83, d4, 84); +#endif + +#endif + +// Ignore the rest of this header if only the GUID definitions were requested +#ifndef GUID_DEFS_ONLY + +#include // Windows COM declarations +#include // Markers for documenting API semantics +#include // Basic data types and constants for audio work +#include // For AUDIO_STREAM_CATEGORY + +// All structures defined in this file use tight field packing +#pragma pack(push, 1) + +/************************************************************************** + * + * XAudio2 constants, flags and error codes. + * + **************************************************************************/ + + // Numeric boundary values +#define XAUDIO2_MAX_BUFFER_BYTES 0x80000000 // Maximum bytes allowed in a source buffer +#define XAUDIO2_MAX_QUEUED_BUFFERS 64 // Maximum buffers allowed in a voice queue +#define XAUDIO2_MAX_BUFFERS_SYSTEM 2 // Maximum buffers allowed for system threads (Xbox 360 only) +#define XAUDIO2_MAX_AUDIO_CHANNELS 64 // Maximum channels in an audio stream +#define XAUDIO2_MIN_SAMPLE_RATE 1000 // Minimum audio sample rate supported +#define XAUDIO2_MAX_SAMPLE_RATE 200000 // Maximum audio sample rate supported +#define XAUDIO2_MAX_VOLUME_LEVEL 16777216.0f // Maximum acceptable volume level (2^24) +#define XAUDIO2_MIN_FREQ_RATIO (1/1024.0f) // Minimum SetFrequencyRatio argument +#define XAUDIO2_MAX_FREQ_RATIO 1024.0f // Maximum MaxFrequencyRatio argument +#define XAUDIO2_DEFAULT_FREQ_RATIO 2.0f // Default MaxFrequencyRatio argument +#define XAUDIO2_MAX_FILTER_ONEOVERQ 1.5f // Maximum XAUDIO2_FILTER_PARAMETERS.OneOverQ +#define XAUDIO2_MAX_FILTER_FREQUENCY 1.0f // Maximum XAUDIO2_FILTER_PARAMETERS.Frequency +#define XAUDIO2_MAX_LOOP_COUNT 254 // Maximum non-infinite XAUDIO2_BUFFER.LoopCount +#define XAUDIO2_MAX_INSTANCES 8 // Maximum simultaneous XAudio2 objects on Xbox 360 + +// For XMA voices on Xbox 360 there is an additional restriction on the MaxFrequencyRatio +// argument and the voice's sample rate: the product of these numbers cannot exceed 600000 +// for one-channel voices or 300000 for voices with more than one channel. +#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MONO 600000 +#define XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MULTICHANNEL 300000 + +// Numeric values with special meanings +#define XAUDIO2_COMMIT_NOW 0 // Used as an OperationSet argument +#define XAUDIO2_COMMIT_ALL 0 // Used in IXAudio2::CommitChanges +#define XAUDIO2_INVALID_OPSET (UINT32)(-1) // Not allowed for OperationSet arguments +#define XAUDIO2_NO_LOOP_REGION 0 // Used in XAUDIO2_BUFFER.LoopCount +#define XAUDIO2_LOOP_INFINITE 255 // Used in XAUDIO2_BUFFER.LoopCount +#define XAUDIO2_DEFAULT_CHANNELS 0 // Used in CreateMasteringVoice +#define XAUDIO2_DEFAULT_SAMPLERATE 0 // Used in CreateMasteringVoice + +// Flags +#define XAUDIO2_DEBUG_ENGINE 0x0001 // Used in XAudio2Create +#define XAUDIO2_VOICE_NOPITCH 0x0002 // Used in IXAudio2::CreateSourceVoice +#define XAUDIO2_VOICE_NOSRC 0x0004 // Used in IXAudio2::CreateSourceVoice +#define XAUDIO2_VOICE_USEFILTER 0x0008 // Used in IXAudio2::CreateSource/SubmixVoice +#define XAUDIO2_PLAY_TAILS 0x0020 // Used in IXAudio2SourceVoice::Stop +#define XAUDIO2_END_OF_STREAM 0x0040 // Used in XAUDIO2_BUFFER.Flags +#define XAUDIO2_SEND_USEFILTER 0x0080 // Used in XAUDIO2_SEND_DESCRIPTOR.Flags +#define XAUDIO2_VOICE_NOSAMPLESPLAYED 0x0100 // Used in IXAudio2SourceVoice::GetState +#define XAUDIO2_STOP_ENGINE_WHEN_IDLE 0x2000 // Used in XAudio2Create to force the engine to Stop when no source voices are Started, and Start when a voice is Started +#define XAUDIO2_1024_QUANTUM 0x8000 // Used in XAudio2Create to specify nondefault processing quantum of 21.33 ms (1024 samples at 48KHz) +#define XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT 0x10000 // Used in CreateMasteringVoice to create a virtual audio client + +// Default parameters for the built-in filter +#define XAUDIO2_DEFAULT_FILTER_TYPE LowPassFilter +#define XAUDIO2_DEFAULT_FILTER_FREQUENCY XAUDIO2_MAX_FILTER_FREQUENCY +#define XAUDIO2_DEFAULT_FILTER_ONEOVERQ 1.0f + +// Internal XAudio2 constants +// The audio frame quantum can be calculated by reducing the fraction: +// SamplesPerAudioFrame / SamplesPerSecond +#define XAUDIO2_QUANTUM_NUMERATOR 1 // On Windows, XAudio2 processes audio +#define XAUDIO2_QUANTUM_DENOMINATOR 100 // in 10ms chunks (= 1/100 seconds) +#define XAUDIO2_QUANTUM_MS (1000.0f * XAUDIO2_QUANTUM_NUMERATOR / XAUDIO2_QUANTUM_DENOMINATOR) + +// XAudio2 error codes +#define FACILITY_XAUDIO2 0x896 +#define XAUDIO2_E_INVALID_CALL 0x88960001 // An API call or one of its arguments was illegal +#define XAUDIO2_E_XMA_DECODER_ERROR 0x88960002 // The XMA hardware suffered an unrecoverable error +#define XAUDIO2_E_XAPO_CREATION_FAILED 0x88960003 // XAudio2 failed to initialize an XAPO effect +#define XAUDIO2_E_DEVICE_INVALIDATED 0x88960004 // An audio device became unusable (unplugged, etc) + +/************************************************************************** + * + * Forward declarations for the XAudio2 interfaces. + * + **************************************************************************/ + +#ifdef __cplusplus +#define FWD_DECLARE(x) interface x +#else +#define FWD_DECLARE(x) typedef interface x x +#endif + +FWD_DECLARE(IXAudio2); +FWD_DECLARE(IXAudio2Voice); +FWD_DECLARE(IXAudio2SourceVoice); +FWD_DECLARE(IXAudio2SubmixVoice); +FWD_DECLARE(IXAudio2MasteringVoice); +FWD_DECLARE(IXAudio2EngineCallback); +FWD_DECLARE(IXAudio2VoiceCallback); + +/************************************************************************** + * + * XAudio2 structures and enumerations. + * + **************************************************************************/ + + // Used in XAudio2Create, specifies which CPU(s) to use. +typedef UINT32 XAUDIO2_PROCESSOR; +#define Processor1 0x00000001 +#define Processor2 0x00000002 +#define Processor3 0x00000004 +#define Processor4 0x00000008 +#define Processor5 0x00000010 +#define Processor6 0x00000020 +#define Processor7 0x00000040 +#define Processor8 0x00000080 +#define Processor9 0x00000100 +#define Processor10 0x00000200 +#define Processor11 0x00000400 +#define Processor12 0x00000800 +#define Processor13 0x00001000 +#define Processor14 0x00002000 +#define Processor15 0x00004000 +#define Processor16 0x00008000 +#define Processor17 0x00010000 +#define Processor18 0x00020000 +#define Processor19 0x00040000 +#define Processor20 0x00080000 +#define Processor21 0x00100000 +#define Processor22 0x00200000 +#define Processor23 0x00400000 +#define Processor24 0x00800000 +#define Processor25 0x01000000 +#define Processor26 0x02000000 +#define Processor27 0x04000000 +#define Processor28 0x08000000 +#define Processor29 0x10000000 +#define Processor30 0x20000000 +#define Processor31 0x40000000 +#define Processor32 0x80000000 +#define XAUDIO2_ANY_PROCESSOR 0xffffffff +#define XAUDIO2_DEFAULT_PROCESSOR Processor1 + +// Returned by IXAudio2Voice::GetVoiceDetails +typedef struct XAUDIO2_VOICE_DETAILS +{ + UINT32 CreationFlags; // Flags the voice was created with. + UINT32 ActiveFlags; // Flags currently active. + UINT32 InputChannels; // Channels in the voice's input audio. + UINT32 InputSampleRate; // Sample rate of the voice's input audio. +} XAUDIO2_VOICE_DETAILS; + +// Used in XAUDIO2_VOICE_SENDS below +typedef struct XAUDIO2_SEND_DESCRIPTOR +{ + UINT32 Flags; // Either 0 or XAUDIO2_SEND_USEFILTER. + IXAudio2Voice* pOutputVoice; // This send's destination voice. +} XAUDIO2_SEND_DESCRIPTOR; + +// Used in the voice creation functions and in IXAudio2Voice::SetOutputVoices +typedef struct XAUDIO2_VOICE_SENDS +{ + UINT32 SendCount; // Number of sends from this voice. + XAUDIO2_SEND_DESCRIPTOR* pSends; // Array of SendCount send descriptors. +} XAUDIO2_VOICE_SENDS; + +// Used in XAUDIO2_EFFECT_CHAIN below +typedef struct XAUDIO2_EFFECT_DESCRIPTOR +{ + IUnknown* pEffect; // Pointer to the effect object's IUnknown interface. + BOOL InitialState; // TRUE if the effect should begin in the enabled state. + UINT32 OutputChannels; // How many output channels the effect should produce. +} XAUDIO2_EFFECT_DESCRIPTOR; + +// Used in the voice creation functions and in IXAudio2Voice::SetEffectChain +typedef struct XAUDIO2_EFFECT_CHAIN +{ + UINT32 EffectCount; // Number of effects in this voice's effect chain. + XAUDIO2_EFFECT_DESCRIPTOR* pEffectDescriptors; // Array of effect descriptors. +} XAUDIO2_EFFECT_CHAIN; + +// Used in XAUDIO2_FILTER_PARAMETERS below +typedef enum XAUDIO2_FILTER_TYPE +{ + LowPassFilter, // Attenuates frequencies above the cutoff frequency (state-variable filter). + BandPassFilter, // Attenuates frequencies outside a given range (state-variable filter). + HighPassFilter, // Attenuates frequencies below the cutoff frequency (state-variable filter). + NotchFilter, // Attenuates frequencies inside a given range (state-variable filter). + LowPassOnePoleFilter, // Attenuates frequencies above the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect) + HighPassOnePoleFilter // Attenuates frequencies below the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect) +} XAUDIO2_FILTER_TYPE; + +// Used in IXAudio2Voice::Set/GetFilterParameters and Set/GetOutputFilterParameters +typedef struct XAUDIO2_FILTER_PARAMETERS +{ + XAUDIO2_FILTER_TYPE Type; // Filter type. + float Frequency; // Filter coefficient. + // must be >= 0 and <= XAUDIO2_MAX_FILTER_FREQUENCY + // See XAudio2CutoffFrequencyToRadians() for state-variable filter types and + // XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types. + float OneOverQ; // Reciprocal of the filter's quality factor Q; + // must be > 0 and <= XAUDIO2_MAX_FILTER_ONEOVERQ. + // Has no effect for one-pole filters. +} XAUDIO2_FILTER_PARAMETERS; + +// Used in IXAudio2SourceVoice::SubmitSourceBuffer +typedef struct XAUDIO2_BUFFER +{ + UINT32 Flags; // Either 0 or XAUDIO2_END_OF_STREAM. + UINT32 AudioBytes; // Size of the audio data buffer in bytes. + const BYTE* pAudioData; // Pointer to the audio data buffer. + UINT32 PlayBegin; // First sample in this buffer to be played. + UINT32 PlayLength; // Length of the region to be played in samples, + // or 0 to play the whole buffer. + UINT32 LoopBegin; // First sample of the region to be looped. + UINT32 LoopLength; // Length of the desired loop region in samples, + // or 0 to loop the entire buffer. + UINT32 LoopCount; // Number of times to repeat the loop region, + // or XAUDIO2_LOOP_INFINITE to loop forever. + void* pContext; // Context value to be passed back in callbacks. +} XAUDIO2_BUFFER; + +// Used in IXAudio2SourceVoice::SubmitSourceBuffer when submitting XWMA data. +// NOTE: If an XWMA sound is submitted in more than one buffer, each buffer's +// pDecodedPacketCumulativeBytes[PacketCount-1] value must be subtracted from +// all the entries in the next buffer's pDecodedPacketCumulativeBytes array. +// And whether a sound is submitted in more than one buffer or not, the final +// buffer of the sound should use the XAUDIO2_END_OF_STREAM flag, or else the +// client must call IXAudio2SourceVoice::Discontinuity after submitting it. +typedef struct XAUDIO2_BUFFER_WMA +{ + const UINT32* pDecodedPacketCumulativeBytes; // Decoded packet's cumulative size array. + // Each element is the number of bytes accumulated + // when the corresponding XWMA packet is decoded in + // order. The array must have PacketCount elements. + UINT32 PacketCount; // Number of XWMA packets submitted. Must be >= 1 and + // divide evenly into XAUDIO2_BUFFER.AudioBytes. +} XAUDIO2_BUFFER_WMA; + +// Returned by IXAudio2SourceVoice::GetState +typedef struct XAUDIO2_VOICE_STATE +{ + void* pCurrentBufferContext; // The pContext value provided in the XAUDIO2_BUFFER + // that is currently being processed, or NULL if + // there are no buffers in the queue. + UINT32 BuffersQueued; // Number of buffers currently queued on the voice + // (including the one that is being processed). + UINT64 SamplesPlayed; // Total number of samples produced by the voice since + // it began processing the current audio stream. + // If XAUDIO2_VOICE_NOSAMPLESPLAYED is specified + // in the call to IXAudio2SourceVoice::GetState, + // this member will not be calculated, saving CPU. +} XAUDIO2_VOICE_STATE; + +// Returned by IXAudio2::GetPerformanceData +typedef struct XAUDIO2_PERFORMANCE_DATA +{ + // CPU usage information + UINT64 AudioCyclesSinceLastQuery; // CPU cycles spent on audio processing since the + // last call to StartEngine or GetPerformanceData. + UINT64 TotalCyclesSinceLastQuery; // Total CPU cycles elapsed since the last call + // (only counts the CPU XAudio2 is running on). + UINT32 MinimumCyclesPerQuantum; // Fewest CPU cycles spent processing any one + // audio quantum since the last call. + UINT32 MaximumCyclesPerQuantum; // Most CPU cycles spent processing any one + // audio quantum since the last call. + + // Memory usage information + UINT32 MemoryUsageInBytes; // Total heap space currently in use. + + // Audio latency and glitching information + UINT32 CurrentLatencyInSamples; // Minimum delay from when a sample is read from a + // source buffer to when it reaches the speakers. + UINT32 GlitchesSinceEngineStarted; // Audio dropouts since the engine was started. + + // Data about XAudio2's current workload + UINT32 ActiveSourceVoiceCount; // Source voices currently playing. + UINT32 TotalSourceVoiceCount; // Source voices currently existing. + UINT32 ActiveSubmixVoiceCount; // Submix voices currently playing/existing. + + UINT32 ActiveResamplerCount; // Resample xAPOs currently active. + UINT32 ActiveMatrixMixCount; // MatrixMix xAPOs currently active. + + // Usage of the hardware XMA decoder (Xbox 360 only) + UINT32 ActiveXmaSourceVoices; // Number of source voices decoding XMA data. + UINT32 ActiveXmaStreams; // A voice can use more than one XMA stream. +} XAUDIO2_PERFORMANCE_DATA; + +// Used in IXAudio2::SetDebugConfiguration +typedef struct XAUDIO2_DEBUG_CONFIGURATION +{ + UINT32 TraceMask; // Bitmap of enabled debug message types. + UINT32 BreakMask; // Message types that will break into the debugger. + BOOL LogThreadID; // Whether to log the thread ID with each message. + BOOL LogFileline; // Whether to log the source file and line number. + BOOL LogFunctionName; // Whether to log the function name. + BOOL LogTiming; // Whether to log message timestamps. +} XAUDIO2_DEBUG_CONFIGURATION; + +// Values for the TraceMask and BreakMask bitmaps. Only ERRORS and WARNINGS +// are valid in BreakMask. WARNINGS implies ERRORS, DETAIL implies INFO, and +// FUNC_CALLS implies API_CALLS. By default, TraceMask is ERRORS and WARNINGS +// and all the other settings are zero. +#define XAUDIO2_LOG_ERRORS 0x0001 // For handled errors with serious effects. +#define XAUDIO2_LOG_WARNINGS 0x0002 // For handled errors that may be recoverable. +#define XAUDIO2_LOG_INFO 0x0004 // Informational chit-chat (e.g. state changes). +#define XAUDIO2_LOG_DETAIL 0x0008 // More detailed chit-chat. +#define XAUDIO2_LOG_API_CALLS 0x0010 // Public API function entries and exits. +#define XAUDIO2_LOG_FUNC_CALLS 0x0020 // Internal function entries and exits. +#define XAUDIO2_LOG_TIMING 0x0040 // Delays detected and other timing data. +#define XAUDIO2_LOG_LOCKS 0x0080 // Usage of critical sections and mutexes. +#define XAUDIO2_LOG_MEMORY 0x0100 // Memory heap usage information. +#define XAUDIO2_LOG_STREAMING 0x1000 // Audio streaming information. + +/************************************************************************** + * + * IXAudio2: Top-level XAudio2 COM interface. + * + **************************************************************************/ + + // Use default arguments if compiling as C++ +#ifdef __cplusplus +#define X2DEFAULT(x) =x +#else +#define X2DEFAULT(x) +#endif + +#undef INTERFACE +#define INTERFACE IXAudio2 +DECLARE_INTERFACE_(IXAudio2, IUnknown) +{ + // NAME: IXAudio2::QueryInterface + // DESCRIPTION: Queries for a given COM interface on the XAudio2 object. + // Only IID_IUnknown and IID_IXAudio2 are supported. + // + // ARGUMENTS: + // riid - IID of the interface to be obtained. + // ppvInterface - Returns a pointer to the requested interface. + // + STDMETHOD(QueryInterface) (THIS_ REFIID riid, _Outptr_ void** ppvInterface) PURE; + + // NAME: IXAudio2::AddRef + // DESCRIPTION: Adds a reference to the XAudio2 object. + // + STDMETHOD_(ULONG, AddRef) (THIS) PURE; + + // NAME: IXAudio2::Release + // DESCRIPTION: Releases a reference to the XAudio2 object. + // + STDMETHOD_(ULONG, Release) (THIS) PURE; + + // NAME: IXAudio2::RegisterForCallbacks + // DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks. + // + // ARGUMENTS: + // pCallback - Callback interface to be called during each processing pass. + // + STDMETHOD(RegisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; + + // NAME: IXAudio2::UnregisterForCallbacks + // DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks. + // + // ARGUMENTS: + // pCallback - Previously registered callback interface to be removed. + // + STDMETHOD_(void, UnregisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE; + + // NAME: IXAudio2::CreateSourceVoice + // DESCRIPTION: Creates and configures a source voice. + // + // ARGUMENTS: + // ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface. + // pSourceFormat - Format of the audio that will be fed to the voice. + // Flags - XAUDIO2_VOICE flags specifying the source voice's behavior. + // MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed. + // pCallback - Optional pointer to a client-provided callback interface. + // pSendList - Optional list of voices this voice should send audio to. + // pEffectChain - Optional list of effects to apply to the audio data. + // + STDMETHOD(CreateSourceVoice) (THIS_ _Outptr_ IXAudio2SourceVoice** ppSourceVoice, + _In_ const WAVEFORMATEX* pSourceFormat, + UINT32 Flags X2DEFAULT(0), + float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO), + _In_opt_ IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL), + _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL), + _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE; + + // NAME: IXAudio2::CreateSubmixVoice + // DESCRIPTION: Creates and configures a submix voice. + // + // ARGUMENTS: + // ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface. + // InputChannels - Number of channels in this voice's input audio data. + // InputSampleRate - Sample rate of this voice's input audio data. + // Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior. + // ProcessingStage - Arbitrary number that determines the processing order. + // pSendList - Optional list of voices this voice should send audio to. + // pEffectChain - Optional list of effects to apply to the audio data. + // + STDMETHOD(CreateSubmixVoice) (THIS_ _Outptr_ IXAudio2SubmixVoice** ppSubmixVoice, + UINT32 InputChannels, UINT32 InputSampleRate, + UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0), + _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL), + _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE; + + // NAME: IXAudio2::CreateMasteringVoice + // DESCRIPTION: Creates and configures a mastering voice. + // + // ARGUMENTS: + // ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface. + // InputChannels - Number of channels in this voice's input audio data. + // InputSampleRate - Sample rate of this voice's input audio data. + // Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior. + // szDeviceId - Identifier of the device to receive the output audio. + // pEffectChain - Optional list of effects to apply to the audio data. + // StreamCategory - The audio stream category to use for this mastering voice + // + STDMETHOD(CreateMasteringVoice) (THIS_ _Outptr_ IXAudio2MasteringVoice** ppMasteringVoice, + UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS), + UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE), + UINT32 Flags X2DEFAULT(0), _In_opt_z_ LPCWSTR szDeviceId X2DEFAULT(NULL), + _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL), + _In_ AUDIO_STREAM_CATEGORY StreamCategory X2DEFAULT(AudioCategory_GameEffects)) PURE; + + // NAME: IXAudio2::StartEngine + // DESCRIPTION: Creates and starts the audio processing thread. + // + STDMETHOD(StartEngine) (THIS) PURE; + + // NAME: IXAudio2::StopEngine + // DESCRIPTION: Stops and destroys the audio processing thread. + // + STDMETHOD_(void, StopEngine) (THIS) PURE; + + // NAME: IXAudio2::CommitChanges + // DESCRIPTION: Atomically applies a set of operations previously tagged + // with a given identifier. + // + // ARGUMENTS: + // OperationSet - Identifier of the set of operations to be applied. + // + STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE; + + // NAME: IXAudio2::GetPerformanceData + // DESCRIPTION: Returns current resource usage details: memory, CPU, etc. + // + // ARGUMENTS: + // pPerfData - Returns the performance data structure. + // + STDMETHOD_(void, GetPerformanceData) (THIS_ _Out_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE; + + // NAME: IXAudio2::SetDebugConfiguration + // DESCRIPTION: Configures XAudio2's debug output (in debug builds only). + // + // ARGUMENTS: + // pDebugConfiguration - Structure describing the debug output behavior. + // pReserved - Optional parameter; must be NULL. + // + STDMETHOD_(void, SetDebugConfiguration) (THIS_ _In_opt_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration, + _Reserved_ void* pReserved X2DEFAULT(NULL)) PURE; +}; + +/************************************************************************** + * + * IXAudio2Voice: Base voice management interface. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2Voice +DECLARE_INTERFACE(IXAudio2Voice) +{ + // These methods are declared in a macro so that the same declarations + // can be used in the derived voice types (IXAudio2SourceVoice, etc). + +#define Declare_IXAudio2Voice_Methods() \ + \ + /* NAME: IXAudio2Voice::GetVoiceDetails + // DESCRIPTION: Returns the basic characteristics of this voice. + // + // ARGUMENTS: + // pVoiceDetails - Returns the voice's details. + */\ + STDMETHOD_(void, GetVoiceDetails) (THIS_ _Out_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE; \ + \ + /* NAME: IXAudio2Voice::SetOutputVoices + // DESCRIPTION: Replaces the set of submix/mastering voices that receive + // this voice's output. + // + // ARGUMENTS: + // pSendList - Optional list of voices this voice should send audio to. + */\ + STDMETHOD(SetOutputVoices) (THIS_ _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList) PURE; \ + \ + /* NAME: IXAudio2Voice::SetEffectChain + // DESCRIPTION: Replaces this voice's current effect chain with a new one. + // + // ARGUMENTS: + // pEffectChain - Structure describing the new effect chain to be used. + */\ + STDMETHOD(SetEffectChain) (THIS_ _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE; \ + \ + /* NAME: IXAudio2Voice::EnableEffect + // DESCRIPTION: Enables an effect in this voice's effect chain. + // + // ARGUMENTS: + // EffectIndex - Index of an effect within this voice's effect chain. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::DisableEffect + // DESCRIPTION: Disables an effect in this voice's effect chain. + // + // ARGUMENTS: + // EffectIndex - Index of an effect within this voice's effect chain. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetEffectState + // DESCRIPTION: Returns the running state of an effect. + // + // ARGUMENTS: + // EffectIndex - Index of an effect within this voice's effect chain. + // pEnabled - Returns the enabled/disabled state of the given effect. + */\ + STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, _Out_ BOOL* pEnabled) PURE; \ + \ + /* NAME: IXAudio2Voice::SetEffectParameters + // DESCRIPTION: Sets effect-specific parameters. + // + // REMARKS: Unlike IXAPOParameters::SetParameters, this method may + // be called from any thread. XAudio2 implements + // appropriate synchronization to copy the parameters to the + // realtime audio processing thread. + // + // ARGUMENTS: + // EffectIndex - Index of an effect within this voice's effect chain. + // pParameters - Pointer to an effect-specific parameters block. + // ParametersByteSize - Size of the pParameters array in bytes. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex, \ + _In_reads_bytes_(ParametersByteSize) const void* pParameters, \ + UINT32 ParametersByteSize, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetEffectParameters + // DESCRIPTION: Obtains the current effect-specific parameters. + // + // ARGUMENTS: + // EffectIndex - Index of an effect within this voice's effect chain. + // pParameters - Returns the current values of the effect-specific parameters. + // ParametersByteSize - Size of the pParameters array in bytes. + */\ + STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex, \ + _Out_writes_bytes_(ParametersByteSize) void* pParameters, \ + UINT32 ParametersByteSize) PURE; \ + \ + /* NAME: IXAudio2Voice::SetFilterParameters + // DESCRIPTION: Sets this voice's filter parameters. + // + // ARGUMENTS: + // pParameters - Pointer to the filter's parameter structure. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetFilterParameters) (THIS_ _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetFilterParameters + // DESCRIPTION: Returns this voice's current filter parameters. + // + // ARGUMENTS: + // pParameters - Returns the filter parameters. + */\ + STDMETHOD_(void, GetFilterParameters) (THIS_ _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \ + \ + /* NAME: IXAudio2Voice::SetOutputFilterParameters + // DESCRIPTION: Sets the filter parameters on one of this voice's sends. + // + // ARGUMENTS: + // pDestinationVoice - Destination voice of the send whose filter parameters will be set. + // pParameters - Pointer to the filter's parameter structure. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ + _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetOutputFilterParameters + // DESCRIPTION: Returns the filter parameters from one of this voice's sends. + // + // ARGUMENTS: + // pDestinationVoice - Destination voice of the send whose filter parameters will be read. + // pParameters - Returns the filter parameters. + */\ + STDMETHOD_(void, GetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ + _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE; \ + \ + /* NAME: IXAudio2Voice::SetVolume + // DESCRIPTION: Sets this voice's overall volume level. + // + // ARGUMENTS: + // Volume - New overall volume level to be used, as an amplitude factor. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetVolume) (THIS_ float Volume, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetVolume + // DESCRIPTION: Obtains this voice's current overall volume level. + // + // ARGUMENTS: + // pVolume: Returns the voice's current overall volume level. + */\ + STDMETHOD_(void, GetVolume) (THIS_ _Out_ float* pVolume) PURE; \ + \ + /* NAME: IXAudio2Voice::SetChannelVolumes + // DESCRIPTION: Sets this voice's per-channel volume levels. + // + // ARGUMENTS: + // Channels - Used to confirm the voice's channel count. + // pVolumes - Array of per-channel volume levels to be used. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, _In_reads_(Channels) const float* pVolumes, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetChannelVolumes + // DESCRIPTION: Returns this voice's current per-channel volume levels. + // + // ARGUMENTS: + // Channels - Used to confirm the voice's channel count. + // pVolumes - Returns an array of the current per-channel volume levels. + */\ + STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, _Out_writes_(Channels) float* pVolumes) PURE; \ + \ + /* NAME: IXAudio2Voice::SetOutputMatrix + // DESCRIPTION: Sets the volume levels used to mix from each channel of this + // voice's output audio to each channel of a given destination + // voice's input audio. + // + // ARGUMENTS: + // pDestinationVoice - The destination voice whose mix matrix to change. + // SourceChannels - Used to confirm this voice's output channel count + // (the number of channels produced by the last effect in the chain). + // DestinationChannels - Confirms the destination voice's input channels. + // pLevelMatrix - Array of [SourceChannels * DestinationChannels] send + // levels. The level used to send from source channel S to destination + // channel D should be in pLevelMatrix[S + SourceChannels * D]. + // OperationSet - Used to identify this call as part of a deferred batch. + */\ + STDMETHOD(SetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ + UINT32 SourceChannels, UINT32 DestinationChannels, \ + _In_reads_(SourceChannels * DestinationChannels) const float* pLevelMatrix, \ + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \ + \ + /* NAME: IXAudio2Voice::GetOutputMatrix + // DESCRIPTION: Obtains the volume levels used to send each channel of this + // voice's output audio to each channel of a given destination + // voice's input audio. + // + // ARGUMENTS: + // pDestinationVoice - The destination voice whose mix matrix to obtain. + // SourceChannels - Used to confirm this voice's output channel count + // (the number of channels produced by the last effect in the chain). + // DestinationChannels - Confirms the destination voice's input channels. + // pLevelMatrix - Array of send levels, as above. + */\ + STDMETHOD_(void, GetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice, \ + UINT32 SourceChannels, UINT32 DestinationChannels, \ + _Out_writes_(SourceChannels * DestinationChannels) float* pLevelMatrix) PURE; \ + \ + /* NAME: IXAudio2Voice::DestroyVoice + // DESCRIPTION: Destroys this voice, stopping it if necessary and removing + // it from the XAudio2 graph. + */\ + STDMETHOD_(void, DestroyVoice) (THIS) PURE + + Declare_IXAudio2Voice_Methods(); +}; + +/************************************************************************** + * + * IXAudio2SourceVoice: Source voice management interface. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2SourceVoice +DECLARE_INTERFACE_(IXAudio2SourceVoice, IXAudio2Voice) +{ + // Methods from IXAudio2Voice base interface + Declare_IXAudio2Voice_Methods(); + + // NAME: IXAudio2SourceVoice::Start + // DESCRIPTION: Makes this voice start consuming and processing audio. + // + // ARGUMENTS: + // Flags - Flags controlling how the voice should be started. + // OperationSet - Used to identify this call as part of a deferred batch. + // + STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; + + // NAME: IXAudio2SourceVoice::Stop + // DESCRIPTION: Makes this voice stop consuming audio. + // + // ARGUMENTS: + // Flags - Flags controlling how the voice should be stopped. + // OperationSet - Used to identify this call as part of a deferred batch. + // + STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; + + // NAME: IXAudio2SourceVoice::SubmitSourceBuffer + // DESCRIPTION: Adds a new audio buffer to this voice's input queue. + // + // ARGUMENTS: + // pBuffer - Pointer to the buffer structure to be queued. + // pBufferWMA - Additional structure used only when submitting XWMA data. + // + STDMETHOD(SubmitSourceBuffer) (THIS_ _In_ const XAUDIO2_BUFFER* pBuffer, _In_opt_ const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE; + + // NAME: IXAudio2SourceVoice::FlushSourceBuffers + // DESCRIPTION: Removes all pending audio buffers from this voice's queue. + // + STDMETHOD(FlushSourceBuffers) (THIS) PURE; + + // NAME: IXAudio2SourceVoice::Discontinuity + // DESCRIPTION: Notifies the voice of an intentional break in the stream of + // audio buffers (e.g. the end of a sound), to prevent XAudio2 + // from interpreting an empty buffer queue as a glitch. + // + STDMETHOD(Discontinuity) (THIS) PURE; + + // NAME: IXAudio2SourceVoice::ExitLoop + // DESCRIPTION: Breaks out of the current loop when its end is reached. + // + // ARGUMENTS: + // OperationSet - Used to identify this call as part of a deferred batch. + // + STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; + + // NAME: IXAudio2SourceVoice::GetState + // DESCRIPTION: Returns the number of buffers currently queued on this voice, + // the pContext value associated with the currently processing + // buffer (if any), and other voice state information. + // + // ARGUMENTS: + // pVoiceState - Returns the state information. + // Flags - Flags controlling what voice state is returned. + // + STDMETHOD_(void, GetState) (THIS_ _Out_ XAUDIO2_VOICE_STATE* pVoiceState, UINT32 Flags X2DEFAULT(0)) PURE; + + // NAME: IXAudio2SourceVoice::SetFrequencyRatio + // DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch. + // + // ARGUMENTS: + // Ratio - Frequency change, expressed as source frequency / target frequency. + // OperationSet - Used to identify this call as part of a deferred batch. + // + STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio, + UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; + + // NAME: IXAudio2SourceVoice::GetFrequencyRatio + // DESCRIPTION: Returns this voice's current frequency adjustment ratio. + // + // ARGUMENTS: + // pRatio - Returns the frequency adjustment. + // + STDMETHOD_(void, GetFrequencyRatio) (THIS_ _Out_ float* pRatio) PURE; + + // NAME: IXAudio2SourceVoice::SetSourceSampleRate + // DESCRIPTION: Reconfigures this voice to treat its source data as being + // at a different sample rate than the original one specified + // in CreateSourceVoice's pSourceFormat argument. + // + // ARGUMENTS: + // UINT32 - The intended sample rate of further submitted source data. + // + STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE; +}; + +/************************************************************************** + * + * IXAudio2SubmixVoice: Submixing voice management interface. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2SubmixVoice +DECLARE_INTERFACE_(IXAudio2SubmixVoice, IXAudio2Voice) +{ + // Methods from IXAudio2Voice base interface + Declare_IXAudio2Voice_Methods(); + + // There are currently no methods specific to submix voices. +}; + +/************************************************************************** + * + * IXAudio2MasteringVoice: Mastering voice management interface. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2MasteringVoice +DECLARE_INTERFACE_(IXAudio2MasteringVoice, IXAudio2Voice) +{ + // Methods from IXAudio2Voice base interface + Declare_IXAudio2Voice_Methods(); + + // NAME: IXAudio2MasteringVoice::GetChannelMask + // DESCRIPTION: Returns the channel mask for this voice + // + // ARGUMENTS: + // pChannelMask - returns the channel mask for this voice. This corresponds + // to the dwChannelMask member of WAVEFORMATEXTENSIBLE. + // + STDMETHOD(GetChannelMask) (THIS_ _Out_ DWORD* pChannelmask) PURE; +}; + +/************************************************************************** + * + * IXAudio2EngineCallback: Client notification interface for engine events. + * + * REMARKS: Contains methods to notify the client when certain events happen + * in the XAudio2 engine. This interface should be implemented by + * the client. XAudio2 will call these methods via the interface + * pointer provided by the client when it calls + * IXAudio2::RegisterForCallbacks. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2EngineCallback +DECLARE_INTERFACE(IXAudio2EngineCallback) +{ + // Called by XAudio2 just before an audio processing pass begins. + STDMETHOD_(void, OnProcessingPassStart) (THIS) PURE; + + // Called just after an audio processing pass ends. + STDMETHOD_(void, OnProcessingPassEnd) (THIS) PURE; + + // Called in the event of a critical system error which requires XAudio2 + // to be closed down and restarted. The error code is given in Error. + STDMETHOD_(void, OnCriticalError) (THIS_ HRESULT Error) PURE; +}; + +/************************************************************************** + * + * IXAudio2VoiceCallback: Client notification interface for voice events. + * + * REMARKS: Contains methods to notify the client when certain events happen + * in an XAudio2 voice. This interface should be implemented by the + * client. XAudio2 will call these methods via an interface pointer + * provided by the client in the IXAudio2::CreateSourceVoice call. + * + **************************************************************************/ + +#undef INTERFACE +#define INTERFACE IXAudio2VoiceCallback +DECLARE_INTERFACE(IXAudio2VoiceCallback) +{ + // Called just before this voice's processing pass begins. + STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE; + + // Called just after this voice's processing pass ends. + STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE; + + // Called when this voice has just finished playing a buffer stream + // (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer). + STDMETHOD_(void, OnStreamEnd) (THIS) PURE; + + // Called when this voice is about to start processing a new buffer. + STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) PURE; + + // Called when this voice has just finished processing a buffer. + // The buffer can now be reused or destroyed. + STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext) PURE; + + // Called when this voice has just reached the end position of a loop. + STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext) PURE; + + // Called in the event of a critical error during voice processing, + // such as a failing xAPO or an error from the hardware XMA decoder. + // The voice may have to be destroyed and re-created to recover from + // the error. The callback arguments report which buffer was being + // processed when the error occurred, and its HRESULT code. + STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) PURE; +}; + +/************************************************************************** + * + * Macros to make it easier to use the XAudio2 COM interfaces in C code. + * + **************************************************************************/ + +#ifndef __cplusplus + + // IXAudio2 +#define IXAudio2_QueryInterface(This,riid,ppvInterface) ((This)->lpVtbl->QueryInterface(This,riid,ppvInterface)) +#define IXAudio2_AddRef(This) ((This)->lpVtbl->AddRef(This)) +#define IXAudio2_Release(This) ((This)->lpVtbl->Release(This)) +#define IXAudio2_CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain) ((This)->lpVtbl->CreateSourceVoice(This,ppSourceVoice,pSourceFormat,Flags,MaxFrequencyRatio,pCallback,pSendList,pEffectChain)) +#define IXAudio2_CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain) ((This)->lpVtbl->CreateSubmixVoice(This,ppSubmixVoice,InputChannels,InputSampleRate,Flags,ProcessingStage,pSendList,pEffectChain)) +#define IXAudio2_CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory) ((This)->lpVtbl->CreateMasteringVoice(This,ppMasteringVoice,InputChannels,InputSampleRate,Flags,DeviceId,pEffectChain,StreamCategory)) +#define IXAudio2_StartEngine(This) ((This)->lpVtbl->StartEngine(This)) +#define IXAudio2_StopEngine(This) ((This)->lpVtbl->StopEngine(This)) +#define IXAudio2_CommitChanges(This,OperationSet) ((This)->lpVtbl->CommitChanges(This,OperationSet)) +#define IXAudio2_GetPerformanceData(This,pPerfData) ((This)->lpVtbl->GetPerformanceData(This,pPerfData)) +#define IXAudio2_SetDebugConfiguration(This,pDebugConfiguration,pReserved) ((This)->lpVtbl->SetDebugConfiguration(This,pDebugConfiguration,pReserved)) + +// IXAudio2Voice +#define IXAudio2Voice_GetVoiceDetails(This,pVoiceDetails) ((This)->lpVtbl->GetVoiceDetails(This,pVoiceDetails)) +#define IXAudio2Voice_SetOutputVoices(This,pSendList) ((This)->lpVtbl->SetOutputVoices(This,pSendList)) +#define IXAudio2Voice_SetEffectChain(This,pEffectChain) ((This)->lpVtbl->SetEffectChain(This,pEffectChain)) +#define IXAudio2Voice_EnableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->EnableEffect(This,EffectIndex,OperationSet)) +#define IXAudio2Voice_DisableEffect(This,EffectIndex,OperationSet) ((This)->lpVtbl->DisableEffect(This,EffectIndex,OperationSet)) +#define IXAudio2Voice_GetEffectState(This,EffectIndex,pEnabled) ((This)->lpVtbl->GetEffectState(This,EffectIndex,pEnabled)) +#define IXAudio2Voice_SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize, OperationSet) ((This)->lpVtbl->SetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize,OperationSet)) +#define IXAudio2Voice_GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize) ((This)->lpVtbl->GetEffectParameters(This,EffectIndex,pParameters,ParametersByteSize)) +#define IXAudio2Voice_SetFilterParameters(This,pParameters,OperationSet) ((This)->lpVtbl->SetFilterParameters(This,pParameters,OperationSet)) +#define IXAudio2Voice_GetFilterParameters(This,pParameters) ((This)->lpVtbl->GetFilterParameters(This,pParameters)) +#define IXAudio2Voice_SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet) ((This)->lpVtbl->SetOutputFilterParameters(This,pDestinationVoice,pParameters,OperationSet)) +#define IXAudio2Voice_GetOutputFilterParameters(This,pDestinationVoice,pParameters) ((This)->lpVtbl->GetOutputFilterParameters(This,pDestinationVoice,pParameters)) +#define IXAudio2Voice_SetVolume(This,Volume,OperationSet) ((This)->lpVtbl->SetVolume(This,Volume,OperationSet)) +#define IXAudio2Voice_GetVolume(This,pVolume) ((This)->lpVtbl->GetVolume(This,pVolume)) +#define IXAudio2Voice_SetChannelVolumes(This,Channels,pVolumes,OperationSet) ((This)->lpVtbl->SetChannelVolumes(This,Channels,pVolumes,OperationSet)) +#define IXAudio2Voice_GetChannelVolumes(This,Channels,pVolumes) ((This)->lpVtbl->GetChannelVolumes(This,Channels,pVolumes)) +#define IXAudio2Voice_SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet) ((This)->lpVtbl->SetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix,OperationSet)) +#define IXAudio2Voice_GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix) ((This)->lpVtbl->GetOutputMatrix(This,pDestinationVoice,SourceChannels,DestinationChannels,pLevelMatrix)) +#define IXAudio2Voice_DestroyVoice(This) ((This)->lpVtbl->DestroyVoice(This)) + +// IXAudio2SourceVoice +#define IXAudio2SourceVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails +#define IXAudio2SourceVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices +#define IXAudio2SourceVoice_SetEffectChain IXAudio2Voice_SetEffectChain +#define IXAudio2SourceVoice_EnableEffect IXAudio2Voice_EnableEffect +#define IXAudio2SourceVoice_DisableEffect IXAudio2Voice_DisableEffect +#define IXAudio2SourceVoice_GetEffectState IXAudio2Voice_GetEffectState +#define IXAudio2SourceVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters +#define IXAudio2SourceVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters +#define IXAudio2SourceVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters +#define IXAudio2SourceVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters +#define IXAudio2SourceVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters +#define IXAudio2SourceVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters +#define IXAudio2SourceVoice_SetVolume IXAudio2Voice_SetVolume +#define IXAudio2SourceVoice_GetVolume IXAudio2Voice_GetVolume +#define IXAudio2SourceVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes +#define IXAudio2SourceVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes +#define IXAudio2SourceVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix +#define IXAudio2SourceVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix +#define IXAudio2SourceVoice_DestroyVoice IXAudio2Voice_DestroyVoice +#define IXAudio2SourceVoice_Start(This,Flags,OperationSet) ((This)->lpVtbl->Start(This,Flags,OperationSet)) +#define IXAudio2SourceVoice_Stop(This,Flags,OperationSet) ((This)->lpVtbl->Stop(This,Flags,OperationSet)) +#define IXAudio2SourceVoice_SubmitSourceBuffer(This,pBuffer,pBufferWMA) ((This)->lpVtbl->SubmitSourceBuffer(This,pBuffer,pBufferWMA)) +#define IXAudio2SourceVoice_FlushSourceBuffers(This) ((This)->lpVtbl->FlushSourceBuffers(This)) +#define IXAudio2SourceVoice_Discontinuity(This) ((This)->lpVtbl->Discontinuity(This)) +#define IXAudio2SourceVoice_ExitLoop(This,OperationSet) ((This)->lpVtbl->ExitLoop(This,OperationSet)) +#define IXAudio2SourceVoice_GetState(This,pVoiceState,Flags) ((This)->lpVtbl->GetState(This,pVoiceState,Flags)) +#define IXAudio2SourceVoice_SetFrequencyRatio(This,Ratio,OperationSet) ((This)->lpVtbl->SetFrequencyRatio(This,Ratio,OperationSet)) +#define IXAudio2SourceVoice_GetFrequencyRatio(This,pRatio) ((This)->lpVtbl->GetFrequencyRatio(This,pRatio)) +#define IXAudio2SourceVoice_SetSourceSampleRate(This,NewSourceSampleRate) ((This)->lpVtbl->SetSourceSampleRate(This,NewSourceSampleRate)) + +// IXAudio2SubmixVoice +#define IXAudio2SubmixVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails +#define IXAudio2SubmixVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices +#define IXAudio2SubmixVoice_SetEffectChain IXAudio2Voice_SetEffectChain +#define IXAudio2SubmixVoice_EnableEffect IXAudio2Voice_EnableEffect +#define IXAudio2SubmixVoice_DisableEffect IXAudio2Voice_DisableEffect +#define IXAudio2SubmixVoice_GetEffectState IXAudio2Voice_GetEffectState +#define IXAudio2SubmixVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters +#define IXAudio2SubmixVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters +#define IXAudio2SubmixVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters +#define IXAudio2SubmixVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters +#define IXAudio2SubmixVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters +#define IXAudio2SubmixVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters +#define IXAudio2SubmixVoice_SetVolume IXAudio2Voice_SetVolume +#define IXAudio2SubmixVoice_GetVolume IXAudio2Voice_GetVolume +#define IXAudio2SubmixVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes +#define IXAudio2SubmixVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes +#define IXAudio2SubmixVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix +#define IXAudio2SubmixVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix +#define IXAudio2SubmixVoice_DestroyVoice IXAudio2Voice_DestroyVoice + +/* IXAudio2MasteringVoice */ +#define IXAudio2MasteringVoice_GetVoiceDetails IXAudio2Voice_GetVoiceDetails +#define IXAudio2MasteringVoice_SetOutputVoices IXAudio2Voice_SetOutputVoices +#define IXAudio2MasteringVoice_SetEffectChain IXAudio2Voice_SetEffectChain +#define IXAudio2MasteringVoice_EnableEffect IXAudio2Voice_EnableEffect +#define IXAudio2MasteringVoice_DisableEffect IXAudio2Voice_DisableEffect +#define IXAudio2MasteringVoice_GetEffectState IXAudio2Voice_GetEffectState +#define IXAudio2MasteringVoice_SetEffectParameters IXAudio2Voice_SetEffectParameters +#define IXAudio2MasteringVoice_GetEffectParameters IXAudio2Voice_GetEffectParameters +#define IXAudio2MasteringVoice_SetFilterParameters IXAudio2Voice_SetFilterParameters +#define IXAudio2MasteringVoice_GetFilterParameters IXAudio2Voice_GetFilterParameters +#define IXAudio2MasteringVoice_SetOutputFilterParameters IXAudio2Voice_SetOutputFilterParameters +#define IXAudio2MasteringVoice_GetOutputFilterParameters IXAudio2Voice_GetOutputFilterParameters +#define IXAudio2MasteringVoice_SetVolume IXAudio2Voice_SetVolume +#define IXAudio2MasteringVoice_GetVolume IXAudio2Voice_GetVolume +#define IXAudio2MasteringVoice_SetChannelVolumes IXAudio2Voice_SetChannelVolumes +#define IXAudio2MasteringVoice_GetChannelVolumes IXAudio2Voice_GetChannelVolumes +#define IXAudio2MasteringVoice_SetOutputMatrix IXAudio2Voice_SetOutputMatrix +#define IXAudio2MasteringVoice_GetOutputMatrix IXAudio2Voice_GetOutputMatrix +#define IXAudio2MasteringVoice_DestroyVoice IXAudio2Voice_DestroyVoice +#define IXAudio2MasteringVoice_GetChannelMask(This,pChannelMask) ((This)->lpVtbl->GetChannelMask(This,pChannelMask)) + +#endif /* #ifndef __cplusplus */ + +/************************************************************************** + * + * Utility functions used to convert from pitch in semitones and volume + * in decibels to the frequency and amplitude ratio units used by XAudio2. + * These are only defined if the client #defines XAUDIO2_HELPER_FUNCTIONS + * prior to #including xaudio2.h. + * + **************************************************************************/ + +#ifdef XAUDIO2_HELPER_FUNCTIONS + +#define _USE_MATH_DEFINES /* Make math.h define M_PI */ +#include /* For powf, log10f, sinf and asinf */ + +/* Calculate the argument to SetVolume from a decibel value */ +static INLINE float XAudio2DecibelsToAmplitudeRatio(float Decibels) +{ + return powf(10.0f, Decibels / 20.0f); +} + +/* Recover a volume in decibels from an amplitude factor */ +static INLINE float XAudio2AmplitudeRatioToDecibels(float Volume) +{ + if (Volume == 0) + return -3.402823466e+38f; /* Smallest float value (-FLT_MAX) */ + return 20.0f * log10f(Volume); +} + +/* Calculate the argument to SetFrequencyRatio from a semitone value */ +static INLINE float XAudio2SemitonesToFrequencyRatio(float Semitones) +{ + /* FrequencyRatio = 2 ^ Octaves * = 2 ^ (Semitones / 12) - */ - return powf(2.0f, Semitones / 12.0f); -} - -/* Recover a pitch in semitones from a frequency ratio */ -static INLINE float XAudio2FrequencyRatioToSemitones(float FrequencyRatio) -{ - /* Semitones = 12 * log2(FrequencyRatio) + */ + return powf(2.0f, Semitones / 12.0f); +} + +/* Recover a pitch in semitones from a frequency ratio */ +static INLINE float XAudio2FrequencyRatioToSemitones(float FrequencyRatio) +{ + /* Semitones = 12 * log2(FrequencyRatio) * = 12 * log2(10) * log10(FrequencyRatio) - */ - return 39.86313713864835f * log10f(FrequencyRatio); -} - -/* Convert from filter cutoff frequencies expressed in Hertz to the radian - * frequency values used in XAUDIO2_FILTER_PARAMETERS.Frequency, state-variable - * filter types only. Use XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types. - * Note that the highest CutoffFrequency supported is SampleRate/6. + */ + return 39.86313713864835f * log10f(FrequencyRatio); +} + +/* Convert from filter cutoff frequencies expressed in Hertz to the radian + * frequency values used in XAUDIO2_FILTER_PARAMETERS.Frequency, state-variable + * filter types only. Use XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types. + * Note that the highest CutoffFrequency supported is SampleRate/6. * Higher values of CutoffFrequency will return XAUDIO2_MAX_FILTER_FREQUENCY. - */ -static INLINE float XAudio2CutoffFrequencyToRadians(float CutoffFrequency, UINT32 SampleRate) -{ - if ((UINT32)(CutoffFrequency * 6.0f) >= SampleRate) - return XAUDIO2_MAX_FILTER_FREQUENCY; - return 2.0f * sinf((float)M_PI * CutoffFrequency / SampleRate); -} - -/* Convert from radian frequencies back to absolute frequencies in Hertz */ -static INLINE float XAudio2RadiansToCutoffFrequency(float Radians, float SampleRate) -{ - return SampleRate * asinf(Radians / 2.0f) / (float)M_PI; -} - -/* Convert from filter cutoff frequencies expressed in Hertz to the filter - * coefficients used with XAUDIO2_FILTER_PARAMETERS.Frequency, - * LowPassOnePoleFilter and HighPassOnePoleFilter filter types only. + */ +static INLINE float XAudio2CutoffFrequencyToRadians(float CutoffFrequency, UINT32 SampleRate) +{ + if ((UINT32)(CutoffFrequency * 6.0f) >= SampleRate) + return XAUDIO2_MAX_FILTER_FREQUENCY; + return 2.0f * sinf((float)M_PI * CutoffFrequency / SampleRate); +} + +/* Convert from radian frequencies back to absolute frequencies in Hertz */ +static INLINE float XAudio2RadiansToCutoffFrequency(float Radians, float SampleRate) +{ + return SampleRate * asinf(Radians / 2.0f) / (float)M_PI; +} + +/* Convert from filter cutoff frequencies expressed in Hertz to the filter + * coefficients used with XAUDIO2_FILTER_PARAMETERS.Frequency, + * LowPassOnePoleFilter and HighPassOnePoleFilter filter types only. * Use XAudio2CutoffFrequencyToRadians() for state-variable filter types. - */ -static INLINE float XAudio2CutoffFrequencyToOnePoleCoefficient(float CutoffFrequency, UINT32 SampleRate) -{ - if ((UINT32)CutoffFrequency >= SampleRate) - return XAUDIO2_MAX_FILTER_FREQUENCY; - return (1.0f - powf(1.0f - 2.0f * CutoffFrequency / SampleRate, 2.0f)); -} - - -#endif // #ifdef XAUDIO2_HELPER_FUNCTIONS - - -/************************************************************************** - * - * XAudio2Create: Top-level function that creates an XAudio2 instance. - * - * ARGUMENTS: - * - * Flags - Flags specifying the XAudio2 object's behavior. - * - * XAudio2Processor - An XAUDIO2_PROCESSOR value that specifies the - * hardware threads (Xbox) or processors (Windows) that XAudio2 - * will use. Note that XAudio2 supports concurrent processing on - * multiple threads, using any combination of XAUDIO2_PROCESSOR - * flags. The values are platform-specific; platform-independent - * code can use XAUDIO2_DEFAULT_PROCESSOR to use the default on - * each platform. - * - **************************************************************************/ - -#ifdef __cplusplus__ - -#if (defined XAUDIO2_EXPORT) - /* We're building xaudio2.dll */ -#define XAUDIO2_STDAPI extern "C" __declspec(dllexport) HRESULT __stdcall -#else - /* We're an xaudio2 client */ -#define XAUDIO2_STDAPI extern "C" __declspec(dllimport) HRESULT __stdcall -#endif - -#else - - /* Modified for C support */ - -#if (defined XAUDIO2_EXPORT) - /* We're building xaudio2.dll */ -#define XAUDIO2_STDAPI __declspec(dllexport) HRESULT __stdcall -#else - /* We're an xaudio2 client */ -#define XAUDIO2_STDAPI __declspec(dllimport) HRESULT __stdcall -#endif - -#endif - -#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -XAUDIO2_STDAPI XAudio2CreateWithVersionInfo(_Outptr_ IXAudio2** ppXAudio2, - UINT32 Flags X2DEFAULT(0), - XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR), - DWORD ntddiVersion X2DEFAULT(NTDDI_VERSION)); - -static INLINE HRESULT XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, - UINT32 Flags X2DEFAULT(0), - XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)) -{ - /* When compiled for RS5 or later, try to invoke XAudio2CreateWithVersionInfo. - * Need to use LoadLibrary in case the app is running on an older OS. */ - typedef HRESULT(__stdcall *XAudio2CreateWithVersionInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR, DWORD); - typedef HRESULT(__stdcall *XAudio2CreateInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR); - - static HMODULE s_dllInstance = NULL; - static XAudio2CreateWithVersionInfoFunc s_pfnAudio2CreateWithVersion = NULL; - static XAudio2CreateInfoFunc s_pfnAudio2Create = NULL; - - if (s_dllInstance == NULL) - { - s_dllInstance = LoadLibraryEx(XAUDIO2_DLL, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); - if (s_dllInstance == NULL) - return HRESULT_FROM_WIN32(GetLastError()); - - s_pfnAudio2CreateWithVersion = (XAudio2CreateWithVersionInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2CreateWithVersionInfo"); - if (s_pfnAudio2CreateWithVersion == NULL) - { - s_pfnAudio2Create = (XAudio2CreateInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2Create"); - if (s_pfnAudio2Create == NULL) - return HRESULT_FROM_WIN32(GetLastError()); - } - } - - if (s_pfnAudio2CreateWithVersion != NULL) - return (*s_pfnAudio2CreateWithVersion)(ppXAudio2, Flags, XAudio2Processor, NTDDI_VERSION); - return (*s_pfnAudio2Create)(ppXAudio2, Flags, XAudio2Processor); -} -#else -/* RS4 or older, or not a desktop app */ -XAUDIO2_STDAPI XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0), - XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)); -#endif - -/* Undo the #pragma pack(push, 1) directive at the top of this file */ -#pragma pack(pop) - -#endif /* #ifndef GUID_DEFS_ONLY */ - -#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_TV_APP | WINAPI_PARTITION_TV_TITLE) */ -#pragma endregion - + */ +static INLINE float XAudio2CutoffFrequencyToOnePoleCoefficient(float CutoffFrequency, UINT32 SampleRate) +{ + if ((UINT32)CutoffFrequency >= SampleRate) + return XAUDIO2_MAX_FILTER_FREQUENCY; + return (1.0f - powf(1.0f - 2.0f * CutoffFrequency / SampleRate, 2.0f)); +} + +#endif // #ifdef XAUDIO2_HELPER_FUNCTIONS + +/************************************************************************** + * + * XAudio2Create: Top-level function that creates an XAudio2 instance. + * + * ARGUMENTS: + * + * Flags - Flags specifying the XAudio2 object's behavior. + * + * XAudio2Processor - An XAUDIO2_PROCESSOR value that specifies the + * hardware threads (Xbox) or processors (Windows) that XAudio2 + * will use. Note that XAudio2 supports concurrent processing on + * multiple threads, using any combination of XAUDIO2_PROCESSOR + * flags. The values are platform-specific; platform-independent + * code can use XAUDIO2_DEFAULT_PROCESSOR to use the default on + * each platform. + * + **************************************************************************/ + +#ifdef __cplusplus__ + +#if (defined XAUDIO2_EXPORT) + /* We're building xaudio2.dll */ +#define XAUDIO2_STDAPI extern "C" __declspec(dllexport) HRESULT __stdcall +#else + /* We're an xaudio2 client */ +#define XAUDIO2_STDAPI extern "C" __declspec(dllimport) HRESULT __stdcall +#endif + +#else + + /* Modified for C support */ + +#if (defined XAUDIO2_EXPORT) + /* We're building xaudio2.dll */ +#define XAUDIO2_STDAPI __declspec(dllexport) HRESULT __stdcall +#else + /* We're an xaudio2 client */ +#define XAUDIO2_STDAPI __declspec(dllimport) HRESULT __stdcall +#endif + +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) +XAUDIO2_STDAPI XAudio2CreateWithVersionInfo(_Outptr_ IXAudio2** ppXAudio2, + UINT32 Flags X2DEFAULT(0), + XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR), + DWORD ntddiVersion X2DEFAULT(NTDDI_VERSION)); + +static INLINE HRESULT XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, + UINT32 Flags X2DEFAULT(0), + XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)) +{ + /* When compiled for RS5 or later, try to invoke XAudio2CreateWithVersionInfo. + * Need to use LoadLibrary in case the app is running on an older OS. */ + typedef HRESULT(__stdcall *XAudio2CreateWithVersionInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR, DWORD); + typedef HRESULT(__stdcall *XAudio2CreateInfoFunc)(_Outptr_ IXAudio2**, UINT32, XAUDIO2_PROCESSOR); + + static HMODULE s_dllInstance = NULL; + static XAudio2CreateWithVersionInfoFunc s_pfnAudio2CreateWithVersion = NULL; + static XAudio2CreateInfoFunc s_pfnAudio2Create = NULL; + + if (s_dllInstance == NULL) + { + s_dllInstance = LoadLibraryEx(XAUDIO2_DLL, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); + if (s_dllInstance == NULL) + return HRESULT_FROM_WIN32(GetLastError()); + + s_pfnAudio2CreateWithVersion = (XAudio2CreateWithVersionInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2CreateWithVersionInfo"); + if (s_pfnAudio2CreateWithVersion == NULL) + { + s_pfnAudio2Create = (XAudio2CreateInfoFunc)(void*)GetProcAddress(s_dllInstance, "XAudio2Create"); + if (s_pfnAudio2Create == NULL) + return HRESULT_FROM_WIN32(GetLastError()); + } + } + + if (s_pfnAudio2CreateWithVersion != NULL) + return (*s_pfnAudio2CreateWithVersion)(ppXAudio2, Flags, XAudio2Processor, NTDDI_VERSION); + return (*s_pfnAudio2Create)(ppXAudio2, Flags, XAudio2Processor); +} +#else +/* RS4 or older, or not a desktop app */ +XAUDIO2_STDAPI XAudio2Create(_Outptr_ IXAudio2** ppXAudio2, UINT32 Flags X2DEFAULT(0), + XAUDIO2_PROCESSOR XAudio2Processor X2DEFAULT(XAUDIO2_DEFAULT_PROCESSOR)); +#endif + +/* Undo the #pragma pack(push, 1) directive at the top of this file */ +#pragma pack(pop) + +#endif /* #ifndef GUID_DEFS_ONLY */ + +#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_TV_APP | WINAPI_PARTITION_TV_TITLE) */ +#pragma endregion + #endif /* #ifndef __XAUDIO2_INCLUDED__ */ diff --git a/audio/drivers_resampler/cc_resampler.c b/audio/drivers_resampler/cc_resampler.c index b1136f1a16..2fc0abb2b5 100644 --- a/audio/drivers_resampler/cc_resampler.c +++ b/audio/drivers_resampler/cc_resampler.c @@ -149,7 +149,7 @@ done: } static void *resampler_CC_init(const struct resampler_config *config, - double bandwidth_mod, + double bandwidth_mod, enum resampler_quality quality, resampler_simd_mask_t mask) { @@ -488,7 +488,7 @@ static void resampler_CC_process(void *re_, struct resampler_data *data) } static void *resampler_CC_init(const struct resampler_config *config, - double bandwidth_mod, + double bandwidth_mod, enum resampler_quality quality, resampler_simd_mask_t mask) { diff --git a/audio/drivers_resampler/cc_resampler_neon.S b/audio/drivers_resampler/cc_resampler_neon.S index 5ab2816044..67d7f26fb7 100644 --- a/audio/drivers_resampler/cc_resampler_neon.S +++ b/audio/drivers_resampler/cc_resampler_neon.S @@ -78,7 +78,6 @@ # d23: (temp) # d31: buffer[6] # (temp) # buffer[7] - resampler_CC_downsample_neon: _resampler_CC_downsample_neon: @@ -89,7 +88,6 @@ push {r4} mov r4, r0 - veor q0, q0, q0 vmov.f32 s1, #1.0 vmov.f32 s2, #2.0 @@ -102,18 +100,15 @@ vmov.f32 q5, #1.0 vmov.f32 q6, #3.0 vmov.f32 q7, #0.25 - vldr s5, [r2, #32] vdiv.f32 s6, s20, s4 vadd.f32 s7, s6, s8 vdup.f32 q4, d2[0] vmin.f32 q4, q4, q5 - lsl r3, #3 add r3, r3, r1 - cmp r3, r1 beq 3f 1: @@ -199,7 +194,6 @@ vpop {q4,q5,q6,q7} bx lr - .align 4 .globl resampler_CC_upsample_neon #ifndef __MACH__ @@ -256,7 +250,6 @@ bx lr # d23: (temp) # d31: buffer[6] # (temp) # buffer[7] - resampler_CC_upsample_neon: _resampler_CC_upsample_neon: @@ -267,7 +260,6 @@ push {r4} mov r4, r0 - veor q0, q0, q0 vmov.f32 s0, #1.0 vmov.f32 s2, #-1.0 @@ -280,18 +272,15 @@ vmov.f32 q5, #1.0 vmov.f32 q6, #3.0 vmov.f32 q7, #0.25 - vldr s5, [r2, #32] vdiv.f32 s6, s20, s4 vadd.f32 s7, s6, s8 vdup.f32 q4, d2[0] vmin.f32 q4, q4, q5 - lsl r3, #3 add r3, r3, r1 - cmp r3, r1 beq 4f 1: @@ -356,7 +345,6 @@ vst1.f32 d20, [r4, :64]! vadd.f32 s5, s5, s6 - vcmpe.f32 s5, s20 vmrs APSR_nzcv, fpscr blt 2b @@ -368,7 +356,6 @@ vsub.f32 s5, s5, s20 cmp r3, r1 bne 1b - 4: vst1.f32 {q14-q15}, [r2, :256] vstr s5, [r2, #32] diff --git a/bootstrap/gx/ogc.ld b/bootstrap/gx/ogc.ld index d6d06bc2ce..d702881392 100644 --- a/bootstrap/gx/ogc.ld +++ b/bootstrap/gx/ogc.ld @@ -86,7 +86,7 @@ SECTIONS KEEP (*(.fini)) . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ } = 0 - + PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .); @@ -167,7 +167,6 @@ SECTIONS .jcr : { KEEP (*(.jcr)) } .got : { *(.got.plt) *(.got) } - /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ @@ -182,7 +181,7 @@ SECTIONS _edata = .; PROVIDE (edata = .); - + .sbss : { __sbss_start = .; diff --git a/bootstrap/gx/rvl.ld b/bootstrap/gx/rvl.ld index e790eec2db..e0a4db8bb9 100644 --- a/bootstrap/gx/rvl.ld +++ b/bootstrap/gx/rvl.ld @@ -97,7 +97,7 @@ SECTIONS KEEP (*(.fini)) . = ALIGN(32); /* REQUIRED. LD is flaky without it. */ } = 0 - + PROVIDE (__etext = .); PROVIDE (_etext = .); PROVIDE (etext = .); @@ -178,7 +178,6 @@ SECTIONS .jcr : { KEEP (*(.jcr)) } .got : { *(.got.plt) *(.got) } - /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ @@ -193,7 +192,7 @@ SECTIONS _edata = .; PROVIDE (edata = .); - + .sbss : { __sbss_start = .; diff --git a/bootstrap/psp1/kernel_functions_prx/main.c b/bootstrap/psp1/kernel_functions_prx/main.c index 2f4412b363..bf9c6dec6b 100644 --- a/bootstrap/psp1/kernel_functions_prx/main.c +++ b/bootstrap/psp1/kernel_functions_prx/main.c @@ -56,7 +56,7 @@ void exitspawn_kernel(const char *fileName, SceSize args, void *argp) game_param.unk5 = 0x10000; int k1 = pspSdkSetK1(0); - //sceKernelSuspendAllUserThreads(); + //sceKernelSuspendAllUserThreads(); int ret = sceKernelLoadExecVSHMs2(fileName, &game_param); pspSdkSetK1(k1); } diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c index 851e2e82c1..759e1d0277 100644 --- a/cheevos-new/cheevos.c +++ b/cheevos-new/cheevos.c @@ -116,7 +116,7 @@ typedef struct #endif bool core_supports; - + cheevos_rapatchdata_t patchdata; cheevos_cheevo_t* core; cheevos_cheevo_t* unofficial; @@ -289,7 +289,7 @@ static int cheevos_parse(const char* json) cheevos_racheevo_t* rac = NULL; cheevos_fixup_init(&cheevos_locals.fixups); - + res = cheevos_get_patchdata(json, &cheevos_locals.patchdata); if (res != 0) @@ -312,13 +312,13 @@ static int cheevos_parse(const char* json) /* Allocate memory. */ cheevos_locals.core = (cheevos_cheevo_t*) calloc(cheevos_locals.patchdata.core_count, sizeof(cheevos_cheevo_t)); - + cheevos_locals.unofficial = (cheevos_cheevo_t*) calloc(cheevos_locals.patchdata.unofficial_count, sizeof(cheevos_cheevo_t)); cheevos_locals.lboards = (cheevos_lboard_t*) calloc(cheevos_locals.patchdata.lboard_count, sizeof(cheevos_lboard_t)); - + if ( !cheevos_locals.core || !cheevos_locals.unofficial || !cheevos_locals.lboards) @@ -726,7 +726,7 @@ void cheevos_populate_menu(void* data) cheevos_cheevo_t* cheevo = NULL; if ( settings->bools.cheevos_enable - && settings->bools.cheevos_hardcore_mode_enable + && settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded) { if (!cheevos_hardcore_paused) @@ -773,7 +773,7 @@ void cheevos_populate_menu(void* data) cheevo->info->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); - + set_badge_info(&badges_ctx, i, cheevo->info->badge, (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); } @@ -811,7 +811,7 @@ void cheevos_populate_menu(void* data) cheevo->info->description, MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY, MENU_SETTINGS_CHEEVOS_START + i, 0, 0); - + set_badge_info(&badges_ctx, i, cheevo->info->badge, (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE)); } @@ -979,7 +979,7 @@ void cheevos_test(void) { if (settings->bools.cheevos_test_unofficial) cheevos_test_cheevo_set(false); - + if (settings->bools.cheevos_hardcore_mode_enable && settings->bools.cheevos_leaderboards_enable && !cheevos_hardcore_paused) @@ -1671,7 +1671,7 @@ found: { settings_t *settings = config_get_ptr(); if (!( - string_is_equal(settings->arrays.menu_driver, "xmb") || + string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone") ) || !settings->bools.cheevos_badges_enable) diff --git a/cheevos-new/fixup.c b/cheevos-new/fixup.c index ea1109adbc..56e0436cb6 100644 --- a/cheevos-new/fixup.c +++ b/cheevos-new/fixup.c @@ -197,7 +197,7 @@ const uint8_t* cheevos_patch_address(unsigned address, int console) { unsigned addr = address; pointer = desc->core.ptr; - + address = (unsigned)cheevos_var_reduce( (addr - desc->core.start) & desc->disconnect_mask, desc->core.disconnect); diff --git a/cheevos-new/parser.c b/cheevos-new/parser.c index cca2e2281a..19c503139d 100644 --- a/cheevos-new/parser.c +++ b/cheevos-new/parser.c @@ -148,7 +148,7 @@ int cheevos_get_token(const char* json, char* token, size_t length) if (!string_is_empty(token)) return -1; - + return cheevos_get_value(json, CHEEVOS_JSON_KEY_TOKEN, token, length); } diff --git a/cheevos/cheevos.h b/cheevos/cheevos.h index ec25ae0019..c65c2afbc9 100644 --- a/cheevos/cheevos.h +++ b/cheevos/cheevos.h @@ -1,171 +1,171 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2015-2018 - Andre Leiradella - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RARCH_CHEEVOS_OLD_H -#define __RARCH_CHEEVOS_OLD_H - -#ifdef HAVE_NEW_CHEEVOS -#include "../cheevos-new/cheevos.h" -#else - -#include -#include - -#include - -#include - -RETRO_BEGIN_DECLS - -/***************************************************************************** -Setup - mainly for debugging -*****************************************************************************/ - -/* Define this macro to get extra-verbose log for cheevos. */ -#undef CHEEVOS_VERBOSE - -/***************************************************************************** -End of setup -*****************************************************************************/ - -#define CHEEVOS_TAG "[CHEEVOS]: " - -#ifdef CHEEVOS_VERBOSE - -#define CHEEVOS_LOG RARCH_LOG -#define CHEEVOS_ERR RARCH_ERR - -#else - -void cheevos_log(const char *fmt, ...); - -#define CHEEVOS_LOG cheevos_log -#define CHEEVOS_ERR cheevos_log - -#endif - -typedef struct cheevos_ctx_desc -{ - unsigned idx; - char *s; - size_t len; -} cheevos_ctx_desc_t; - -typedef enum -{ - CHEEVOS_CONSOLE_NONE = 0, - /* Don't change those, the values match the console IDs - * at retroachievements.org. */ - CHEEVOS_CONSOLE_MEGA_DRIVE = 1, - CHEEVOS_CONSOLE_NINTENDO_64 = 2, - CHEEVOS_CONSOLE_SUPER_NINTENDO = 3, - CHEEVOS_CONSOLE_GAMEBOY = 4, - CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5, - CHEEVOS_CONSOLE_GAMEBOY_COLOR = 6, - CHEEVOS_CONSOLE_NINTENDO = 7, - CHEEVOS_CONSOLE_PC_ENGINE = 8, - CHEEVOS_CONSOLE_SEGA_CD = 9, - CHEEVOS_CONSOLE_SEGA_32X = 10, - CHEEVOS_CONSOLE_MASTER_SYSTEM = 11, - CHEEVOS_CONSOLE_PLAYSTATION = 12, - CHEEVOS_CONSOLE_ATARI_LYNX = 13, - CHEEVOS_CONSOLE_NEOGEO_POCKET = 14, - CHEEVOS_CONSOLE_GAME_GEAR = 15, - CHEEVOS_CONSOLE_GAMECUBE = 16, - CHEEVOS_CONSOLE_ATARI_JAGUAR = 17, - CHEEVOS_CONSOLE_NINTENDO_DS = 18, - CHEEVOS_CONSOLE_WII = 19, - CHEEVOS_CONSOLE_WII_U = 20, - CHEEVOS_CONSOLE_PLAYSTATION_2 = 21, - CHEEVOS_CONSOLE_XBOX = 22, - CHEEVOS_CONSOLE_SKYNET = 23, - CHEEVOS_CONSOLE_XBOX_ONE = 24, - CHEEVOS_CONSOLE_ATARI_2600 = 25, - CHEEVOS_CONSOLE_MS_DOS = 26, - CHEEVOS_CONSOLE_ARCADE = 27, - CHEEVOS_CONSOLE_VIRTUAL_BOY = 28, - CHEEVOS_CONSOLE_MSX = 29, - CHEEVOS_CONSOLE_COMMODORE_64 = 30, - CHEEVOS_CONSOLE_ZX81 = 31, - CHEEVOS_CONSOLE_ATARI_7800 = 51 -} cheevos_console_t; - -enum -{ - CHEEVOS_DIRTY_TITLE = 1 << 0, - CHEEVOS_DIRTY_DESC = 1 << 1, - CHEEVOS_DIRTY_POINTS = 1 << 2, - CHEEVOS_DIRTY_AUTHOR = 1 << 3, - CHEEVOS_DIRTY_ID = 1 << 4, - CHEEVOS_DIRTY_BADGE = 1 << 5, - CHEEVOS_DIRTY_CONDITIONS = 1 << 6, - CHEEVOS_DIRTY_VOTES = 1 << 7, - CHEEVOS_DIRTY_DESCRIPTION = 1 << 8, - - CHEEVOS_DIRTY_ALL = (1 << 9) - 1 -}; - -enum -{ - CHEEVOS_ACTIVE_SOFTCORE = 1 << 0, - CHEEVOS_ACTIVE_HARDCORE = 1 << 1 -}; - -enum -{ - CHEEVOS_FORMAT_FRAMES = 0, - CHEEVOS_FORMAT_SECS, - CHEEVOS_FORMAT_MILLIS, - CHEEVOS_FORMAT_SCORE, - CHEEVOS_FORMAT_VALUE, - CHEEVOS_FORMAT_OTHER -}; - -bool cheevos_load(const void *data); - -void cheevos_reset_game(void); - -void cheevos_populate_menu(void *data); - -bool cheevos_get_description(cheevos_ctx_desc_t *desc); - -bool cheevos_apply_cheats(bool *data_bool); - -bool cheevos_unload(void); - -bool cheevos_toggle_hardcore_mode(void); - -void cheevos_test(void); - -bool cheevos_set_cheats(void); - -void cheevos_set_support_cheevos(bool state); - -bool cheevos_get_support_cheevos(void); - -cheevos_console_t cheevos_get_console(void); - -extern bool cheevos_loaded; -extern bool cheevos_hardcore_active; -extern bool cheevos_hardcore_paused; -extern bool cheevos_state_loaded_flag; -extern int cheats_are_enabled; -extern int cheats_were_enabled; - -RETRO_END_DECLS - -#endif - -#endif /* __RARCH_CHEEVOS_H */ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2015-2018 - Andre Leiradella + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __RARCH_CHEEVOS_OLD_H +#define __RARCH_CHEEVOS_OLD_H + +#ifdef HAVE_NEW_CHEEVOS +#include "../cheevos-new/cheevos.h" +#else + +#include +#include + +#include + +#include + +RETRO_BEGIN_DECLS + +/***************************************************************************** +Setup - mainly for debugging +*****************************************************************************/ + +/* Define this macro to get extra-verbose log for cheevos. */ +#undef CHEEVOS_VERBOSE + +/***************************************************************************** +End of setup +*****************************************************************************/ + +#define CHEEVOS_TAG "[CHEEVOS]: " + +#ifdef CHEEVOS_VERBOSE + +#define CHEEVOS_LOG RARCH_LOG +#define CHEEVOS_ERR RARCH_ERR + +#else + +void cheevos_log(const char *fmt, ...); + +#define CHEEVOS_LOG cheevos_log +#define CHEEVOS_ERR cheevos_log + +#endif + +typedef struct cheevos_ctx_desc +{ + unsigned idx; + char *s; + size_t len; +} cheevos_ctx_desc_t; + +typedef enum +{ + CHEEVOS_CONSOLE_NONE = 0, + /* Don't change those, the values match the console IDs + * at retroachievements.org. */ + CHEEVOS_CONSOLE_MEGA_DRIVE = 1, + CHEEVOS_CONSOLE_NINTENDO_64 = 2, + CHEEVOS_CONSOLE_SUPER_NINTENDO = 3, + CHEEVOS_CONSOLE_GAMEBOY = 4, + CHEEVOS_CONSOLE_GAMEBOY_ADVANCE = 5, + CHEEVOS_CONSOLE_GAMEBOY_COLOR = 6, + CHEEVOS_CONSOLE_NINTENDO = 7, + CHEEVOS_CONSOLE_PC_ENGINE = 8, + CHEEVOS_CONSOLE_SEGA_CD = 9, + CHEEVOS_CONSOLE_SEGA_32X = 10, + CHEEVOS_CONSOLE_MASTER_SYSTEM = 11, + CHEEVOS_CONSOLE_PLAYSTATION = 12, + CHEEVOS_CONSOLE_ATARI_LYNX = 13, + CHEEVOS_CONSOLE_NEOGEO_POCKET = 14, + CHEEVOS_CONSOLE_GAME_GEAR = 15, + CHEEVOS_CONSOLE_GAMECUBE = 16, + CHEEVOS_CONSOLE_ATARI_JAGUAR = 17, + CHEEVOS_CONSOLE_NINTENDO_DS = 18, + CHEEVOS_CONSOLE_WII = 19, + CHEEVOS_CONSOLE_WII_U = 20, + CHEEVOS_CONSOLE_PLAYSTATION_2 = 21, + CHEEVOS_CONSOLE_XBOX = 22, + CHEEVOS_CONSOLE_SKYNET = 23, + CHEEVOS_CONSOLE_XBOX_ONE = 24, + CHEEVOS_CONSOLE_ATARI_2600 = 25, + CHEEVOS_CONSOLE_MS_DOS = 26, + CHEEVOS_CONSOLE_ARCADE = 27, + CHEEVOS_CONSOLE_VIRTUAL_BOY = 28, + CHEEVOS_CONSOLE_MSX = 29, + CHEEVOS_CONSOLE_COMMODORE_64 = 30, + CHEEVOS_CONSOLE_ZX81 = 31, + CHEEVOS_CONSOLE_ATARI_7800 = 51 +} cheevos_console_t; + +enum +{ + CHEEVOS_DIRTY_TITLE = 1 << 0, + CHEEVOS_DIRTY_DESC = 1 << 1, + CHEEVOS_DIRTY_POINTS = 1 << 2, + CHEEVOS_DIRTY_AUTHOR = 1 << 3, + CHEEVOS_DIRTY_ID = 1 << 4, + CHEEVOS_DIRTY_BADGE = 1 << 5, + CHEEVOS_DIRTY_CONDITIONS = 1 << 6, + CHEEVOS_DIRTY_VOTES = 1 << 7, + CHEEVOS_DIRTY_DESCRIPTION = 1 << 8, + + CHEEVOS_DIRTY_ALL = (1 << 9) - 1 +}; + +enum +{ + CHEEVOS_ACTIVE_SOFTCORE = 1 << 0, + CHEEVOS_ACTIVE_HARDCORE = 1 << 1 +}; + +enum +{ + CHEEVOS_FORMAT_FRAMES = 0, + CHEEVOS_FORMAT_SECS, + CHEEVOS_FORMAT_MILLIS, + CHEEVOS_FORMAT_SCORE, + CHEEVOS_FORMAT_VALUE, + CHEEVOS_FORMAT_OTHER +}; + +bool cheevos_load(const void *data); + +void cheevos_reset_game(void); + +void cheevos_populate_menu(void *data); + +bool cheevos_get_description(cheevos_ctx_desc_t *desc); + +bool cheevos_apply_cheats(bool *data_bool); + +bool cheevos_unload(void); + +bool cheevos_toggle_hardcore_mode(void); + +void cheevos_test(void); + +bool cheevos_set_cheats(void); + +void cheevos_set_support_cheevos(bool state); + +bool cheevos_get_support_cheevos(void); + +cheevos_console_t cheevos_get_console(void); + +extern bool cheevos_loaded; +extern bool cheevos_hardcore_active; +extern bool cheevos_hardcore_paused; +extern bool cheevos_state_loaded_flag; +extern int cheats_are_enabled; +extern int cheats_were_enabled; + +RETRO_END_DECLS + +#endif + +#endif /* __RARCH_CHEEVOS_H */ diff --git a/cheevos/cond.c b/cheevos/cond.c index 850e1238e6..9f665900c9 100644 --- a/cheevos/cond.c +++ b/cheevos/cond.c @@ -1,189 +1,189 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2015-2017 - Andre Leiradella - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include "cond.h" -#include "var.h" - -#include "../retroarch.h" -#include "../verbosity.h" - -/***************************************************************************** -Parsing -*****************************************************************************/ - -static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr) -{ - const char *str = *memaddr; - cheevos_cond_op_t op; - - if (*str == '=' && str[1] == '=') - { - op = CHEEVOS_COND_OP_EQUALS; - str += 2; - } - else if (*str == '=') - { - op = CHEEVOS_COND_OP_EQUALS; - str++; - } - else if (*str == '!' && str[1] == '=') - { - op = CHEEVOS_COND_OP_NOT_EQUAL_TO; - str += 2; - } - else if (*str == '<' && str[1] == '=') - { - op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL; - str += 2; - } - else if (*str == '<') - { - op = CHEEVOS_COND_OP_LESS_THAN; - str++; - } - else if (*str == '>' && str[1] == '=') - { - op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL; - str += 2; - } - else if (*str == '>') - { - op = CHEEVOS_COND_OP_GREATER_THAN; - str++; - } - else - { - CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str); - op = CHEEVOS_COND_OP_EQUALS; - } - - *memaddr = str; - return op; -} - -void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr) -{ - const char* str = *memaddr; - cond->type = CHEEVOS_COND_TYPE_STANDARD; - - if (*str != 0 && str[1] == ':') - { - int skip = 2; - - switch (*str) - { - case 'R': - cond->type = CHEEVOS_COND_TYPE_RESET_IF; - break; - case 'P': - cond->type = CHEEVOS_COND_TYPE_PAUSE_IF; - break; - case 'A': - cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE; - break; - case 'B': - cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE; - break; - case 'C': - cond->type = CHEEVOS_COND_TYPE_ADD_HITS; - break; - default: - skip = 0; - break; - } - - str += skip; - } - - cheevos_var_parse(&cond->source, &str); - cond->op = cheevos_cond_parse_operator(&str); - cheevos_var_parse(&cond->target, &str); - cond->curr_hits = 0; - - if (*str == '(' || *str == '.') - { - char* end; - cond->req_hits = (unsigned)strtol(str + 1, &end, 10); - str = end + (*end == ')' || *end == '.'); - } - else - cond->req_hits = 0; - - *memaddr = str; -} - -unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which) -{ - cheevos_cond_t dummy; - unsigned index = 0; - unsigned count = 0; - - for (;;) - { - for (;;) - { - cheevos_cond_parse(&dummy, &memaddr); - - if (index == which) - count++; - - if (*memaddr != '_') - break; - - memaddr++; - } - - index++; - - if (*memaddr != 'S') - break; - - memaddr++; - } - - return count; -} - -void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which) -{ - cheevos_cond_t dummy; - unsigned index = 0; - - for (;;) - { - for (;;) - { - if (index == which) - { - cheevos_cond_parse(cond, &memaddr); - cond++; - } - else - cheevos_cond_parse(&dummy, &memaddr); - - if (*memaddr != '_') - break; - - memaddr++; - } - - index++; - - if (*memaddr != 'S') - break; - - memaddr++; - } -} +/* RetroArch - A frontend for libretro. + * Copyright (C) 2015-2017 - Andre Leiradella + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include "cond.h" +#include "var.h" + +#include "../retroarch.h" +#include "../verbosity.h" + +/***************************************************************************** +Parsing +*****************************************************************************/ + +static cheevos_cond_op_t cheevos_cond_parse_operator(const char** memaddr) +{ + const char *str = *memaddr; + cheevos_cond_op_t op; + + if (*str == '=' && str[1] == '=') + { + op = CHEEVOS_COND_OP_EQUALS; + str += 2; + } + else if (*str == '=') + { + op = CHEEVOS_COND_OP_EQUALS; + str++; + } + else if (*str == '!' && str[1] == '=') + { + op = CHEEVOS_COND_OP_NOT_EQUAL_TO; + str += 2; + } + else if (*str == '<' && str[1] == '=') + { + op = CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL; + str += 2; + } + else if (*str == '<') + { + op = CHEEVOS_COND_OP_LESS_THAN; + str++; + } + else if (*str == '>' && str[1] == '=') + { + op = CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL; + str += 2; + } + else if (*str == '>') + { + op = CHEEVOS_COND_OP_GREATER_THAN; + str++; + } + else + { + CHEEVOS_ERR(CHEEVOS_TAG "unknown operator %c\n.", *str); + op = CHEEVOS_COND_OP_EQUALS; + } + + *memaddr = str; + return op; +} + +void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr) +{ + const char* str = *memaddr; + cond->type = CHEEVOS_COND_TYPE_STANDARD; + + if (*str != 0 && str[1] == ':') + { + int skip = 2; + + switch (*str) + { + case 'R': + cond->type = CHEEVOS_COND_TYPE_RESET_IF; + break; + case 'P': + cond->type = CHEEVOS_COND_TYPE_PAUSE_IF; + break; + case 'A': + cond->type = CHEEVOS_COND_TYPE_ADD_SOURCE; + break; + case 'B': + cond->type = CHEEVOS_COND_TYPE_SUB_SOURCE; + break; + case 'C': + cond->type = CHEEVOS_COND_TYPE_ADD_HITS; + break; + default: + skip = 0; + break; + } + + str += skip; + } + + cheevos_var_parse(&cond->source, &str); + cond->op = cheevos_cond_parse_operator(&str); + cheevos_var_parse(&cond->target, &str); + cond->curr_hits = 0; + + if (*str == '(' || *str == '.') + { + char* end; + cond->req_hits = (unsigned)strtol(str + 1, &end, 10); + str = end + (*end == ')' || *end == '.'); + } + else + cond->req_hits = 0; + + *memaddr = str; +} + +unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which) +{ + cheevos_cond_t dummy; + unsigned index = 0; + unsigned count = 0; + + for (;;) + { + for (;;) + { + cheevos_cond_parse(&dummy, &memaddr); + + if (index == which) + count++; + + if (*memaddr != '_') + break; + + memaddr++; + } + + index++; + + if (*memaddr != 'S') + break; + + memaddr++; + } + + return count; +} + +void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which) +{ + cheevos_cond_t dummy; + unsigned index = 0; + + for (;;) + { + for (;;) + { + if (index == which) + { + cheevos_cond_parse(cond, &memaddr); + cond++; + } + else + cheevos_cond_parse(&dummy, &memaddr); + + if (*memaddr != '_') + break; + + memaddr++; + } + + index++; + + if (*memaddr != 'S') + break; + + memaddr++; + } +} diff --git a/cheevos/cond.h b/cheevos/cond.h index e42d12655d..ee7cb668a1 100644 --- a/cheevos/cond.h +++ b/cheevos/cond.h @@ -1,63 +1,63 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2015-2017 - Andre Leiradella - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RARCH_CHEEVOS_COND_H -#define __RARCH_CHEEVOS_COND_H - -#include "var.h" - -#include - -RETRO_BEGIN_DECLS - -typedef enum -{ - CHEEVOS_COND_TYPE_STANDARD, - CHEEVOS_COND_TYPE_PAUSE_IF, - CHEEVOS_COND_TYPE_RESET_IF, - CHEEVOS_COND_TYPE_ADD_SOURCE, - CHEEVOS_COND_TYPE_SUB_SOURCE, - CHEEVOS_COND_TYPE_ADD_HITS -} cheevos_cond_type_t; - -typedef enum -{ - CHEEVOS_COND_OP_EQUALS, - CHEEVOS_COND_OP_LESS_THAN, - CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL, - CHEEVOS_COND_OP_GREATER_THAN, - CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL, - CHEEVOS_COND_OP_NOT_EQUAL_TO -} cheevos_cond_op_t; - -typedef struct -{ - cheevos_cond_type_t type; - unsigned req_hits; - unsigned curr_hits; - char pause; - - cheevos_var_t source; - cheevos_cond_op_t op; - cheevos_var_t target; -} cheevos_cond_t; - -void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr); -unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which); -void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which); - -RETRO_END_DECLS - -#endif /* __RARCH_CHEEVOS_COND_H */ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2015-2017 - Andre Leiradella + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __RARCH_CHEEVOS_COND_H +#define __RARCH_CHEEVOS_COND_H + +#include "var.h" + +#include + +RETRO_BEGIN_DECLS + +typedef enum +{ + CHEEVOS_COND_TYPE_STANDARD, + CHEEVOS_COND_TYPE_PAUSE_IF, + CHEEVOS_COND_TYPE_RESET_IF, + CHEEVOS_COND_TYPE_ADD_SOURCE, + CHEEVOS_COND_TYPE_SUB_SOURCE, + CHEEVOS_COND_TYPE_ADD_HITS +} cheevos_cond_type_t; + +typedef enum +{ + CHEEVOS_COND_OP_EQUALS, + CHEEVOS_COND_OP_LESS_THAN, + CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL, + CHEEVOS_COND_OP_GREATER_THAN, + CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL, + CHEEVOS_COND_OP_NOT_EQUAL_TO +} cheevos_cond_op_t; + +typedef struct +{ + cheevos_cond_type_t type; + unsigned req_hits; + unsigned curr_hits; + char pause; + + cheevos_var_t source; + cheevos_cond_op_t op; + cheevos_var_t target; +} cheevos_cond_t; + +void cheevos_cond_parse(cheevos_cond_t* cond, const char** memaddr); +unsigned cheevos_cond_count_in_set(const char* memaddr, unsigned which); +void cheevos_cond_parse_in_set(cheevos_cond_t* cond, const char* memaddr, unsigned which); + +RETRO_END_DECLS + +#endif /* __RARCH_CHEEVOS_COND_H */ diff --git a/cheevos/coro.h b/cheevos/coro.h index c1a6881e24..e30616b5f2 100644 --- a/cheevos/coro.h +++ b/cheevos/coro.h @@ -1,75 +1,75 @@ -#ifndef CORO_H -#define CORO_H - -/* -Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/ -*/ - -/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */ -#define CORO_ENTER() \ - { \ - CORO_again: ; \ - switch ( coro->step ) { \ - case CORO_BEGIN: ; - -/* Use to define labels which are targets to GOTO and GOSUB */ -#define CORO_SUB( x ) \ - case x: ; - -/* Use at the end of the coroutine */ -#define CORO_LEAVE() \ - } } \ - do { return 0; } while ( 0 ) - -/* Go to the x label */ -#define CORO_GOTO( x ) \ - do { \ - coro->step = ( x ); \ - goto CORO_again; \ - } while ( 0 ) - -/* Go to a subroutine, execution continues until the subroutine returns via RET */ -#define CORO_GOSUB( x ) \ - do { \ - coro->stack[ coro->sp++ ] = __LINE__; \ - coro->step = ( x ); \ - goto CORO_again; \ - case __LINE__: ; \ - } while ( 0 ) - -/* Returns from a subroutine */ -#define CORO_RET() \ - do { \ - coro->step = coro->stack[ --coro->sp ]; \ - goto CORO_again; \ - } while ( 0 ) - -/* Yields to the caller, execution continues from this point when the coroutine is resumed */ -#define CORO_YIELD() \ - do { \ - coro->step = __LINE__; \ - return 1; \ - case __LINE__: ; \ - } while ( 0 ) - -/* The coroutine entry point, never use 0 as a label */ -#define CORO_BEGIN 0 - -/* Sets up the coroutine */ -#define CORO_SETUP() \ - do { \ - coro->step = CORO_BEGIN; \ - coro->sp = 0; \ - } while ( 0 ) - -#define CORO_STOP() \ - do { \ - return 0; \ - } while ( 0 ) - -/* Add this macro to your coro_t structure containing the variables for the coroutine */ -#define CORO_FIELDS \ - int step, sp; \ - int stack[ 8 ]; - -#endif /* CORO_H */ +#ifndef CORO_H +#define CORO_H + +/* +Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/ +*/ + +/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */ +#define CORO_ENTER() \ + { \ + CORO_again: ; \ + switch ( coro->step ) { \ + case CORO_BEGIN: ; + +/* Use to define labels which are targets to GOTO and GOSUB */ +#define CORO_SUB( x ) \ + case x: ; + +/* Use at the end of the coroutine */ +#define CORO_LEAVE() \ + } } \ + do { return 0; } while ( 0 ) + +/* Go to the x label */ +#define CORO_GOTO( x ) \ + do { \ + coro->step = ( x ); \ + goto CORO_again; \ + } while ( 0 ) + +/* Go to a subroutine, execution continues until the subroutine returns via RET */ +#define CORO_GOSUB( x ) \ + do { \ + coro->stack[ coro->sp++ ] = __LINE__; \ + coro->step = ( x ); \ + goto CORO_again; \ + case __LINE__: ; \ + } while ( 0 ) + +/* Returns from a subroutine */ +#define CORO_RET() \ + do { \ + coro->step = coro->stack[ --coro->sp ]; \ + goto CORO_again; \ + } while ( 0 ) + +/* Yields to the caller, execution continues from this point when the coroutine is resumed */ +#define CORO_YIELD() \ + do { \ + coro->step = __LINE__; \ + return 1; \ + case __LINE__: ; \ + } while ( 0 ) + +/* The coroutine entry point, never use 0 as a label */ +#define CORO_BEGIN 0 + +/* Sets up the coroutine */ +#define CORO_SETUP() \ + do { \ + coro->step = CORO_BEGIN; \ + coro->sp = 0; \ + } while ( 0 ) + +#define CORO_STOP() \ + do { \ + return 0; \ + } while ( 0 ) + +/* Add this macro to your coro_t structure containing the variables for the coroutine */ +#define CORO_FIELDS \ + int step, sp; \ + int stack[ 8 ]; + +#endif /* CORO_H */ diff --git a/cheevos/var.c b/cheevos/var.c index ba7d17ec28..18c8955dac 100644 --- a/cheevos/var.c +++ b/cheevos/var.c @@ -1,415 +1,415 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2015-2017 - Andre Leiradella - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include -#include - -#include - -#include "var.h" - -#include "../retroarch.h" -#include "../core.h" -#include "../verbosity.h" - -/***************************************************************************** -Parsing -*****************************************************************************/ - -static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr) -{ - /* Careful not to use ABCDEF here, this denotes part of an actual variable! */ - const char* str = *memaddr; - cheevos_var_size_t size; - - switch (toupper((unsigned char)*str++)) - { - case 'M': - size = CHEEVOS_VAR_SIZE_BIT_0; - break; - case 'N': - size = CHEEVOS_VAR_SIZE_BIT_1; - break; - case 'O': - size = CHEEVOS_VAR_SIZE_BIT_2; - break; - case 'P': - size = CHEEVOS_VAR_SIZE_BIT_3; - break; - case 'Q': - size = CHEEVOS_VAR_SIZE_BIT_4; - break; - case 'R': - size = CHEEVOS_VAR_SIZE_BIT_5; - break; - case 'S': - size = CHEEVOS_VAR_SIZE_BIT_6; - break; - case 'T': - size = CHEEVOS_VAR_SIZE_BIT_7; - break; - case 'L': - size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER; - break; - case 'U': - size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER; - break; - case 'H': - size = CHEEVOS_VAR_SIZE_EIGHT_BITS; - break; - case 'X': - size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS; - break; - default: - str--; - /* fall through */ - case ' ': - size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS; - break; - } - - *memaddr = str; - return size; -} - -static size_t cheevos_var_reduce(size_t addr, size_t mask) -{ - while (mask) - { - size_t tmp = (mask - 1) & ~mask; - addr = (addr & tmp) | ((addr >> 1) & ~tmp); - mask = (mask & (mask - 1)) >> 1; - } - - return addr; -} - -static size_t cheevos_var_highest_bit(size_t n) -{ - n |= n >> 1; - n |= n >> 2; - n |= n >> 4; - n |= n >> 8; - n |= n >> 16; - - return n ^ (n >> 1); -} - -void cheevos_var_parse(cheevos_var_t* var, const char** memaddr) -{ - char *end = NULL; - const char *str = *memaddr; - unsigned base = 16; - - var->is_bcd = false; - - if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X') - { - /* d0x + 4 hex digits */ - str += 3; - var->type = CHEEVOS_VAR_TYPE_DELTA_MEM; - } - else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X') - { - /* b0x (binary-coded decimal) */ - str += 3; - var->is_bcd = true; - var->type = CHEEVOS_VAR_TYPE_ADDRESS; - } - else if (*str == '0' && toupper((unsigned char)str[1]) == 'X') - { - /* 0x + 4 hex digits */ - str += 2; - var->type = CHEEVOS_VAR_TYPE_ADDRESS; - } - else - { - var->type = CHEEVOS_VAR_TYPE_VALUE_COMP; - - if (toupper((unsigned char)*str) == 'H') - str++; - else - { - if (toupper((unsigned char)*str) == 'V') - str++; - - base = 10; - } - } - - if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP) - { - var->size = cheevos_var_parse_prefix(&str); - } - - var->value = (unsigned)strtol(str, &end, base); - *memaddr = end; -} - -void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console) -{ - rarch_system_info_t *system = runloop_get_system_info(); - - var->bank_id = -1; - - if (console == CHEEVOS_CONSOLE_NINTENDO) - { - if (var->value >= 0x0800 && var->value < 0x2000) - { - CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff); - var->value &= 0x07ff; - } - } - else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR) - { - if (var->value >= 0xe000 && var->value <= 0xfdff) - { - CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000); - var->value -= 0x2000; - } - } - - if (system->mmaps.num_descriptors != 0) - { - const rarch_memory_descriptor_t *desc = NULL; - const rarch_memory_descriptor_t *end = NULL; - - /* Patch the address to correctly map it to the mmaps */ - if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE) - { - if (var->value < 0x8000) /* Internal RAM */ - { - CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000); - var->value += 0x3000000; - } - else /* Work RAM */ - { - CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000); - var->value += 0x2000000 - 0x8000; - } - } - else if (console == CHEEVOS_CONSOLE_PC_ENGINE) - { - CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000); - var->value += 0x1f0000; - } - else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO) - { - if (var->value < 0x020000) /* Work RAM */ - { - CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000); - var->value += 0x7e0000; - } - else /* Save RAM */ - { - CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000); - var->value += 0x006000 - 0x020000; - } - } - - desc = system->mmaps.descriptors; - end = desc + system->mmaps.num_descriptors; - - for (; desc < end; desc++) - { - if (((desc->core.start ^ var->value) & desc->core.select) == 0) - { - unsigned addr = var->value; - var->bank_id = (int)(desc - system->mmaps.descriptors); - var->value = (unsigned)cheevos_var_reduce( - (addr - desc->core.start) & desc->disconnect_mask, - desc->core.disconnect); - - if (var->value >= desc->core.len) - var->value -= cheevos_var_highest_bit(var->value); - - var->value += desc->core.offset; - - CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value); - break; - } - } - } - else - { - unsigned i; - - for (i = 0; i < 4; i++) - { - retro_ctx_memory_info_t meminfo; - - switch (i) - { - case 0: - meminfo.id = RETRO_MEMORY_SYSTEM_RAM; - break; - case 1: - meminfo.id = RETRO_MEMORY_SAVE_RAM; - break; - case 2: - meminfo.id = RETRO_MEMORY_VIDEO_RAM; - break; - case 3: - meminfo.id = RETRO_MEMORY_RTC; - break; - } - - core_get_memory(&meminfo); - - if (var->value < meminfo.size) - { - var->bank_id = i; - break; - } - - /* HACK subtract the correct amount of bytes to reach the save RAM */ - if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO) - var->value -= 0x6000; - else - var->value -= meminfo.size; - } - } -} - -/***************************************************************************** -Testing -*****************************************************************************/ - -uint8_t* cheevos_var_get_memory(const cheevos_var_t* var) -{ - uint8_t* memory = NULL; - - if (var->bank_id >= 0) - { - rarch_system_info_t* system = runloop_get_system_info(); - - if (system->mmaps.num_descriptors != 0) - memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr; - else - { - retro_ctx_memory_info_t meminfo = {NULL, 0, 0}; - - switch (var->bank_id) - { - case 0: - meminfo.id = RETRO_MEMORY_SYSTEM_RAM; - break; - case 1: - meminfo.id = RETRO_MEMORY_SAVE_RAM; - break; - case 2: - meminfo.id = RETRO_MEMORY_VIDEO_RAM; - break; - case 3: - meminfo.id = RETRO_MEMORY_RTC; - break; - default: - CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id); - break; - } - - core_get_memory(&meminfo); - memory = (uint8_t*)meminfo.data; - } - - if (memory) - memory += var->value; - } - - return memory; -} - -unsigned cheevos_var_get_value(cheevos_var_t* var) -{ - const uint8_t* memory = NULL; - unsigned value = 0; - - switch (var->type) - { - case CHEEVOS_VAR_TYPE_VALUE_COMP: - value = var->value; - break; - - case CHEEVOS_VAR_TYPE_ADDRESS: - case CHEEVOS_VAR_TYPE_DELTA_MEM: - memory = cheevos_var_get_memory(var); - - if (memory) - { - value = memory[0]; - - switch (var->size) - { - case CHEEVOS_VAR_SIZE_BIT_0: - value &= 1; - break; - case CHEEVOS_VAR_SIZE_BIT_1: - value = (value >> 1) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_2: - value = (value >> 2) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_3: - value = (value >> 3) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_4: - value = (value >> 4) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_5: - value = (value >> 5) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_6: - value = (value >> 6) & 1; - break; - case CHEEVOS_VAR_SIZE_BIT_7: - value = (value >> 7) & 1; - break; - case CHEEVOS_VAR_SIZE_NIBBLE_LOWER: - value &= 0x0f; - break; - case CHEEVOS_VAR_SIZE_NIBBLE_UPPER: - value = (value >> 4) & 0x0f; - break; - case CHEEVOS_VAR_SIZE_EIGHT_BITS: - break; - case CHEEVOS_VAR_SIZE_SIXTEEN_BITS: - value |= memory[1] << 8; - break; - case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS: - value |= memory[1] << 8; - value |= memory[2] << 16; - value |= memory[3] << 24; - break; - } - } - - if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM) - { - unsigned previous = var->previous; - var->previous = value; - value = previous; - } - - break; - - case CHEEVOS_VAR_TYPE_DYNAMIC_VAR: - /* We shouldn't get here... */ - break; - } - - if(var->is_bcd) - return (((value >> 4) & 0xf) * 10) + (value & 0xf); - return value; -} +/* RetroArch - A frontend for libretro. + * Copyright (C) 2015-2017 - Andre Leiradella + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include + +#include + +#include "var.h" + +#include "../retroarch.h" +#include "../core.h" +#include "../verbosity.h" + +/***************************************************************************** +Parsing +*****************************************************************************/ + +static cheevos_var_size_t cheevos_var_parse_prefix(const char** memaddr) +{ + /* Careful not to use ABCDEF here, this denotes part of an actual variable! */ + const char* str = *memaddr; + cheevos_var_size_t size; + + switch (toupper((unsigned char)*str++)) + { + case 'M': + size = CHEEVOS_VAR_SIZE_BIT_0; + break; + case 'N': + size = CHEEVOS_VAR_SIZE_BIT_1; + break; + case 'O': + size = CHEEVOS_VAR_SIZE_BIT_2; + break; + case 'P': + size = CHEEVOS_VAR_SIZE_BIT_3; + break; + case 'Q': + size = CHEEVOS_VAR_SIZE_BIT_4; + break; + case 'R': + size = CHEEVOS_VAR_SIZE_BIT_5; + break; + case 'S': + size = CHEEVOS_VAR_SIZE_BIT_6; + break; + case 'T': + size = CHEEVOS_VAR_SIZE_BIT_7; + break; + case 'L': + size = CHEEVOS_VAR_SIZE_NIBBLE_LOWER; + break; + case 'U': + size = CHEEVOS_VAR_SIZE_NIBBLE_UPPER; + break; + case 'H': + size = CHEEVOS_VAR_SIZE_EIGHT_BITS; + break; + case 'X': + size = CHEEVOS_VAR_SIZE_THIRTYTWO_BITS; + break; + default: + str--; + /* fall through */ + case ' ': + size = CHEEVOS_VAR_SIZE_SIXTEEN_BITS; + break; + } + + *memaddr = str; + return size; +} + +static size_t cheevos_var_reduce(size_t addr, size_t mask) +{ + while (mask) + { + size_t tmp = (mask - 1) & ~mask; + addr = (addr & tmp) | ((addr >> 1) & ~tmp); + mask = (mask & (mask - 1)) >> 1; + } + + return addr; +} + +static size_t cheevos_var_highest_bit(size_t n) +{ + n |= n >> 1; + n |= n >> 2; + n |= n >> 4; + n |= n >> 8; + n |= n >> 16; + + return n ^ (n >> 1); +} + +void cheevos_var_parse(cheevos_var_t* var, const char** memaddr) +{ + char *end = NULL; + const char *str = *memaddr; + unsigned base = 16; + + var->is_bcd = false; + + if (toupper((unsigned char)*str) == 'D' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X') + { + /* d0x + 4 hex digits */ + str += 3; + var->type = CHEEVOS_VAR_TYPE_DELTA_MEM; + } + else if (toupper((unsigned char)*str) == 'B' && str[1] == '0' && toupper((unsigned char)str[2]) == 'X') + { + /* b0x (binary-coded decimal) */ + str += 3; + var->is_bcd = true; + var->type = CHEEVOS_VAR_TYPE_ADDRESS; + } + else if (*str == '0' && toupper((unsigned char)str[1]) == 'X') + { + /* 0x + 4 hex digits */ + str += 2; + var->type = CHEEVOS_VAR_TYPE_ADDRESS; + } + else + { + var->type = CHEEVOS_VAR_TYPE_VALUE_COMP; + + if (toupper((unsigned char)*str) == 'H') + str++; + else + { + if (toupper((unsigned char)*str) == 'V') + str++; + + base = 10; + } + } + + if (var->type != CHEEVOS_VAR_TYPE_VALUE_COMP) + { + var->size = cheevos_var_parse_prefix(&str); + } + + var->value = (unsigned)strtol(str, &end, base); + *memaddr = end; +} + +void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console) +{ + rarch_system_info_t *system = runloop_get_system_info(); + + var->bank_id = -1; + + if (console == CHEEVOS_CONSOLE_NINTENDO) + { + if (var->value >= 0x0800 && var->value < 0x2000) + { + CHEEVOS_LOG(CHEEVOS_TAG "NES memory address in mirrorred RAM %X, adjusted to %X\n", var->value, var->value & 0x07ff); + var->value &= 0x07ff; + } + } + else if (console == CHEEVOS_CONSOLE_GAMEBOY_COLOR) + { + if (var->value >= 0xe000 && var->value <= 0xfdff) + { + CHEEVOS_LOG(CHEEVOS_TAG "GBC memory address in echo RAM %X, adjusted to %X\n", var->value, var->value - 0x2000); + var->value -= 0x2000; + } + } + + if (system->mmaps.num_descriptors != 0) + { + const rarch_memory_descriptor_t *desc = NULL; + const rarch_memory_descriptor_t *end = NULL; + + /* Patch the address to correctly map it to the mmaps */ + if (console == CHEEVOS_CONSOLE_GAMEBOY_ADVANCE) + { + if (var->value < 0x8000) /* Internal RAM */ + { + CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x3000000); + var->value += 0x3000000; + } + else /* Work RAM */ + { + CHEEVOS_LOG(CHEEVOS_TAG "GBA memory address %X adjusted to %X\n", var->value, var->value + 0x2000000 - 0x8000); + var->value += 0x2000000 - 0x8000; + } + } + else if (console == CHEEVOS_CONSOLE_PC_ENGINE) + { + CHEEVOS_LOG(CHEEVOS_TAG "PCE memory address %X adjusted to %X\n", var->value, var->value + 0x1f0000); + var->value += 0x1f0000; + } + else if (console == CHEEVOS_CONSOLE_SUPER_NINTENDO) + { + if (var->value < 0x020000) /* Work RAM */ + { + CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x7e0000); + var->value += 0x7e0000; + } + else /* Save RAM */ + { + CHEEVOS_LOG(CHEEVOS_TAG "SNES memory address %X adjusted to %X\n", var->value, var->value + 0x006000 - 0x020000); + var->value += 0x006000 - 0x020000; + } + } + + desc = system->mmaps.descriptors; + end = desc + system->mmaps.num_descriptors; + + for (; desc < end; desc++) + { + if (((desc->core.start ^ var->value) & desc->core.select) == 0) + { + unsigned addr = var->value; + var->bank_id = (int)(desc - system->mmaps.descriptors); + var->value = (unsigned)cheevos_var_reduce( + (addr - desc->core.start) & desc->disconnect_mask, + desc->core.disconnect); + + if (var->value >= desc->core.len) + var->value -= cheevos_var_highest_bit(var->value); + + var->value += desc->core.offset; + + CHEEVOS_LOG(CHEEVOS_TAG "address %X set to descriptor %d at offset %X\n", addr, var->bank_id + 1, var->value); + break; + } + } + } + else + { + unsigned i; + + for (i = 0; i < 4; i++) + { + retro_ctx_memory_info_t meminfo; + + switch (i) + { + case 0: + meminfo.id = RETRO_MEMORY_SYSTEM_RAM; + break; + case 1: + meminfo.id = RETRO_MEMORY_SAVE_RAM; + break; + case 2: + meminfo.id = RETRO_MEMORY_VIDEO_RAM; + break; + case 3: + meminfo.id = RETRO_MEMORY_RTC; + break; + } + + core_get_memory(&meminfo); + + if (var->value < meminfo.size) + { + var->bank_id = i; + break; + } + + /* HACK subtract the correct amount of bytes to reach the save RAM */ + if (i == 0 && console == CHEEVOS_CONSOLE_NINTENDO) + var->value -= 0x6000; + else + var->value -= meminfo.size; + } + } +} + +/***************************************************************************** +Testing +*****************************************************************************/ + +uint8_t* cheevos_var_get_memory(const cheevos_var_t* var) +{ + uint8_t* memory = NULL; + + if (var->bank_id >= 0) + { + rarch_system_info_t* system = runloop_get_system_info(); + + if (system->mmaps.num_descriptors != 0) + memory = (uint8_t*)system->mmaps.descriptors[var->bank_id].core.ptr; + else + { + retro_ctx_memory_info_t meminfo = {NULL, 0, 0}; + + switch (var->bank_id) + { + case 0: + meminfo.id = RETRO_MEMORY_SYSTEM_RAM; + break; + case 1: + meminfo.id = RETRO_MEMORY_SAVE_RAM; + break; + case 2: + meminfo.id = RETRO_MEMORY_VIDEO_RAM; + break; + case 3: + meminfo.id = RETRO_MEMORY_RTC; + break; + default: + CHEEVOS_ERR(CHEEVOS_TAG "invalid bank id: %s\n", var->bank_id); + break; + } + + core_get_memory(&meminfo); + memory = (uint8_t*)meminfo.data; + } + + if (memory) + memory += var->value; + } + + return memory; +} + +unsigned cheevos_var_get_value(cheevos_var_t* var) +{ + const uint8_t* memory = NULL; + unsigned value = 0; + + switch (var->type) + { + case CHEEVOS_VAR_TYPE_VALUE_COMP: + value = var->value; + break; + + case CHEEVOS_VAR_TYPE_ADDRESS: + case CHEEVOS_VAR_TYPE_DELTA_MEM: + memory = cheevos_var_get_memory(var); + + if (memory) + { + value = memory[0]; + + switch (var->size) + { + case CHEEVOS_VAR_SIZE_BIT_0: + value &= 1; + break; + case CHEEVOS_VAR_SIZE_BIT_1: + value = (value >> 1) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_2: + value = (value >> 2) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_3: + value = (value >> 3) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_4: + value = (value >> 4) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_5: + value = (value >> 5) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_6: + value = (value >> 6) & 1; + break; + case CHEEVOS_VAR_SIZE_BIT_7: + value = (value >> 7) & 1; + break; + case CHEEVOS_VAR_SIZE_NIBBLE_LOWER: + value &= 0x0f; + break; + case CHEEVOS_VAR_SIZE_NIBBLE_UPPER: + value = (value >> 4) & 0x0f; + break; + case CHEEVOS_VAR_SIZE_EIGHT_BITS: + break; + case CHEEVOS_VAR_SIZE_SIXTEEN_BITS: + value |= memory[1] << 8; + break; + case CHEEVOS_VAR_SIZE_THIRTYTWO_BITS: + value |= memory[1] << 8; + value |= memory[2] << 16; + value |= memory[3] << 24; + break; + } + } + + if (var->type == CHEEVOS_VAR_TYPE_DELTA_MEM) + { + unsigned previous = var->previous; + var->previous = value; + value = previous; + } + + break; + + case CHEEVOS_VAR_TYPE_DYNAMIC_VAR: + /* We shouldn't get here... */ + break; + } + + if(var->is_bcd) + return (((value >> 4) & 0xf) * 10) + (value & 0xf); + return value; +} diff --git a/cheevos/var.h b/cheevos/var.h index 416e2ae49e..ba85847e88 100644 --- a/cheevos/var.h +++ b/cheevos/var.h @@ -1,78 +1,78 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2015-2018 - Andre Leiradella - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __RARCH_CHEEVOS_VAR_H -#define __RARCH_CHEEVOS_VAR_H - -#include - -#include "cheevos.h" - -#include - -RETRO_BEGIN_DECLS - -typedef enum -{ - CHEEVOS_VAR_SIZE_BIT_0 = 0, - CHEEVOS_VAR_SIZE_BIT_1, - CHEEVOS_VAR_SIZE_BIT_2, - CHEEVOS_VAR_SIZE_BIT_3, - CHEEVOS_VAR_SIZE_BIT_4, - CHEEVOS_VAR_SIZE_BIT_5, - CHEEVOS_VAR_SIZE_BIT_6, - CHEEVOS_VAR_SIZE_BIT_7, - CHEEVOS_VAR_SIZE_NIBBLE_LOWER, - CHEEVOS_VAR_SIZE_NIBBLE_UPPER, - /* Byte, */ - CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */ - CHEEVOS_VAR_SIZE_SIXTEEN_BITS, - CHEEVOS_VAR_SIZE_THIRTYTWO_BITS -} cheevos_var_size_t; - -typedef enum -{ - /* compare to the value of a live address in RAM */ - CHEEVOS_VAR_TYPE_ADDRESS = 0, - - /* a number. assume 32 bit */ - CHEEVOS_VAR_TYPE_VALUE_COMP, - - /* the value last known at this address. */ - CHEEVOS_VAR_TYPE_DELTA_MEM, - - /* a custom user-set variable */ - CHEEVOS_VAR_TYPE_DYNAMIC_VAR -} cheevos_var_type_t; - -typedef struct -{ - cheevos_var_size_t size; - cheevos_var_type_t type; - int bank_id; - bool is_bcd; - unsigned value; - unsigned previous; -} cheevos_var_t; - -void cheevos_var_parse(cheevos_var_t* var, const char** memaddr); -void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console); - -uint8_t* cheevos_var_get_memory(const cheevos_var_t* var); -unsigned cheevos_var_get_value(cheevos_var_t* var); - -RETRO_END_DECLS - -#endif /* __RARCH_CHEEVOS_VAR_H */ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2015-2018 - Andre Leiradella + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __RARCH_CHEEVOS_VAR_H +#define __RARCH_CHEEVOS_VAR_H + +#include + +#include "cheevos.h" + +#include + +RETRO_BEGIN_DECLS + +typedef enum +{ + CHEEVOS_VAR_SIZE_BIT_0 = 0, + CHEEVOS_VAR_SIZE_BIT_1, + CHEEVOS_VAR_SIZE_BIT_2, + CHEEVOS_VAR_SIZE_BIT_3, + CHEEVOS_VAR_SIZE_BIT_4, + CHEEVOS_VAR_SIZE_BIT_5, + CHEEVOS_VAR_SIZE_BIT_6, + CHEEVOS_VAR_SIZE_BIT_7, + CHEEVOS_VAR_SIZE_NIBBLE_LOWER, + CHEEVOS_VAR_SIZE_NIBBLE_UPPER, + /* Byte, */ + CHEEVOS_VAR_SIZE_EIGHT_BITS, /* =Byte, */ + CHEEVOS_VAR_SIZE_SIXTEEN_BITS, + CHEEVOS_VAR_SIZE_THIRTYTWO_BITS +} cheevos_var_size_t; + +typedef enum +{ + /* compare to the value of a live address in RAM */ + CHEEVOS_VAR_TYPE_ADDRESS = 0, + + /* a number. assume 32 bit */ + CHEEVOS_VAR_TYPE_VALUE_COMP, + + /* the value last known at this address. */ + CHEEVOS_VAR_TYPE_DELTA_MEM, + + /* a custom user-set variable */ + CHEEVOS_VAR_TYPE_DYNAMIC_VAR +} cheevos_var_type_t; + +typedef struct +{ + cheevos_var_size_t size; + cheevos_var_type_t type; + int bank_id; + bool is_bcd; + unsigned value; + unsigned previous; +} cheevos_var_t; + +void cheevos_var_parse(cheevos_var_t* var, const char** memaddr); +void cheevos_var_patch_addr(cheevos_var_t* var, cheevos_console_t console); + +uint8_t* cheevos_var_get_memory(const cheevos_var_t* var); +unsigned cheevos_var_get_value(cheevos_var_t* var); + +RETRO_END_DECLS + +#endif /* __RARCH_CHEEVOS_VAR_H */ diff --git a/config.def.h b/config.def.h index ce2f85c97b..f56066cf60 100644 --- a/config.def.h +++ b/config.def.h @@ -68,8 +68,8 @@ static bool bundle_assets_extract_enable = false; static bool materialui_icons_enable = true; #endif -static const unsigned crt_switch_resolution = CRT_SWITCH_NONE; -static const int crt_switch_resolution_super = 2560; +static const unsigned crt_switch_resolution = CRT_SWITCH_NONE; +static const int crt_switch_resolution_super = 2560; static const int crt_switch_center_adjust = 0; static const bool def_history_list_enable = true; diff --git a/configuration.c b/configuration.c index 0cc7860cd2..57b6f5c2c1 100644 --- a/configuration.c +++ b/configuration.c @@ -574,7 +574,7 @@ static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_RGUI; static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI; #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE) static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI; -#elif defined(HAVE_OZONE) && (defined(HAVE_LIBNX) || TARGET_OS_TV) +#elif defined(HAVE_OZONE) && (defined(HAVE_LIBNX) || TARGET_OS_TV) static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE; #elif defined(HAVE_XMB) && !defined(_XBOX) static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB; @@ -2490,7 +2490,7 @@ static bool check_menu_driver_compatibility(void) string_is_equal(video_driver, "metal") || string_is_equal(video_driver, "ctr") || string_is_equal(video_driver, "vita2d")) - return true; + return true; return false; } diff --git a/cores/libretro-ffmpeg/Makefile b/cores/libretro-ffmpeg/Makefile index a998c64971..640bd4974d 100644 --- a/cores/libretro-ffmpeg/Makefile +++ b/cores/libretro-ffmpeg/Makefile @@ -12,7 +12,7 @@ INTERNAL_LIBLAME = 0 INTERNAL_LIBFAAC = 0 INTERNAL_LIBSPEEX = 0 INTERNAL_LIBTHEORA = 0 -INTERNAL_LIBOPUS = 0 +INTERNAL_LIBOPUS = 0 INTERNAL_LIBVORBIS = 0 INTERNAL_WEBP = 0 INTERNAL_ZLIB = 0 diff --git a/cores/libretro-ffmpeg/Makefile.common b/cores/libretro-ffmpeg/Makefile.common index 15b62b40e2..f9e1015ac3 100644 --- a/cores/libretro-ffmpeg/Makefile.common +++ b/cores/libretro-ffmpeg/Makefile.common @@ -3,7 +3,7 @@ LIBAVFORMAT_SOURCE := LIBAVUTIL_SOURCE := DEPS_SOURCE := DEFINES := -DHAVE_SWRESAMPLE -LIBRETRO_SOURCE := +LIBRETRO_SOURCE := GL_SOURCE := CPUOPTS := diff --git a/cores/libretro-ffmpeg/Makefile.ffmpeg b/cores/libretro-ffmpeg/Makefile.ffmpeg index c319cb8d26..ca1eea19fd 100644 --- a/cores/libretro-ffmpeg/Makefile.ffmpeg +++ b/cores/libretro-ffmpeg/Makefile.ffmpeg @@ -368,7 +368,7 @@ endif ifeq ($(HAVE_NVENC),1) DEFINES += -DCONFIG_NVENC_ENCODER=1 \ -DCONFIG_NVENC_H264_ENCODER=1 \ - -DCONFIG_NVENC_HEVC_ENCODER=1 + -DCONFIG_NVENC_HEVC_ENCODER=1 else DEFINES += -DCONFIG_NVENC_ENCODER=0 \ -DCONFIG_NVENC_H264_ENCODER=0 \ @@ -424,7 +424,7 @@ endif ifeq ($(HAVE_ZLIB),1) DEFINES += -DCONFIG_ZLIB=1 else -DEFINES += -DCONFIG_ZLIB=0 +DEFINES += -DCONFIG_ZLIB=0 endif ifeq ($(HAVE_LIBDCADEC),1) @@ -1205,7 +1205,7 @@ DEFINES += \ -DCONFIG_LIBZVBI_TELETEXT_DECODER=0 \ -DCONFIG_BINTEXT_DECODER=1 \ -DCONFIG_XBIN_DECODER=1 \ - -DCONFIG_IDF_DECODER=1 + -DCONFIG_IDF_DECODER=1 ifeq ($(HAVE_ZLIB),1) DEFINES += -DCONFIG_ZLIB_DECODER=1 @@ -1644,7 +1644,7 @@ ifeq ($(INTERNAL_LIBAVUTIL),1) AVCODEC_BLACKLIST += $(AVCODEC_DIR)/file_open.c endif -#Codec HW Acceleration flags - all disabled for now - not sure if +#Codec HW Acceleration flags - all disabled for now - not sure if # libretro will ever support this ifeq ($(HAVE_MMAL),1) diff --git a/cores/libretro-gong/gong.c b/cores/libretro-gong/gong.c index 8c354e460e..4eced0653e 100644 --- a/cores/libretro-gong/gong.c +++ b/cores/libretro-gong/gong.c @@ -460,7 +460,7 @@ static void draw_number(Game_Offscreen_Buffer *buffer, unsigned number, unsigned draw_rect(buffer, color, at_x + 2.f, y, .5f, 4.5f); break; } - + case 2: { draw_rect(buffer, color, at_x - 2.f, y - 2.f, .5f, 2.f); @@ -470,7 +470,7 @@ static void draw_number(Game_Offscreen_Buffer *buffer, unsigned number, unsigned draw_rect(buffer, color, at_x, y - 4.f, 2.5f, .5f); break; } - + case 3: { draw_rect(buffer, color, at_x + 2.f, y, .5f, 4.f); @@ -565,7 +565,7 @@ static void game_update_and_render(Game_Input *input, Game_Offscreen_Buffer *dra { float speed = 80.f; player1_dpy = 0.f; - + if (is_down(input->buttons[B_SPEED_UP])) speed = 150.f; diff --git a/cores/libretro-imageviewer/image_core.c b/cores/libretro-imageviewer/image_core.c index 3150b13b81..aa3824f602 100644 --- a/cores/libretro-imageviewer/image_core.c +++ b/cores/libretro-imageviewer/image_core.c @@ -166,7 +166,7 @@ void IMAGE_CORE_PREFIX(retro_set_environment)(retro_environment_t cb) IMAGE_CORE_PREFIX(environ_cb) = cb; cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars); - + #ifndef RARCH_INTERNAL /* I don't trust filestream_vfs_init to work inside rarch */ if (environ_cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_iface_info)) @@ -254,7 +254,7 @@ static bool imageviewer_load(const char *path, int image_index) buf = malloc(len); filestream_read(f, buf, len); filestream_close(f); - + image_buffer = (uint32_t*)stbi_load_from_memory( buf, len, &image_width, &image_height, diff --git a/cores/libretro-net-retropad/jni/Android.mk b/cores/libretro-net-retropad/jni/Android.mk index 5131c65220..34cc6dd2cf 100644 --- a/cores/libretro-net-retropad/jni/Android.mk +++ b/cores/libretro-net-retropad/jni/Android.mk @@ -21,5 +21,4 @@ endif LOCAL_SRC_FILES += ../libretro-test.c LOCAL_CFLAGS += -O3 -std=gnu99 -ffast-math -funroll-loops - include $(BUILD_SHARED_LIBRARY) diff --git a/cores/libretro-video-processor/Makefile b/cores/libretro-video-processor/Makefile index a5973a36b2..8a25646232 100644 --- a/cores/libretro-video-processor/Makefile +++ b/cores/libretro-video-processor/Makefile @@ -33,7 +33,7 @@ TARGET_NAME := video_processor LIBV4L2 = -lv4l2 ifneq ($(findstring Linux,$(shell uname -a)),) - CFLAGS += -DHAVE_UDEV + CFLAGS += -DHAVE_UDEV LIBUDEV = -ludev CFLAGS += -DHAVE_ALSA LIBASOUND = -lasound diff --git a/cores/libretro-video-processor/README.md b/cores/libretro-video-processor/README.md index 2972a3c5c6..4f9a759d2a 100644 --- a/cores/libretro-video-processor/README.md +++ b/cores/libretro-video-processor/README.md @@ -3,7 +3,6 @@ Libretro core for V4L2 capture devices The basic idea is this -- plug your legacy console into a capture device and use RetroArch to upscale it and apply shaders to taste. - ## Raspberry Pi specific config Add to /boot/config.txt: diff --git a/cores/libretro-video-processor/video_processor_v4l2.c b/cores/libretro-video-processor/video_processor_v4l2.c index 1d9012c11c..f92328202e 100644 --- a/cores/libretro-video-processor/video_processor_v4l2.c +++ b/cores/libretro-video-processor/video_processor_v4l2.c @@ -535,7 +535,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_get_system_av_info)(struct retro_syst printf("Aspect ratio: %f\n",info->geometry.aspect_ratio); printf("Buffer Resolution %ux%u %f fps\n", info->geometry.base_width, info->geometry.base_height, info->timing.fps); - printf("Buffer Max Resolution %ux%u\n", info->geometry.max_width, + printf("Buffer Max Resolution %ux%u\n", info->geometry.max_width, info->geometry.max_height); } @@ -552,7 +552,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_reset)(void) //TODO improve this mess and make it generic enough for use with dummy mode void v4l2_frame_times(struct v4l2_buffer buf) { if (strcmp("Off", video_frame_times) == 0) - return; + return; if (ft_info == NULL) ft_info = calloc(5000, sizeof(char)); @@ -626,15 +626,15 @@ void source_dummy(int width, int height) { } } - if(video_buf.field == V4L2_FIELD_TOP) + if(video_buf.field == V4L2_FIELD_TOP) video_buf.field = V4L2_FIELD_BOTTOM; - else if (video_buf.field == V4L2_FIELD_BOTTOM) + else if (video_buf.field == V4L2_FIELD_BOTTOM) video_buf.field = V4L2_FIELD_TOP; } void source_v4l2_normal(int width, int height) { struct v4l2_buffer bufcp; - + int error; // Wait until v4l2 dequees a buffer @@ -651,7 +651,7 @@ void source_v4l2_normal(int width, int height) { bufcp = video_buf; memcpy( (uint32_t*) frame_cap, (uint8_t*) v4l2_capbuf[video_buf.index].start, video_format.fmt.pix.width * video_format.fmt.pix.height * 3); - + error = v4l2_ioctl(video_device_fd, VIDIOC_QBUF, &video_buf); if (error != 0) printf("VIDIOC_QBUF failed: %s\n", strerror(errno)); @@ -664,7 +664,7 @@ void source_v4l2_alternate_hack(int width, int height) { struct v4l2_format fmt; struct v4l2_requestbuffers reqbufs; enum v4l2_buf_type type; - + int error; uint32_t index; @@ -844,7 +844,7 @@ void processing_deinterlacing_crap(uint32_t *src, uint32_t *dst, int width, int // Skips a scanline if we reach the end of the current one //On progressive sources, should only skip the destination lines, - //On interlaced sources, should skip both the source and the destination lines + //On interlaced sources, should skip both the source and the destination lines if ( ((i+1) % width) == 0 ) { dst += width; if (skip_lines_src == 1) { @@ -888,7 +888,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void) (outputmode.value && (strcmp(video_output_mode, outputmode.value) != 0))) { VIDEOPROC_CORE_PREFIX(retro_unload_game)(); // This core does not cares for the retro_game_info * argument? - VIDEOPROC_CORE_PREFIX(retro_load_game)(NULL); + VIDEOPROC_CORE_PREFIX(retro_load_game)(NULL); } if (frametimes.value != NULL) { @@ -915,7 +915,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void) } } - if (video_buf.field == V4L2_FIELD_INTERLACED) + if (video_buf.field == V4L2_FIELD_INTERLACED) video_half_feed_rate = 1; } else { video_half_feed_rate = 0; @@ -927,7 +927,7 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void) if (strcmp(video_output_mode, "deinterlaced") == 0) { processing_bgr_xrgb(frame_cap, frame_curr, video_cap_width, video_cap_height); // When deinterlacing a interlaced intput, we need to process both fields of a frame, - //one at a time (retro_run needs to be called twice, vide_half_feed_rate prevents the + //one at a time (retro_run needs to be called twice, vide_half_feed_rate prevents the //source from being read twice... if (strcmp(video_capture_mode, "interlaced") == 0) { enum v4l2_field field_read; @@ -1106,7 +1106,7 @@ RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_in fmt.fmt.pix.height = 240; fmt.fmt.pix.field = V4L2_FIELD_TOP; - + //TODO Query the size and FPS if (strcmp(video_capture_mode, "interlaced") == 0) { v4l2_ncapbuf_target = 2; @@ -1244,7 +1244,7 @@ RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_in } // Each frame has one field, full frame-rate } else if (strcmp(video_output_mode, "progressive") == 0) { - video_out_height = video_cap_height; + video_out_height = video_cap_height; // Each frame has one or both field to be deinterlaced into a full frame (double the lines if one field), full frame-rate } else if (strcmp(video_output_mode, "deinterlaced") == 0) { if (strcmp(video_capture_mode, "interlaced") == 0) @@ -1252,7 +1252,7 @@ RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_in else video_out_height = video_cap_height*2; } else - video_out_height = video_cap_height; + video_out_height = video_cap_height; printf("Capture Resolution %ux%u\n", video_cap_width, video_cap_height); printf("Output Resolution %ux%u\n", video_cap_width, video_out_height); diff --git a/ctr/exec-3dsx/exec_3dsx.c b/ctr/exec-3dsx/exec_3dsx.c index cdc95852b2..09f3aa52a5 100644 --- a/ctr/exec-3dsx/exec_3dsx.c +++ b/ctr/exec-3dsx/exec_3dsx.c @@ -12,18 +12,18 @@ extern const loaderFuncs_s loader_Rosalina; static void (*launch_3dsx)(const char* path, argData_s* args, executableMetadata_s* em); static int exec_3dsx_actual(const char* path, const char** args, bool appendPath){ - struct stat sBuff; + struct stat sBuff; argData_s newProgramArgs; unsigned int argChars = 0; unsigned int argNum = 0; bool fileExists; bool inited; - + if(path == NULL || path[0] == '\0'){ errno = EINVAL; return -1; } - + fileExists = stat(path, &sBuff) == 0; if(!fileExists){ errno = ENOENT; @@ -41,7 +41,7 @@ static int exec_3dsx_actual(const char* path, const char** args, bool appendPath strcpy(newProgramArgs.dst, path); newProgramArgs.dst += strlen(path) + 1; newProgramArgs.buf[0]++; - + } while(args[argNum] != NULL){ strcpy(newProgramArgs.dst, args[argNum]); @@ -49,10 +49,10 @@ static int exec_3dsx_actual(const char* path, const char** args, bool appendPath newProgramArgs.buf[0]++; argNum++; } - + inited = loader_Rosalina.init(); launch_3dsx = loader_Rosalina.launchFile; - + if(!inited){ inited = loader_Ninjhax2.init(); launch_3dsx = loader_Ninjhax2.launchFile; @@ -62,13 +62,13 @@ static int exec_3dsx_actual(const char* path, const char** args, bool appendPath inited = loader_Ninjhax1.init(); launch_3dsx = loader_Ninjhax1.launchFile; } - + if(inited){ osSetSpeedupEnable(false); launch_3dsx(path, &newProgramArgs, NULL); exit(0); } - + //should never be reached errno = ENOTSUP; return -1; diff --git a/ctr/exec-3dsx/exec_3dsx.h b/ctr/exec-3dsx/exec_3dsx.h index d260331cb0..c4a90a081c 100644 --- a/ctr/exec-3dsx/exec_3dsx.h +++ b/ctr/exec-3dsx/exec_3dsx.h @@ -1,9 +1,9 @@ -#ifndef EXEC_3DSX_H -#define EXEC_3DSX_H - -//since 3dsx programs are not guaranteed access to the OS, the 3dsx bootloader run by the exploit must run the next program -//your program must have no extra threads running when this is called, these limits do not apply to exec_cia -int exec_3dsx_no_path_in_args(const char* path, const char** args); -int exec_3dsx(const char* path, const char** args); - +#ifndef EXEC_3DSX_H +#define EXEC_3DSX_H + +//since 3dsx programs are not guaranteed access to the OS, the 3dsx bootloader run by the exploit must run the next program +//your program must have no extra threads running when this is called, these limits do not apply to exec_cia +int exec_3dsx_no_path_in_args(const char* path, const char** args); +int exec_3dsx(const char* path, const char** args); + #endif \ No newline at end of file diff --git a/ctr/exec-3dsx/exec_cia.c b/ctr/exec-3dsx/exec_cia.c index 79c7a537a5..4f3018d5e1 100644 --- a/ctr/exec-3dsx/exec_cia.c +++ b/ctr/exec-3dsx/exec_cia.c @@ -13,7 +13,6 @@ typedef struct{ char argvHmac[0x20] = {0x1d, 0x78, 0xff, 0xb9, 0xc5, 0xbc, 0x78, 0xb7, 0xac, 0x29, 0x1d, 0x3e, 0x16, 0xd0, 0xcf, 0x53, 0xef, 0x12, 0x58, 0x83, 0xb6, 0x9e, 0x2f, 0x79, 0x47, 0xf9, 0x35, 0x61, 0xeb, 0x50, 0xd7, 0x67}; - static void errorAndQuit(const char* errorStr){ errorConf error; @@ -30,37 +29,37 @@ static int isCiaInstalled(u64 titleId, u16 version){ bool titleExists = false; AM_TitleEntry titleInfo; Result failed; - + failed = AM_GetTitleCount(MEDIATYPE_SD, &titlesToRetrieve); if(R_FAILED(failed)) return -1; - + titleIds = malloc(titlesToRetrieve * sizeof(uint64_t)); if(titleIds == NULL) return -1; - + failed = AM_GetTitleList(&titlesRetrieved, MEDIATYPE_SD, titlesToRetrieve, titleIds); if(R_FAILED(failed)) return -1; - + for(u32 titlesToCheck = 0; titlesToCheck < titlesRetrieved; titlesToCheck++){ if(titleIds[titlesToCheck] == titleId){ titleExists = true; break; - } + } } - + free(titleIds); - + if(titleExists){ failed = AM_GetTitleInfo(MEDIATYPE_SD, 1 /*titleCount*/, &titleId, &titleInfo); if(R_FAILED(failed)) return -1; - + if(titleInfo.version == version) return 1; } - + return 0; } @@ -72,15 +71,15 @@ static int installCia(Handle ciaFile){ u32 bytesRead; u32 bytesWritten; u8 transferBuffer[FILE_CHUNK_SIZE]; - + failed = AM_StartCiaInstall(MEDIATYPE_SD, &outputHandle); if(R_FAILED(failed)) return -1; - + failed = FSFILE_GetSize(ciaFile, &fileSize); if(R_FAILED(failed)) return -1; - + while(fileOffset < fileSize){ u64 bytesRemaining = fileSize - fileOffset; failed = FSFILE_Read(ciaFile, &bytesRead, fileOffset, transferBuffer, bytesRemaining < FILE_CHUNK_SIZE ? bytesRemaining : FILE_CHUNK_SIZE); @@ -88,7 +87,7 @@ static int installCia(Handle ciaFile){ AM_CancelCIAInstall(outputHandle); return -1; } - + failed = FSFILE_Write(outputHandle, &bytesWritten, fileOffset, transferBuffer, bytesRead, 0); if(R_FAILED(failed)){ AM_CancelCIAInstall(outputHandle); @@ -96,32 +95,32 @@ static int installCia(Handle ciaFile){ return 1; return -1; } - + if(bytesWritten != bytesRead){ AM_CancelCIAInstall(outputHandle); return -1; } - + fileOffset += bytesWritten; } - + failed = AM_FinishCiaInstall(outputHandle); if(R_FAILED(failed)) return -1; - + return 1; } int exec_cia(const char* path, const char** args){ - struct stat sBuff; + struct stat sBuff; bool fileExists; bool inited; - + if(path == NULL || path[0] == '\0'){ errno = EINVAL; return -1; } - + fileExists = stat(path, &sBuff) == 0; if(!fileExists){ errno = ENOENT; @@ -131,7 +130,7 @@ int exec_cia(const char* path, const char** args){ errno = EINVAL;; return -1; } - + inited = R_SUCCEEDED(amInit()) && R_SUCCEEDED(fsInit()); if(inited){ Result res; @@ -141,20 +140,20 @@ int exec_cia(const char* path, const char** args){ int ciaInstalled; ciaParam param; int argsLength; - + //open cia file res = FSUSER_OpenArchive(&ciaArchive, ARCHIVE_SDMC, fsMakePath(PATH_EMPTY, "")); if(R_FAILED(res)) errorAndQuit("Cant open SD FS archive."); - + res = FSUSER_OpenFile(&ciaFile, ciaArchive, fsMakePath(PATH_ASCII, path + 5/*skip "sdmc:"*/), FS_OPEN_READ, 0); if(R_FAILED(res)) errorAndQuit("Cant open CIA file."); - + res = AM_GetCiaFileInfo(MEDIATYPE_SD, &ciaInfo, ciaFile); if(R_FAILED(res)) errorAndQuit("Cant get CIA file info."); - + ciaInstalled = isCiaInstalled(ciaInfo.titleID, ciaInfo.version); if(ciaInstalled == -1){ //error @@ -166,10 +165,10 @@ int exec_cia(const char* path, const char** args){ if(error == -1) errorAndQuit("Cant install CIA."); } - + FSFILE_Close(ciaFile); FSUSER_CloseArchive(ciaArchive); - + param.argc = 0; argsLength = 0; char* argLocation = param.args; @@ -179,19 +178,19 @@ int exec_cia(const char* path, const char** args){ argsLength += strlen(args[param.argc]) + 1; param.argc++; } - + res = APT_PrepareToDoApplicationJump(0, ciaInfo.titleID, 0x1); if(R_FAILED(res)) errorAndQuit("CIA cant run, cant prepare."); - + res = APT_DoApplicationJump(¶m, sizeof(param.argc) + argsLength, argvHmac); if(R_FAILED(res)) errorAndQuit("CIA cant run, cant jump."); - + //wait for application jump, for some reason its not instant while(1); } - + //should never be reached amExit(); fsExit(); diff --git a/ctr/exec-3dsx/exec_cia.h b/ctr/exec-3dsx/exec_cia.h index 4c751de922..3de723b74d 100644 --- a/ctr/exec-3dsx/exec_cia.h +++ b/ctr/exec-3dsx/exec_cia.h @@ -1,6 +1,6 @@ -#ifndef EXEC_CIA_H -#define EXEC_CIA_H - -int exec_cia(const char* path, const char** args); - +#ifndef EXEC_CIA_H +#define EXEC_CIA_H + +int exec_cia(const char* path, const char** args); + #endif \ No newline at end of file diff --git a/ctr/exec-3dsx/mini-hb-menu/common.h b/ctr/exec-3dsx/mini-hb-menu/common.h index ef354d46d2..79df8874f9 100644 --- a/ctr/exec-3dsx/mini-hb-menu/common.h +++ b/ctr/exec-3dsx/mini-hb-menu/common.h @@ -1,95 +1,92 @@ -#pragma once - -// C stdlib includes -#include -#include -#include -#include -#include -#include -#include -#include - -// 3DS includes -#include <3ds.h> - - -#define ENTRY_ARGBUFSIZE 0x400 -#define NUM_SERVICESTHATMATTER 5 - -typedef enum -{ - StrId_Loading = 0, - StrId_Directory, - StrId_DefaultLongTitle, - StrId_DefaultPublisher, - StrId_IOError, - StrId_CouldNotOpenFile, - - StrId_NoAppsFound_Title, - StrId_NoAppsFound_Msg, - - StrId_Reboot, - StrId_ReturnToHome, - - StrId_TitleSelector, - StrId_ErrorReadingTitleMetadata, - StrId_NoTitlesFound, - StrId_SelectTitle, - - StrId_NoTargetTitleSupport, - StrId_MissingTargetTitle, - - StrId_NetLoader, - StrId_NetLoaderUnavailable, - StrId_NetLoaderOffline, - StrId_NetLoaderError, - StrId_NetLoaderActive, - StrId_NetLoaderTransferring, - - StrId_Max, -} StrId; - - -typedef struct -{ - char* dst; - u32 buf[ENTRY_ARGBUFSIZE/sizeof(u32)]; -} argData_s; - -typedef struct -{ - bool scanned; - u32 sectionSizes[3]; - bool servicesThatMatter[NUM_SERVICESTHATMATTER]; -} executableMetadata_s; - -typedef struct -{ - u32 num; - u32 text_end; - u32 data_address; - u32 data_size; - u32 processLinearOffset; - u32 processHookAddress; - u32 processAppCodeAddress; - u32 processHookTidLow, processHookTidHigh; - u32 mediatype; - bool capabilities[0x10]; // {socuAccess, csndAccess, qtmAccess, nfcAccess, httpcAccess, reserved...} -} memmap_header_t; - -typedef struct -{ - u32 src, dst, size; -} memmap_entry_t; - -typedef struct -{ - memmap_header_t header; - memmap_entry_t map[]; -} memmap_t; - -#define memmapSize(m) (sizeof(memmap_header_t) + sizeof(memmap_entry_t)*(m)->header.num) - - -#include "launch.h" +#pragma once + +// C stdlib includes +#include +#include +#include +#include +#include +#include +#include +#include + +// 3DS includes +#include <3ds.h> + +#define ENTRY_ARGBUFSIZE 0x400 +#define NUM_SERVICESTHATMATTER 5 + +typedef enum +{ + StrId_Loading = 0, + StrId_Directory, + StrId_DefaultLongTitle, + StrId_DefaultPublisher, + StrId_IOError, + StrId_CouldNotOpenFile, + + StrId_NoAppsFound_Title, + StrId_NoAppsFound_Msg, + + StrId_Reboot, + StrId_ReturnToHome, + + StrId_TitleSelector, + StrId_ErrorReadingTitleMetadata, + StrId_NoTitlesFound, + StrId_SelectTitle, + + StrId_NoTargetTitleSupport, + StrId_MissingTargetTitle, + + StrId_NetLoader, + StrId_NetLoaderUnavailable, + StrId_NetLoaderOffline, + StrId_NetLoaderError, + StrId_NetLoaderActive, + StrId_NetLoaderTransferring, + + StrId_Max, +} StrId; + +typedef struct +{ + char* dst; + u32 buf[ENTRY_ARGBUFSIZE/sizeof(u32)]; +} argData_s; + +typedef struct +{ + bool scanned; + u32 sectionSizes[3]; + bool servicesThatMatter[NUM_SERVICESTHATMATTER]; +} executableMetadata_s; + +typedef struct +{ + u32 num; + u32 text_end; + u32 data_address; + u32 data_size; + u32 processLinearOffset; + u32 processHookAddress; + u32 processAppCodeAddress; + u32 processHookTidLow, processHookTidHigh; + u32 mediatype; + bool capabilities[0x10]; // {socuAccess, csndAccess, qtmAccess, nfcAccess, httpcAccess, reserved...} +} memmap_header_t; + +typedef struct +{ + u32 src, dst, size; +} memmap_entry_t; + +typedef struct +{ + memmap_header_t header; + memmap_entry_t map[]; +} memmap_t; + +#define memmapSize(m) (sizeof(memmap_header_t) + sizeof(memmap_entry_t)*(m)->header.num) + +#include "launch.h" diff --git a/discord/discord.c b/discord/discord.c index c3add31817..d47d33924f 100644 --- a/discord/discord.c +++ b/discord/discord.c @@ -327,7 +327,7 @@ void discord_update(enum discord_presence presence) case DISCORD_PRESENCE_GAME: if (core_info) { - const char *system_id = core_info->system_id + const char *system_id = core_info->system_id ? core_info->system_id : "core"; char *label = NULL; playlist_t *current_playlist = playlist_get_cached(); diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh index 46bda5e8d8..c2fd89ba4c 100755 --- a/dist-scripts/dist-cores.sh +++ b/dist-scripts/dist-cores.sh @@ -125,7 +125,6 @@ if [ $SALAMANDER = "yes" ]; then make -C ../ -f Makefile.${platform}.salamander clean || exit 1 fi - # Cleanup existing core if it exists if [ $PLATFORM = "ode-ps3" ]; then make -C ../ -f Makefile.${platform}.cobra clean || exit 1 diff --git a/dist-scripts/wiiu-cores.sh b/dist-scripts/wiiu-cores.sh index 8d597243fe..be2d06ee07 100755 --- a/dist-scripts/wiiu-cores.sh +++ b/dist-scripts/wiiu-cores.sh @@ -28,7 +28,6 @@ rm -f ../retroarch_wiiu_salamander.rpx.elf cp -f ../pkg/wiiu/meta.xml ../pkg/wiiu/rpx/wiiu/apps/retroarch/meta.xml cp -f ../pkg/wiiu/icon.png ../pkg/wiiu/rpx/wiiu/apps/retroarch/icon.png - make -C ../ -f Makefile.${platform} clean || exit 1 lookup() diff --git a/dist-scripts/wiiu-rpx-upload.sh b/dist-scripts/wiiu-rpx-upload.sh index aacaabb797..d27821ddf1 100755 --- a/dist-scripts/wiiu-rpx-upload.sh +++ b/dist-scripts/wiiu-rpx-upload.sh @@ -37,7 +37,7 @@ fi filesToUpload() { - find . -type f \( -name "*.rpx" -o -name "*.xml" -o -name "*.png" -o -name "*.info" \) + find . -type f \( -name "*.rpx" -o -name "*.xml" -o -name "*.png" -o -name "*.info" \) } cd ../pkg/wiiu/rpx diff --git a/dist-scripts/xdk1_env.bat b/dist-scripts/xdk1_env.bat index 4a0e7f69d1..0d7bfd8fdb 100644 --- a/dist-scripts/xdk1_env.bat +++ b/dist-scripts/xdk1_env.bat @@ -34,7 +34,7 @@ :Usage -@echo. VSINSTALLDIR variable is not set. +@echo. VSINSTALLDIR variable is not set. @echo. @echo SYNTAX: %0 diff --git a/dist-scripts/xdk1_env_bigstack.bat b/dist-scripts/xdk1_env_bigstack.bat index 3b0f6b7a5e..d110a8d097 100644 --- a/dist-scripts/xdk1_env_bigstack.bat +++ b/dist-scripts/xdk1_env_bigstack.bat @@ -34,7 +34,7 @@ :Usage -@echo. VSINSTALLDIR variable is not set. +@echo. VSINSTALLDIR variable is not set. @echo. @echo SYNTAX: %0 diff --git a/driver.c b/driver.c index f788e59882..7614fb7e8e 100644 --- a/driver.c +++ b/driver.c @@ -311,7 +311,7 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info command_event(CMD_EVENT_RECORD_INIT, NULL); } - /* Hide mouse cursor in fullscreen after + /* Hide mouse cursor in fullscreen after * a RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO call. */ if (settings->bools.video_fullscreen) video_driver_hide_mouse(); @@ -459,7 +459,7 @@ void driver_uninit(int flags) if (flags & DRIVER_LED) led_driver_free(); - + if (flags & DRIVERS_VIDEO_INPUT) video_driver_free(); @@ -471,7 +471,7 @@ void driver_uninit(int flags) if ((flags & DRIVER_INPUT_MASK) && !input_driver_owns_driver()) input_driver_destroy_data(); - + if ((flags & DRIVER_AUDIO_MASK) && !audio_driver_owns_driver()) audio_driver_destroy_data(); diff --git a/dynamic.c b/dynamic.c index 0408423602..8c2b61f14e 100644 --- a/dynamic.c +++ b/dynamic.c @@ -466,13 +466,13 @@ bool libretro_get_system_info(const char *path, current_valid_extensions[0] = '\0'; if (!string_is_empty(dummy_info.library_name)) - strlcpy(current_library_name, + strlcpy(current_library_name, dummy_info.library_name, sizeof(current_library_name)); if (!string_is_empty(dummy_info.library_version)) - strlcpy(current_library_version, + strlcpy(current_library_version, dummy_info.library_version, sizeof(current_library_version)); if (dummy_info.valid_extensions) - strlcpy(current_valid_extensions, + strlcpy(current_valid_extensions, dummy_info.valid_extensions, sizeof(current_valid_extensions)); info->library_name = current_library_name; @@ -517,8 +517,8 @@ bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *cu #ifdef HAVE_RUNAHEAD else { - /* for a secondary core, we already have a - * primary library loaded, so we can skip + /* for a secondary core, we already have a + * primary library loaded, so we can skip * some checks and just load the library */ retro_assert(lib_path != NULL && lib_handle_p != NULL); lib_handle_local = dylib_load(lib_path); @@ -847,7 +847,7 @@ bool init_libretro_sym(enum rarch_core_type type, struct retro_core_t *current_c return false; #ifdef HAVE_RUNAHEAD - /* remember last core type created, so creating a + /* remember last core type created, so creating a * secondary core will know what core type to use. */ set_last_core_type(type); #endif @@ -1923,7 +1923,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) core_set_shared_context = true; break; } - + case RETRO_ENVIRONMENT_GET_VFS_INTERFACE: { const uint32_t supported_vfs_version = 3; @@ -2034,7 +2034,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) *(retro_environment_t *)data = rarch_clear_all_thread_waits; break; } - + default: RARCH_LOG("Environ UNSUPPORTED (#%u).\n", cmd); return false; diff --git a/emscripten/library_rwebcam.js b/emscripten/library_rwebcam.js index 5bde1b25d0..5c0bec5dc3 100644 --- a/emscripten/library_rwebcam.js +++ b/emscripten/library_rwebcam.js @@ -108,7 +108,7 @@ var LibraryRWebCam = { if (!RWC.ready(data)) return 0; var ret = 0; - if (RWC.contexts[data].glTexId !== 0 && frame_gl_cb !== 0) { + if (RWC.contexts[data].glTexId !== 0 && frame_gl_cb !== 0) { _glGetIntegerv(0x8069 /* GL_TEXTURE_BINDING_2D */, RWC.tmp); var prev = {{{ makeGetValue('RWC.tmp', '0', 'i32') }}}; _glBindTexture(0x0DE1 /* GL_TEXTURE_2D */, RWC.contexts[data].glTexId); diff --git a/fetch-submodules.sh b/fetch-submodules.sh index 7515dbbf32..c2569c994e 100755 --- a/fetch-submodules.sh +++ b/fetch-submodules.sh @@ -56,7 +56,6 @@ fetch_revision_git() { git log -n 1 --pretty=format:%H } - # fetch_revision: Output SCM-dependent revision string of a module # (currently just calls fetch_revision_git) # @@ -65,10 +64,8 @@ fetch_revision() { fetch_revision_git $1 } - ### END OF FETCH-RULES.SH - echo "Fetching RetroArch's submodules..." fetch_git "https://github.com/libretro/common-shaders.git" "media/shaders_cg" fetch_git "https://github.com/libretro/common-overlays.git" "media/overlays" diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 58fb331736..0fecca5768 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -1,607 +1,606 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2014-2017 - Ali Bouhlel - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include <3ds.h> -#include <3ds/svc.h> -#include <3ds/os.h> -#include <3ds/services/cfgu.h> -#include <3ds/services/ptmu.h> -#include <3ds/services/mcuhwc.h> - -#include - -#ifdef HAVE_CONFIG_H -#include "../../config.h" -#endif - -#ifndef IS_SALAMANDER -#include -#endif - -#include "../frontend_driver.h" -#include "../../verbosity.h" -#include "../../defaults.h" -#include "../../paths.h" -#include "retroarch.h" -#include "file_path_special.h" -#include "audio/audio_driver.h" - -#include "ctr/ctr_debug.h" -#include "ctr/exec-3dsx/exec_3dsx.h" -#include "ctr/exec-3dsx/exec_cia.h" - -#ifndef IS_SALAMANDER -#ifdef HAVE_MENU -#include "../../menu/menu_driver.h" -#endif -#endif - -static enum frontend_fork ctr_fork_mode = FRONTEND_FORK_NONE; -static const char* elf_path_cst = "sdmc:/retroarch/retroarch.3dsx"; - -static void get_first_valid_core(char* path_return) -{ - DIR* dir; - struct dirent* ent; - const char* extension = envIsHomebrew() ? ".3dsx" : ".cia"; - - path_return[0] = '\0'; - - dir = opendir("sdmc:/retroarch/cores"); - if (dir != NULL) - { - while (ent = readdir(dir)) - { - if (ent == NULL) - break; - if (strlen(ent->d_name) > strlen(extension) && !strcmp(ent->d_name + strlen(ent->d_name) - strlen(extension), extension)) - { - strcpy(path_return, "sdmc:/retroarch/cores"); - strcat(path_return, "/"); - strcat(path_return, ent->d_name); - break; - } - } - closedir(dir); - } -} - -static void frontend_ctr_get_environment_settings(int* argc, char* argv[], - void* args, void* params_data) -{ - (void)args; - -#ifndef IS_SALAMANDER -#if defined(HAVE_LOGGER) - logger_init(); -#elif defined(HAVE_FILE_LOGGER) - retro_main_log_file_init("sdmc:/retroarch/retroarch-log.txt"); -#endif -#endif - - fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], elf_path_cst, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT])); - RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]); - - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT], - "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT], - "media", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT], - "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_CORE], - "info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], g_defaults.dirs[DEFAULT_DIR_CORE], - "savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], g_defaults.dirs[DEFAULT_DIR_CORE], - "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], g_defaults.dirs[DEFAULT_DIR_CORE], - "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], g_defaults.dirs[DEFAULT_DIR_CORE], - "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], g_defaults.dirs[DEFAULT_DIR_PORT], - "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_PORT], - "config/remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], g_defaults.dirs[DEFAULT_DIR_PORT], - "filters", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT], - "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT], - "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR])); - fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT], - file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config)); -} - -static void frontend_ctr_deinit(void* data) -{ - Handle lcd_handle; - u32 parallax_layer_reg_state; - u8 not_2DS; - - extern PrintConsole* currentConsole; - - (void)data; - -#ifndef IS_SALAMANDER - verbosity_enable(); - -#ifdef HAVE_FILE_LOGGER - command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL); -#endif - - if ((gfxBottomFramebuffers[0] == (u8*)currentConsole->frameBuffer) - && (ctr_fork_mode == FRONTEND_FORK_NONE)) - wait_for_input(); - - CFGU_GetModelNintendo2DS(¬_2DS); - - if (not_2DS && srvGetServiceHandle(&lcd_handle, "gsp::Lcd") >= 0) - { - u32* cmdbuf = getThreadCommandBuffer(); - cmdbuf[0] = 0x00110040; - cmdbuf[1] = 2; - svcSendSyncRequest(lcd_handle); - svcCloseHandle(lcd_handle); - } - - parallax_layer_reg_state = (*(float*)0x1FF81080 == 0.0) ? 0x0 : 0x00010001; - GSPGPU_WriteHWRegs(0x202000, ¶llax_layer_reg_state, 4); - - mcuHwcExit(); - ptmuExit(); - cfguExit(); - ndspExit(); - csndExit(); - gfxTopRightFramebuffers[0] = NULL; - gfxTopRightFramebuffers[1] = NULL; - gfxExit(); -#endif -} - -static void frontend_ctr_exec(const char* path, bool should_load_game) -{ - char game_path[PATH_MAX]; - const char* arg_data[3]; - errorConf error_dialog; - char error_string[200 + PATH_MAX]; - int args = 0; - int error = 0; - - DEBUG_VAR(path); - DEBUG_STR(path); - - arg_data[0] = NULL; - - arg_data[args] = elf_path_cst; - arg_data[args + 1] = NULL; - args++; - - RARCH_LOG("Attempt to load core: [%s].\n", path); -#ifndef IS_SALAMANDER - if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT)) - { - strcpy(game_path, path_get(RARCH_PATH_CONTENT)); - arg_data[args] = game_path; - arg_data[args + 1] = NULL; - args++; - RARCH_LOG("content path: [%s].\n", path_get(RARCH_PATH_CONTENT)); - } -#endif - - if (path && path[0]) - { -#ifdef IS_SALAMANDER - struct stat sbuff; - bool file_exists; - - file_exists = stat(path, &sbuff) == 0; - if (!file_exists) - { - char core_path[PATH_MAX]; - - /* find first valid core and load it if the target core doesnt exist */ - get_first_valid_core(&core_path[0]); - - if (core_path[0] == '\0') - { - errorInit(&error_dialog, ERROR_TEXT, CFG_LANGUAGE_EN); - errorText(&error_dialog, "There are no cores installed, install a core to continue."); - errorDisp(&error_dialog); - exit(0); - } - } -#endif - - if (envIsHomebrew()) - { - exec_3dsx_no_path_in_args(path, arg_data); - } - else - { - RARCH_WARN("\n"); - RARCH_WARN("\n"); - RARCH_WARN("Warning:\n"); - RARCH_WARN("First core launch may take 20\n"); - RARCH_WARN("seconds! Do not force quit\n"); - RARCH_WARN("before then or your memory\n"); - RARCH_WARN("card may be corrupted!\n"); - RARCH_WARN("\n"); - RARCH_WARN("\n"); - exec_cia(path, arg_data); - } - - errorInit(&error_dialog, ERROR_TEXT, CFG_LANGUAGE_EN); - snprintf(error_string, sizeof(error_string), "Cant launch core:%s", path); - errorText(&error_dialog, error_string); - errorDisp(&error_dialog); - exit(0);//couldnt launch new core, but context is corrupt so we have to quit - } -} - -#ifndef IS_SALAMANDER -static bool frontend_ctr_set_fork(enum frontend_fork fork_mode) -{ - switch (fork_mode) - { - case FRONTEND_FORK_CORE: - RARCH_LOG("FRONTEND_FORK_CORE\n"); - ctr_fork_mode = fork_mode; - break; - case FRONTEND_FORK_CORE_WITH_ARGS: - RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); - ctr_fork_mode = fork_mode; - break; - case FRONTEND_FORK_RESTART: - RARCH_LOG("FRONTEND_FORK_RESTART\n"); - /* NOTE: We don't implement Salamander, so just turn - this into FRONTEND_FORK_CORE. */ - ctr_fork_mode = FRONTEND_FORK_CORE; - break; - case FRONTEND_FORK_NONE: - default: - return false; - } - - return true; -} -#endif - -static void frontend_ctr_exitspawn(char* s, size_t len) -{ - bool should_load_game = false; -#ifndef IS_SALAMANDER - if (ctr_fork_mode == FRONTEND_FORK_NONE) - return; - - switch (ctr_fork_mode) - { - case FRONTEND_FORK_CORE_WITH_ARGS: - should_load_game = true; - break; - default: - break; - } -#endif - frontend_ctr_exec(s, should_load_game); -} - -static void frontend_ctr_shutdown(bool unused) -{ - (void)unused; -} - -static void ctr_check_dspfirm(void) -{ - FILE* dsp_fp = fopen("sdmc:/3ds/dspfirm.cdc", "rb"); - - if (dsp_fp) - fclose(dsp_fp); - else - { - size_t code_size; - uint32_t* code_buffer = NULL; - uint32_t* ptr = NULL; - const uint32_t dsp1_magic = 0x31505344; /* "DSP1" */ - FILE* code_fp = fopen("sdmc:/3ds/code.bin", "rb"); - - if (code_fp) - { - fseek(code_fp, 0, SEEK_END); - code_size = ftell(code_fp); - fseek(code_fp, 0, SEEK_SET); - - code_buffer = (uint32_t*) malloc(code_size); - if (code_buffer) - { - fread(code_buffer, 1, code_size, code_fp); - - for (ptr = code_buffer + 0x40; ptr < (code_buffer + (code_size >> 2)); ptr++) - { - if (*ptr == dsp1_magic) - { - size_t dspfirm_size = ptr[1]; - ptr -= 0x40; - if ((ptr + (dspfirm_size >> 2)) > (code_buffer + (code_size >> 2))) - break; - - dsp_fp = fopen("sdmc:/3ds/dspfirm.cdc", "wb"); - if (!dsp_fp) - break; - fwrite(ptr, 1, dspfirm_size, dsp_fp); - fclose(dsp_fp); - break; - } - } - free(code_buffer); - } - fclose(code_fp); - } - else - { - RARCH_WARN("\n"); - RARCH_WARN("\n"); - RARCH_WARN("Warning:\n"); - RARCH_WARN("3DS DSP dump is missing.\n"); - RARCH_WARN("A working DSP dump is required\n"); - RARCH_WARN("for correct operation.\n"); - RARCH_WARN("\n"); - RARCH_WARN("\n"); - } - } -} - -__attribute__((weak)) Result svchax_init(bool patch_srv); -__attribute__((weak)) u32 __ctr_patch_services; - -void gfxSetFramebufferInfo(gfxScreen_t screen, u8 id); - -static void frontend_ctr_init(void* data) -{ -#ifndef IS_SALAMANDER - (void)data; - - verbosity_enable(); - - gfxInit(GSP_BGR8_OES, GSP_RGB565_OES, false); - - u32 topSize = 400 * 240 * 3; - u32 bottomSize = 320 * 240 * 2; - linearFree(gfxTopLeftFramebuffers[0]); - linearFree(gfxTopLeftFramebuffers[1]); - linearFree(gfxBottomFramebuffers[0]); - linearFree(gfxBottomFramebuffers[1]); - linearFree(gfxTopRightFramebuffers[0]); - linearFree(gfxTopRightFramebuffers[1]); - - gfxTopLeftFramebuffers[0] = linearAlloc(topSize * 2); - gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize; - - gfxTopLeftFramebuffers[1] = linearAlloc(topSize * 2); - gfxTopRightFramebuffers[1] = gfxTopLeftFramebuffers[1] + topSize; - - gfxBottomFramebuffers[0] = linearAlloc(bottomSize); - gfxBottomFramebuffers[1] = linearAlloc(bottomSize); - - gfxSetFramebufferInfo(GFX_TOP, 0); - gfxSetFramebufferInfo(GFX_BOTTOM, 0); - - gfxSet3D(true); - consoleInit(GFX_BOTTOM, NULL); - - /* enable access to all service calls when possible. */ - if (svchax_init) - { - osSetSpeedupEnable(false); - svchax_init(__ctr_patch_services); - } - osSetSpeedupEnable(true); - - if (csndInit() != 0) - audio_ctr_csnd = audio_null; - ctr_check_dspfirm(); - if (ndspInit() != 0) - audio_ctr_dsp = audio_null; - cfguInit(); - ptmuInit(); - mcuHwcInit(); -#endif -} - - -static int frontend_ctr_get_rating(void) -{ - u8 device_model = 0xFF; - CFGU_GetSystemModel(&device_model);/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/ - - switch (device_model) - { - case 0: - case 1: - case 3: - /*Old 3/2DS*/ - return 3; - - case 2: - case 4: - case 5: - /*New 3/2DS*/ - return 6; - - default: - /*Unknown Device Or Check Failed*/ - break; - } - - return -1; -} - -enum frontend_architecture frontend_ctr_get_architecture(void) -{ - return FRONTEND_ARCH_ARM; -} - -static int frontend_ctr_parse_drive_list(void* data, bool load_content) -{ -#ifndef IS_SALAMANDER - file_list_t* list = (file_list_t*)data; - enum msg_hash_enums enum_idx = load_content ? - MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR : - MSG_UNKNOWN; - - if (!list) - return -1; - - menu_entries_append_enum(list, - "sdmc:/", - msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), - enum_idx, - FILE_TYPE_DIRECTORY, 0, 0); -#endif - - return 0; -} - -static uint64_t frontend_ctr_get_mem_total(void) -{ - return osGetMemRegionSize(MEMREGION_ALL); -} - -static uint64_t frontend_ctr_get_mem_used(void) -{ - return osGetMemRegionUsed(MEMREGION_ALL); -} - -static enum frontend_powerstate frontend_ctr_get_powerstate(int* seconds, int* percent) -{ - u8 battery_percent = 0; - u8 charging = 0; - enum frontend_powerstate pwr_state = FRONTEND_POWERSTATE_NONE; - - mcuHwcGetBatteryLevel(&battery_percent); - *percent = battery_percent; - - /* 3ds does not support seconds of charge remaining */ - *seconds = -1; - - PTMU_GetBatteryChargeState(&charging); - if (charging) - { - if (battery_percent == 100) - pwr_state = FRONTEND_POWERSTATE_CHARGED; - else - pwr_state = FRONTEND_POWERSTATE_CHARGING; - } - else - pwr_state = FRONTEND_POWERSTATE_ON_POWER_SOURCE; - - return pwr_state; -} - -static void frontend_ctr_get_os(char* s, size_t len, int* major, int* minor) -{ - OS_VersionBin cver; - OS_VersionBin nver; - - strlcpy(s, "3DS OS", len); - Result data_invalid = osGetSystemVersionData(&nver, &cver); - if (data_invalid == 0) - { - *major = cver.mainver; - *minor = cver.minor; - } - else - { - *major = 0; - *minor = 0; - } - -} - -static void frontend_ctr_get_name(char* s, size_t len) -{ - u8 device_model = 0xFF; - CFGU_GetSystemModel(&device_model);/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/ - - switch (device_model) - { - case 0: - strlcpy(s, "Old 3DS", len); - break; - case 1: - strlcpy(s, "Old 3DS XL", len); - break; - case 2: - strlcpy(s, "New 3DS", len); - break; - case 3: - strlcpy(s, "Old 2DS", len); - break; - case 4: - strlcpy(s, "New 3DS XL", len); - break; - case 5: - strlcpy(s, "New 2DS XL", len); - break; - - default: - strlcpy(s, "Unknown Device", len); - break; - } -} - -frontend_ctx_driver_t frontend_ctx_ctr = -{ - frontend_ctr_get_environment_settings, - frontend_ctr_init, - frontend_ctr_deinit, - frontend_ctr_exitspawn, - NULL, /* process_args */ - frontend_ctr_exec, -#ifdef IS_SALAMANDER - NULL, -#else - frontend_ctr_set_fork, -#endif - frontend_ctr_shutdown, - frontend_ctr_get_name, - frontend_ctr_get_os, - frontend_ctr_get_rating, - NULL, /* load_content */ - frontend_ctr_get_architecture, - frontend_ctr_get_powerstate, - frontend_ctr_parse_drive_list, - frontend_ctr_get_mem_total, - frontend_ctr_get_mem_used, - NULL, /* install_signal_handler */ - NULL, /* get_signal_handler_state */ - NULL, /* set_signal_handler_state */ - NULL, /* destroy_signal_handler_state */ - NULL, /* attach_console */ - NULL, /* detach_console */ - NULL, /* watch_path_for_changes */ - NULL, /* check_for_path_changes */ - NULL, /* set_sustained_performance_mode */ - "ctr", -}; +/* RetroArch - A frontend for libretro. + * Copyright (C) 2014-2017 - Ali Bouhlel + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include <3ds.h> +#include <3ds/svc.h> +#include <3ds/os.h> +#include <3ds/services/cfgu.h> +#include <3ds/services/ptmu.h> +#include <3ds/services/mcuhwc.h> + +#include + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#ifndef IS_SALAMANDER +#include +#endif + +#include "../frontend_driver.h" +#include "../../verbosity.h" +#include "../../defaults.h" +#include "../../paths.h" +#include "retroarch.h" +#include "file_path_special.h" +#include "audio/audio_driver.h" + +#include "ctr/ctr_debug.h" +#include "ctr/exec-3dsx/exec_3dsx.h" +#include "ctr/exec-3dsx/exec_cia.h" + +#ifndef IS_SALAMANDER +#ifdef HAVE_MENU +#include "../../menu/menu_driver.h" +#endif +#endif + +static enum frontend_fork ctr_fork_mode = FRONTEND_FORK_NONE; +static const char* elf_path_cst = "sdmc:/retroarch/retroarch.3dsx"; + +static void get_first_valid_core(char* path_return) +{ + DIR* dir; + struct dirent* ent; + const char* extension = envIsHomebrew() ? ".3dsx" : ".cia"; + + path_return[0] = '\0'; + + dir = opendir("sdmc:/retroarch/cores"); + if (dir != NULL) + { + while (ent = readdir(dir)) + { + if (ent == NULL) + break; + if (strlen(ent->d_name) > strlen(extension) && !strcmp(ent->d_name + strlen(ent->d_name) - strlen(extension), extension)) + { + strcpy(path_return, "sdmc:/retroarch/cores"); + strcat(path_return, "/"); + strcat(path_return, ent->d_name); + break; + } + } + closedir(dir); + } +} + +static void frontend_ctr_get_environment_settings(int* argc, char* argv[], + void* args, void* params_data) +{ + (void)args; + +#ifndef IS_SALAMANDER +#if defined(HAVE_LOGGER) + logger_init(); +#elif defined(HAVE_FILE_LOGGER) + retro_main_log_file_init("sdmc:/retroarch/retroarch-log.txt"); +#endif +#endif + + fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], elf_path_cst, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT])); + RARCH_LOG("port dir: [%s]\n", g_defaults.dirs[DEFAULT_DIR_PORT]); + + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT], + "downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], g_defaults.dirs[DEFAULT_DIR_PORT], + "media", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT], + "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_CORE], + "info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], g_defaults.dirs[DEFAULT_DIR_CORE], + "savestates", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], g_defaults.dirs[DEFAULT_DIR_CORE], + "savefiles", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], g_defaults.dirs[DEFAULT_DIR_CORE], + "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], g_defaults.dirs[DEFAULT_DIR_CORE], + "playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], g_defaults.dirs[DEFAULT_DIR_PORT], + "config", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_PORT], + "config/remaps", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], g_defaults.dirs[DEFAULT_DIR_PORT], + "filters", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], g_defaults.dirs[DEFAULT_DIR_PORT], + "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CURSOR], g_defaults.dirs[DEFAULT_DIR_PORT], + "database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR])); + fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT], + file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config)); +} + +static void frontend_ctr_deinit(void* data) +{ + Handle lcd_handle; + u32 parallax_layer_reg_state; + u8 not_2DS; + + extern PrintConsole* currentConsole; + + (void)data; + +#ifndef IS_SALAMANDER + verbosity_enable(); + +#ifdef HAVE_FILE_LOGGER + command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL); +#endif + + if ((gfxBottomFramebuffers[0] == (u8*)currentConsole->frameBuffer) + && (ctr_fork_mode == FRONTEND_FORK_NONE)) + wait_for_input(); + + CFGU_GetModelNintendo2DS(¬_2DS); + + if (not_2DS && srvGetServiceHandle(&lcd_handle, "gsp::Lcd") >= 0) + { + u32* cmdbuf = getThreadCommandBuffer(); + cmdbuf[0] = 0x00110040; + cmdbuf[1] = 2; + svcSendSyncRequest(lcd_handle); + svcCloseHandle(lcd_handle); + } + + parallax_layer_reg_state = (*(float*)0x1FF81080 == 0.0) ? 0x0 : 0x00010001; + GSPGPU_WriteHWRegs(0x202000, ¶llax_layer_reg_state, 4); + + mcuHwcExit(); + ptmuExit(); + cfguExit(); + ndspExit(); + csndExit(); + gfxTopRightFramebuffers[0] = NULL; + gfxTopRightFramebuffers[1] = NULL; + gfxExit(); +#endif +} + +static void frontend_ctr_exec(const char* path, bool should_load_game) +{ + char game_path[PATH_MAX]; + const char* arg_data[3]; + errorConf error_dialog; + char error_string[200 + PATH_MAX]; + int args = 0; + int error = 0; + + DEBUG_VAR(path); + DEBUG_STR(path); + + arg_data[0] = NULL; + + arg_data[args] = elf_path_cst; + arg_data[args + 1] = NULL; + args++; + + RARCH_LOG("Attempt to load core: [%s].\n", path); +#ifndef IS_SALAMANDER + if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT)) + { + strcpy(game_path, path_get(RARCH_PATH_CONTENT)); + arg_data[args] = game_path; + arg_data[args + 1] = NULL; + args++; + RARCH_LOG("content path: [%s].\n", path_get(RARCH_PATH_CONTENT)); + } +#endif + + if (path && path[0]) + { +#ifdef IS_SALAMANDER + struct stat sbuff; + bool file_exists; + + file_exists = stat(path, &sbuff) == 0; + if (!file_exists) + { + char core_path[PATH_MAX]; + + /* find first valid core and load it if the target core doesnt exist */ + get_first_valid_core(&core_path[0]); + + if (core_path[0] == '\0') + { + errorInit(&error_dialog, ERROR_TEXT, CFG_LANGUAGE_EN); + errorText(&error_dialog, "There are no cores installed, install a core to continue."); + errorDisp(&error_dialog); + exit(0); + } + } +#endif + + if (envIsHomebrew()) + { + exec_3dsx_no_path_in_args(path, arg_data); + } + else + { + RARCH_WARN("\n"); + RARCH_WARN("\n"); + RARCH_WARN("Warning:\n"); + RARCH_WARN("First core launch may take 20\n"); + RARCH_WARN("seconds! Do not force quit\n"); + RARCH_WARN("before then or your memory\n"); + RARCH_WARN("card may be corrupted!\n"); + RARCH_WARN("\n"); + RARCH_WARN("\n"); + exec_cia(path, arg_data); + } + + errorInit(&error_dialog, ERROR_TEXT, CFG_LANGUAGE_EN); + snprintf(error_string, sizeof(error_string), "Cant launch core:%s", path); + errorText(&error_dialog, error_string); + errorDisp(&error_dialog); + exit(0);//couldnt launch new core, but context is corrupt so we have to quit + } +} + +#ifndef IS_SALAMANDER +static bool frontend_ctr_set_fork(enum frontend_fork fork_mode) +{ + switch (fork_mode) + { + case FRONTEND_FORK_CORE: + RARCH_LOG("FRONTEND_FORK_CORE\n"); + ctr_fork_mode = fork_mode; + break; + case FRONTEND_FORK_CORE_WITH_ARGS: + RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n"); + ctr_fork_mode = fork_mode; + break; + case FRONTEND_FORK_RESTART: + RARCH_LOG("FRONTEND_FORK_RESTART\n"); + /* NOTE: We don't implement Salamander, so just turn + this into FRONTEND_FORK_CORE. */ + ctr_fork_mode = FRONTEND_FORK_CORE; + break; + case FRONTEND_FORK_NONE: + default: + return false; + } + + return true; +} +#endif + +static void frontend_ctr_exitspawn(char* s, size_t len) +{ + bool should_load_game = false; +#ifndef IS_SALAMANDER + if (ctr_fork_mode == FRONTEND_FORK_NONE) + return; + + switch (ctr_fork_mode) + { + case FRONTEND_FORK_CORE_WITH_ARGS: + should_load_game = true; + break; + default: + break; + } +#endif + frontend_ctr_exec(s, should_load_game); +} + +static void frontend_ctr_shutdown(bool unused) +{ + (void)unused; +} + +static void ctr_check_dspfirm(void) +{ + FILE* dsp_fp = fopen("sdmc:/3ds/dspfirm.cdc", "rb"); + + if (dsp_fp) + fclose(dsp_fp); + else + { + size_t code_size; + uint32_t* code_buffer = NULL; + uint32_t* ptr = NULL; + const uint32_t dsp1_magic = 0x31505344; /* "DSP1" */ + FILE* code_fp = fopen("sdmc:/3ds/code.bin", "rb"); + + if (code_fp) + { + fseek(code_fp, 0, SEEK_END); + code_size = ftell(code_fp); + fseek(code_fp, 0, SEEK_SET); + + code_buffer = (uint32_t*) malloc(code_size); + if (code_buffer) + { + fread(code_buffer, 1, code_size, code_fp); + + for (ptr = code_buffer + 0x40; ptr < (code_buffer + (code_size >> 2)); ptr++) + { + if (*ptr == dsp1_magic) + { + size_t dspfirm_size = ptr[1]; + ptr -= 0x40; + if ((ptr + (dspfirm_size >> 2)) > (code_buffer + (code_size >> 2))) + break; + + dsp_fp = fopen("sdmc:/3ds/dspfirm.cdc", "wb"); + if (!dsp_fp) + break; + fwrite(ptr, 1, dspfirm_size, dsp_fp); + fclose(dsp_fp); + break; + } + } + free(code_buffer); + } + fclose(code_fp); + } + else + { + RARCH_WARN("\n"); + RARCH_WARN("\n"); + RARCH_WARN("Warning:\n"); + RARCH_WARN("3DS DSP dump is missing.\n"); + RARCH_WARN("A working DSP dump is required\n"); + RARCH_WARN("for correct operation.\n"); + RARCH_WARN("\n"); + RARCH_WARN("\n"); + } + } +} + +__attribute__((weak)) Result svchax_init(bool patch_srv); +__attribute__((weak)) u32 __ctr_patch_services; + +void gfxSetFramebufferInfo(gfxScreen_t screen, u8 id); + +static void frontend_ctr_init(void* data) +{ +#ifndef IS_SALAMANDER + (void)data; + + verbosity_enable(); + + gfxInit(GSP_BGR8_OES, GSP_RGB565_OES, false); + + u32 topSize = 400 * 240 * 3; + u32 bottomSize = 320 * 240 * 2; + linearFree(gfxTopLeftFramebuffers[0]); + linearFree(gfxTopLeftFramebuffers[1]); + linearFree(gfxBottomFramebuffers[0]); + linearFree(gfxBottomFramebuffers[1]); + linearFree(gfxTopRightFramebuffers[0]); + linearFree(gfxTopRightFramebuffers[1]); + + gfxTopLeftFramebuffers[0] = linearAlloc(topSize * 2); + gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize; + + gfxTopLeftFramebuffers[1] = linearAlloc(topSize * 2); + gfxTopRightFramebuffers[1] = gfxTopLeftFramebuffers[1] + topSize; + + gfxBottomFramebuffers[0] = linearAlloc(bottomSize); + gfxBottomFramebuffers[1] = linearAlloc(bottomSize); + + gfxSetFramebufferInfo(GFX_TOP, 0); + gfxSetFramebufferInfo(GFX_BOTTOM, 0); + + gfxSet3D(true); + consoleInit(GFX_BOTTOM, NULL); + + /* enable access to all service calls when possible. */ + if (svchax_init) + { + osSetSpeedupEnable(false); + svchax_init(__ctr_patch_services); + } + osSetSpeedupEnable(true); + + if (csndInit() != 0) + audio_ctr_csnd = audio_null; + ctr_check_dspfirm(); + if (ndspInit() != 0) + audio_ctr_dsp = audio_null; + cfguInit(); + ptmuInit(); + mcuHwcInit(); +#endif +} + +static int frontend_ctr_get_rating(void) +{ + u8 device_model = 0xFF; + CFGU_GetSystemModel(&device_model);/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/ + + switch (device_model) + { + case 0: + case 1: + case 3: + /*Old 3/2DS*/ + return 3; + + case 2: + case 4: + case 5: + /*New 3/2DS*/ + return 6; + + default: + /*Unknown Device Or Check Failed*/ + break; + } + + return -1; +} + +enum frontend_architecture frontend_ctr_get_architecture(void) +{ + return FRONTEND_ARCH_ARM; +} + +static int frontend_ctr_parse_drive_list(void* data, bool load_content) +{ +#ifndef IS_SALAMANDER + file_list_t* list = (file_list_t*)data; + enum msg_hash_enums enum_idx = load_content ? + MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR : + MSG_UNKNOWN; + + if (!list) + return -1; + + menu_entries_append_enum(list, + "sdmc:/", + msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), + enum_idx, + FILE_TYPE_DIRECTORY, 0, 0); +#endif + + return 0; +} + +static uint64_t frontend_ctr_get_mem_total(void) +{ + return osGetMemRegionSize(MEMREGION_ALL); +} + +static uint64_t frontend_ctr_get_mem_used(void) +{ + return osGetMemRegionUsed(MEMREGION_ALL); +} + +static enum frontend_powerstate frontend_ctr_get_powerstate(int* seconds, int* percent) +{ + u8 battery_percent = 0; + u8 charging = 0; + enum frontend_powerstate pwr_state = FRONTEND_POWERSTATE_NONE; + + mcuHwcGetBatteryLevel(&battery_percent); + *percent = battery_percent; + + /* 3ds does not support seconds of charge remaining */ + *seconds = -1; + + PTMU_GetBatteryChargeState(&charging); + if (charging) + { + if (battery_percent == 100) + pwr_state = FRONTEND_POWERSTATE_CHARGED; + else + pwr_state = FRONTEND_POWERSTATE_CHARGING; + } + else + pwr_state = FRONTEND_POWERSTATE_ON_POWER_SOURCE; + + return pwr_state; +} + +static void frontend_ctr_get_os(char* s, size_t len, int* major, int* minor) +{ + OS_VersionBin cver; + OS_VersionBin nver; + + strlcpy(s, "3DS OS", len); + Result data_invalid = osGetSystemVersionData(&nver, &cver); + if (data_invalid == 0) + { + *major = cver.mainver; + *minor = cver.minor; + } + else + { + *major = 0; + *minor = 0; + } + +} + +static void frontend_ctr_get_name(char* s, size_t len) +{ + u8 device_model = 0xFF; + CFGU_GetSystemModel(&device_model);/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/ + + switch (device_model) + { + case 0: + strlcpy(s, "Old 3DS", len); + break; + case 1: + strlcpy(s, "Old 3DS XL", len); + break; + case 2: + strlcpy(s, "New 3DS", len); + break; + case 3: + strlcpy(s, "Old 2DS", len); + break; + case 4: + strlcpy(s, "New 3DS XL", len); + break; + case 5: + strlcpy(s, "New 2DS XL", len); + break; + + default: + strlcpy(s, "Unknown Device", len); + break; + } +} + +frontend_ctx_driver_t frontend_ctx_ctr = +{ + frontend_ctr_get_environment_settings, + frontend_ctr_init, + frontend_ctr_deinit, + frontend_ctr_exitspawn, + NULL, /* process_args */ + frontend_ctr_exec, +#ifdef IS_SALAMANDER + NULL, +#else + frontend_ctr_set_fork, +#endif + frontend_ctr_shutdown, + frontend_ctr_get_name, + frontend_ctr_get_os, + frontend_ctr_get_rating, + NULL, /* load_content */ + frontend_ctr_get_architecture, + frontend_ctr_get_powerstate, + frontend_ctr_parse_drive_list, + frontend_ctr_get_mem_total, + frontend_ctr_get_mem_used, + NULL, /* install_signal_handler */ + NULL, /* get_signal_handler_state */ + NULL, /* set_signal_handler_state */ + NULL, /* destroy_signal_handler_state */ + NULL, /* attach_console */ + NULL, /* detach_console */ + NULL, /* watch_path_for_changes */ + NULL, /* check_for_path_changes */ + NULL, /* set_sustained_performance_mode */ + "ctr", +}; diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index e1367fc328..4cf563717c 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -436,7 +436,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], strlcpy(g_defaults.path.buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path.buildbot_server_url)); fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path)); - + if (filestream_exists(assets_zip_path)) { settings_t *settings = config_get_ptr(); @@ -466,7 +466,6 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[], RARCH_ERR("Failed to create or access system directory: %s.\n", g_defaults.dirs[DEFAULT_DIR_SYSTEM]); } - CFRelease(bundle_path); CFRelease(bundle_url); } @@ -535,7 +534,7 @@ static int frontend_darwin_get_rating(void) if (strstr(model, "iPad5,3") || strstr(model, "iPad5,4")) return 18; - /* TODO/FIXME - + /* TODO/FIXME - - more ratings for more systems - determine rating more intelligently*/ return -1; @@ -633,7 +632,7 @@ static enum frontend_architecture frontend_darwin_get_architecture(void) if (uname(&buffer) != 0) return FRONTEND_ARCH_NONE; - + (void)buffer_hash; #ifdef OSX @@ -706,7 +705,7 @@ static uint64_t frontend_darwin_get_mem_total(void) int mib[2] = { CTL_HW, HW_MEMSIZE }; u_int namelen = sizeof(mib) / sizeof(mib[0]); size_t len = sizeof(size); - + if (sysctl(mib, namelen, &size, &len, NULL, 0) < 0) return 0; return size; @@ -722,12 +721,12 @@ static uint64_t frontend_darwin_get_mem_used(void) vm_statistics64_data_t vm_stats; mach_port_t mach_port = mach_host_self(); mach_msg_type_number_t count = sizeof(vm_stats) / sizeof(natural_t); - + if (KERN_SUCCESS == host_page_size(mach_port, &page_size) && KERN_SUCCESS == host_statistics64(mach_port, HOST_VM_INFO, (host_info64_t)&vm_stats, &count)) { - + long long used_memory = ((int64_t)vm_stats.active_count + (int64_t)vm_stats.inactive_count + (int64_t)vm_stats.wire_count) * (int64_t)page_size; diff --git a/frontend/drivers/platform_orbis.c b/frontend/drivers/platform_orbis.c index 66d3c02722..2d55ce8a31 100644 --- a/frontend/drivers/platform_orbis.c +++ b/frontend/drivers/platform_orbis.c @@ -115,7 +115,6 @@ static void frontend_orbis_get_environment_settings(int *argc, char *argv[], sceSystemServiceHideSplashScreen(); - uintptr_t intptr=0; sscanf(argv[1],"%p",&intptr); argv[1] = NULL; diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c index c937c1c928..3d937aaeb6 100644 --- a/frontend/drivers/platform_ps2.c +++ b/frontend/drivers/platform_ps2.c @@ -34,7 +34,7 @@ enum BootDeviceIDs{ BOOT_DEVICE_MASS, BOOT_DEVICE_HDD, BOOT_DEVICE_HOST, - + BOOT_DEVICE_COUNT, }; @@ -84,9 +84,9 @@ char user_path[512]; static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE; -/* Only paths residing on "basic" devices - * (devices that don't require mounting) - * can be specified here, since this system +/* Only paths residing on "basic" devices + * (devices that don't require mounting) + * can be specified here, since this system * doesn't perform mounting based on the path. */ #define DEFAULT_PATH "mass:" @@ -111,8 +111,8 @@ static int getBootDeviceID(char *path) return BOOT_DEVICE_HOST; } -/* HACK! If booting from a USB device, keep trying to - * open this program again until it succeeds. +/* HACK! If booting from a USB device, keep trying to + * open this program again until it succeeds. * * This will ensure that the emulator will be able to load its files. */ @@ -123,7 +123,7 @@ static void waitUntilDeviceIsReady(const char *path) while((file=fopen(path, "rb"))==NULL) { - /* Wait for a while first, or the IOP + /* Wait for a while first, or the IOP * will get swamped by requests from the EE. */ nopdelay(); nopdelay(); @@ -351,7 +351,7 @@ static void frontend_ps2_init(void *data) /* Memory Card */ SifExecModuleBuffer(mcman_irx_start, mcman_irx_size, 0, NULL, NULL); SifExecModuleBuffer(mcserv_irx_start, mcserv_irx_size, 0, NULL, NULL); - + /* USB */ SifExecModuleBuffer(usbd_irx_start, usbd_irx_size, 0, NULL, NULL); SifExecModuleBuffer(usbhdfsd_irx_start, usbhdfsd_irx_size, 0, NULL, NULL); @@ -365,7 +365,7 @@ static void frontend_ps2_init(void *data) RARCH_ERR("audsrv library not initalizated\n"); } - /* Initializes pad library + /* Initializes pad library Must be init with 0 as parameter*/ if (padInit(0) != 1) { RARCH_ERR("padInit library not initalizated\n"); @@ -514,7 +514,7 @@ static int frontend_ps2_parse_drive_list(void *data, bool load_content) "cdfs:/", msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), enum_idx, - FILE_TYPE_DIRECTORY, 0, 0); + FILE_TYPE_DIRECTORY, 0, 0); menu_entries_append_enum(list, "hdd0:/", msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR), diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index 5a53183c5c..e74a10c969 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -260,7 +260,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[], fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], g_defaults.dirs[DEFAULT_DIR_CORE], "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], g_defaults.dirs[DEFAULT_DIR_CORE], "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG])); } diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c index e0cb9b0b25..fb88dd097b 100644 --- a/frontend/drivers/platform_switch.c +++ b/frontend/drivers/platform_switch.c @@ -230,7 +230,7 @@ static void frontend_switch_get_environment_settings(int *argc, char *argv[], vo if (!string_is_empty(dir_path)) path_mkdir(dir_path); } - + fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT], file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config)); } @@ -886,7 +886,7 @@ static void frontend_switch_get_os(char *s, size_t len, int *major, int *minor) int patch; sscanf(firmware_version + 0x68, "%d.%d.%d", major, minor, &patch); - + fail_object: ipc_close(set_sys); fail_sm: diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c index e916693663..95c5470459 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c @@ -2409,14 +2409,14 @@ static bool frontend_unix_check_for_path_changes(path_change_data_t *change_data { unsigned j; - /* A successful close does not guarantee that the - * data has been successfully saved to disk, - * as the kernel defers writes. It is - * not common for a file system to flush + /* A successful close does not guarantee that the + * data has been successfully saved to disk, + * as the kernel defers writes. It is + * not common for a file system to flush * the buffers when the stream is closed. * - * So we manually fsync() here to flush the data - * to disk, to make sure that the new data is + * So we manually fsync() here to flush the data + * to disk, to make sure that the new data is * immediately available when the file is re-read. */ for (j = 0; j < inotify_data->wd_list->count; j++) diff --git a/frontend/drivers/platform_uwp.c b/frontend/drivers/platform_uwp.c index 7c5205f72d..cddfb76665 100644 --- a/frontend/drivers/platform_uwp.c +++ b/frontend/drivers/platform_uwp.c @@ -323,7 +323,7 @@ static int frontend_uwp_parse_drive_list(void *data, bool load_content) static void frontend_uwp_environment_get(int *argc, char *argv[], void *args, void *params_data) { - /* On UWP, we have to use the writable directory + /* On UWP, we have to use the writable directory * instead of the install directory. */ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_ASSETS], "~\\assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); @@ -353,7 +353,7 @@ static void frontend_uwp_environment_get(int *argc, char *argv[], "~\\thumbnails", sizeof(g_defaults.dirs[DEFAULT_DIR_THUMBNAILS])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_OVERLAY], "~\\overlays", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY])); - /* This one is an exception: cores have to be loaded from + /* This one is an exception: cores have to be loaded from * the install directory, * since this is the only place UWP apps can take .dlls from */ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE], diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index afeecbeef5..72047f32e3 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -101,7 +101,7 @@ static bool gfx_init_dwm(void) DragAcceptFiles_func = (VOID (WINAPI*)(HWND, BOOL))dylib_proc(shell32lib, "DragAcceptFiles"); - + mmcss = (HRESULT(WINAPI*)(BOOL))dylib_proc(dwmlib, "DwmEnableMMCSS"); #else diff --git a/frontend/drivers/platform_xdk.h b/frontend/drivers/platform_xdk.h index fa6121fca6..4070a85ac7 100644 --- a/frontend/drivers/platform_xdk.h +++ b/frontend/drivers/platform_xdk.h @@ -1,1000 +1,988 @@ -#ifdef _XBOX1 -#include - -// Don't do __declspec(dllimport) for things like emulators -#if defined(NTSYSAPI) && defined(DONT_IMPORT_INTERNAL) -#undef NTSYSAPI -#endif -#ifdef DONT_IMPORT_INTERNAL -#define NTSYSAPI -#endif - -// The normal headers don't have this...? -#define FASTCALL __fastcall - -// The usual NTSTATUS -typedef LONG NTSTATUS; - -// The usual NT_SUCCESS -#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0) - -// Just for documentation -#define EXPORTNUM(x) - - -// Needed for object structures and related things -typedef CONST SHORT CSHORT; - - -// String types -typedef CHAR *PSZ; -typedef CONST CHAR *PCSZ; - -// ANSI_STRING -// Differences from NT: None. -typedef struct _STRING { - USHORT Length; - USHORT MaximumLength; - PCHAR Buffer; -} STRING; -typedef STRING *PSTRING; - -typedef STRING ANSI_STRING; -typedef PSTRING PANSI_STRING; - - -// IO Status Block type (UNVERIFIED) -// Differences from NT: None. -typedef struct _IO_STATUS_BLOCK { - union { - NTSTATUS Status; - PVOID Pointer; - }; - - ULONG_PTR Information; -} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; - -// APC routine -typedef -VOID -(NTAPI *PIO_APC_ROUTINE) ( - IN PVOID ApcContext, - IN PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG Reserved - ); - - -// Header for dispatcher objects -// Differences from NT: None. -typedef struct _DISPATCHER_HEADER { - UCHAR Type; - UCHAR Absolute; - UCHAR Size; - UCHAR Inserted; - LONG SignalState; - LIST_ENTRY WaitListHead; -} DISPATCHER_HEADER; - - -// Object types -#define NotificationTimerObject 8 -#define SynchronizationTimerObject 9 -#define DpcObject 19 - - -// Object Attributes type -// Differences from NT: There are no Length, SecurityDescriptor, or -// SecurityQualityOfService fields. Also, ObjectName is ANSI, not -// Unicode. -typedef struct _OBJECT_ATTRIBUTES { - HANDLE RootDirectory; - PANSI_STRING ObjectName; - ULONG Attributes; -} OBJECT_ATTRIBUTES; -typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES; - -// Flags for OBJECT_ATTRIBUTES::Attributes -#define OBJ_INHERIT 0x00000002L -#define OBJ_PERMANENT 0x00000010L -#define OBJ_EXCLUSIVE 0x00000020L -#define OBJ_CASE_INSENSITIVE 0x00000040L -#define OBJ_OPENIF 0x00000080L -#define OBJ_OPENLINK 0x00000100L -#define OBJ_KERNEL_HANDLE 0x00000200L -#define OBJ_VALID_ATTRIBUTES 0x000003F2L - -// CreateDisposition values for NtCreateFile() -#define FILE_SUPERSEDE 0x00000000 -#define FILE_OPEN 0x00000001 -#define FILE_CREATE 0x00000002 -#define FILE_OPEN_IF 0x00000003 -#define FILE_OVERWRITE 0x00000004 -#define FILE_OVERWRITE_IF 0x00000005 -#define FILE_MAXIMUM_DISPOSITION 0x00000005 - -// CreateOption values for NtCreateFile() -// FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT is what CreateFile -// uses for most things when translating to NtCreateFile. -#define FILE_DIRECTORY_FILE 0x00000001 -#define FILE_WRITE_THROUGH 0x00000002 -#define FILE_SEQUENTIAL_ONLY 0x00000004 -#define FILE_NO_INTERMEDIATE_BUFFERING 0x00000008 -#define FILE_SYNCHRONOUS_IO_ALERT 0x00000010 -#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020 -#define FILE_NON_DIRECTORY_FILE 0x00000040 -#define FILE_CREATE_TREE_CONNECTION 0x00000080 -#define FILE_COMPLETE_IF_OPLOCKED 0x00000100 -#define FILE_NO_EA_KNOWLEDGE 0x00000200 -#define FILE_OPEN_FOR_RECOVERY 0x00000400 -#define FILE_RANDOM_ACCESS 0x00000800 -#define FILE_DELETE_ON_CLOSE 0x00001000 -#define FILE_OPEN_BY_FILE_ID 0x00002000 -#define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 -#define FILE_NO_COMPRESSION 0x00008000 -#define FILE_RESERVE_OPFILTER 0x00100000 -#define FILE_OPEN_REPARSE_POINT 0x00200000 -#define FILE_OPEN_NO_RECALL 0x00400000 -#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 -#define FILE_COPY_STRUCTURED_STORAGE 0x00000041 -#define FILE_STRUCTURED_STORAGE 0x00000441 -#define FILE_VALID_OPTION_FLAGS 0x00ffffff -#define FILE_VALID_PIPE_OPTION_FLAGS 0x00000032 -#define FILE_VALID_MAILSLOT_OPTION_FLAGS 0x00000032 -#define FILE_VALID_SET_FLAGS 0x00000036 - - -// NtQueryVolumeInformation / NtSetVolumeInformation stuff -// Type of information to retrieve; FileFsSizeInformation and -// FileFsDeviceInformation are the only ones confirmed to work. -typedef enum _FSINFOCLASS { - FileFsVolumeInformation = 1, - FileFsLabelInformation, - FileFsSizeInformation, - FileFsDeviceInformation, - FileFsAttributeInformation, - FileFsControlInformation, - FileFsFullSizeInformation, - FileFsObjectInformation -} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; - -// Structure of FileFsSizeInformation -typedef struct _FILE_FS_SIZE_INFORMATION { - LARGE_INTEGER TotalAllocationUnits; - LARGE_INTEGER AvailableAllocationUnits; - ULONG SectorsPerAllocationUnit; - ULONG BytesPerSector; -} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; - -#define DEVICE_TYPE ULONG - -// Structure of FileFsDeviceInformation -typedef struct _FILE_FS_DEVICE_INFORMATION { - DEVICE_TYPE DeviceType; - ULONG Characteristics; -} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; - -// DEVICE_TYPEs (I took a guess as to which the XBOX might have.) -#define FILE_DEVICE_CD_ROM 0x00000002 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 -#define FILE_DEVICE_CONTROLLER 0x00000004 -#define FILE_DEVICE_DISK 0x00000007 -#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 -#define FILE_DEVICE_FILE_SYSTEM 0x00000009 -#define FILE_DEVICE_NULL 0x00000015 -#define FILE_DEVICE_SCREEN 0x0000001c -#define FILE_DEVICE_SOUND 0x0000001d -#define FILE_DEVICE_UNKNOWN 0x00000022 -#define FILE_DEVICE_VIDEO 0x00000023 -#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 -#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 - -// Characteristics -#define FILE_REMOVABLE_MEDIA 0x00000001 -#define FILE_READ_ONLY_DEVICE 0x00000002 -#define FILE_FLOPPY_DISKETTE 0x00000004 -#define FILE_WRITE_ONCE_MEDIA 0x00000008 -#define FILE_REMOTE_DEVICE 0x00000010 -#define FILE_DEVICE_IS_MOUNTED 0x00000020 -#define FILE_VIRTUAL_VOLUME 0x00000040 -#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 -#define FILE_DEVICE_SECURE_OPEN 0x00000100 - -/* Physical address - * Differences from NT: 32 bit address instead of 64. */ -typedef ULONG PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; - -/* NtCreateFile/NtOpenFile stuff */ -#define FILE_SUPERSEDED 0x00000000 -#define FILE_OPENED 0x00000001 -#define FILE_CREATED 0x00000002 -#define FILE_OVERWRITTEN 0x00000003 -#define FILE_EXISTS 0x00000004 -#define FILE_DOES_NOT_EXIST 0x00000005 - -// NtReadFile/NtWriteFile stuff -#define FILE_WRITE_TO_END_OF_FILE 0xffffffff -#define FILE_USE_FILE_POINTER_POSITION 0xfffffffe - -// Device types -#define FILE_DEVICE_CD_ROM 0x00000002 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 -#define FILE_DEVICE_CONTROLLER 0x00000004 -#define FILE_DEVICE_SCSI FILE_DEVICE_CONTROLLER -#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER -#define FILE_DEVICE_DISK 0x00000007 -#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 -#define FILE_DEVICE_DVD 0x00000033 - -// Access types -#define FILE_ANY_ACCESS 0 -#define FILE_READ_ACCESS 0x0001 /* file & pipe */ -#define FILE_WRITE_ACCESS 0x0002 /* file & pipe */ - -// Method types -#define METHOD_BUFFERED 0 -#define METHOD_IN_DIRECT 1 -#define METHOD_OUT_DIRECT 2 -#define METHOD_NEITHER 3 - -// The all-important CTL_CODE -#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ - ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ -) - -// IDE/SCSI codes -// IOCTL_SCSI_PASS_THROUGH_DIRECT is the only one known to be used. -// Differences from NT: None. -#define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_MINIPORT CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_INQUIRY_DATA CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_CAPABILITIES CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_PASS_THROUGH_DIRECT CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_ADDRESS CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_RESCAN_BUS CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0408, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_FREE_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0409, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_IDE_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x040a, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) - -// Special XBOX code? -#define IOCTL_CDROM_AUTHENTICATE_DISK CTL_CODE(FILE_DEVICE_CD_ROM, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) - -/* Structure for IOCTL_SCSI_PASS_THROUGH_DIRECT - * Differences from NT: None, believe it or not. */ -typedef struct _SCSI_PASS_THROUGH_DIRECT { - /*000*/ USHORT Length; - /*002*/ UCHAR ScsiStatus; - /*003*/ UCHAR PathId; - /*004*/ UCHAR TargetId; - /*005*/ UCHAR Lun; - /*006*/ UCHAR CdbLength; - /*007*/ UCHAR SenseInfoLength; - /*008*/ UCHAR DataIn; - /*00C*/ ULONG DataTransferLength; - /*010*/ ULONG TimeOutValue; - /*014*/ PVOID DataBuffer; - /*018*/ ULONG SenseInfoOffset; - /*01C*/ UCHAR Cdb[16]; -}SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; - -/* DataIn fields for IOCTL_SCSI_PASS_THROUGH_DIRECT */ -#define SCSI_IOCTL_DATA_OUT 0 -#define SCSI_IOCTL_DATA_IN 1 -#define SCSI_IOCTL_DATA_UNSPECIFIED 2 - -/* Kernel object type (unsure about the structure...) */ -typedef struct _OBJECT_TYPE -{ - // Same prototype as ExAllocatePoolWithTag, because that's the usual one - PVOID - (NTAPI *AllocationFunction)( - SIZE_T NumberOfBytes, - ULONG Tag - ); - - // Same prototype as ExFreePool, because that's the usual one - VOID - (NTAPI *FreeFunction)( - IN PVOID P - ); - - // The prototypes of these are unknown - void *CloseFunction; - void *DeleteFunction; - void *ParseFunction; - - // Unknown DWORD... Size of this object type maybe? - void *DefaultObjectMaybe; - - // 4 letter tag for this object type - CHAR Tag[4]; -} OBJECT_TYPE; -typedef OBJECT_TYPE *POBJECT_TYPE; - -// Object types -extern POBJECT_TYPE IoFileObjectType; -extern POBJECT_TYPE ExEventObjectType; -extern POBJECT_TYPE ExSemaphoreObjectType; -extern POBJECT_TYPE IoCompletionObjectType; -extern POBJECT_TYPE IoDeviceObjectType; - - -// *_OBJECT and related structures (mostly opaque since I'm lazy) -typedef struct _DRIVER_OBJECT { - CSHORT Type; - CSHORT Size; - struct _DEVICE_OBJECT *DeviceObject; - // ... -} DRIVER_OBJECT; -typedef DRIVER_OBJECT *PDRIVER_OBJECT; - -typedef struct _DEVICE_OBJECT { - CSHORT Type; - USHORT Size; - LONG ReferenceCount; - PDRIVER_OBJECT DriverObject; - // ... -} DEVICE_OBJECT; -typedef DEVICE_OBJECT *PDEVICE_OBJECT; - -typedef struct _FILE_OBJECT { - CSHORT Type; - CSHORT Size; - PDEVICE_OBJECT DeviceObject; - // ... -} FILE_OBJECT; -typedef FILE_OBJECT *PFILE_OBJECT; - - -/* Thread information structures */ - -/* IRQL */ -typedef UCHAR KIRQL, *PKIRQL; -#define PASSIVE_LEVEL 0 // Passive release level -#define LOW_LEVEL 0 // Lowest interrupt level -#define APC_LEVEL 1 // APC interrupt level -#define DISPATCH_LEVEL 2 // Dispatcher level - -// Thread entry point -// NOTE: This is not a standard call! You can't call this function from C code! -// You push registers like stdcall, but ebp + 4 must point to the first argument before the call! -// -// Differences from NT: 2 parameters instead of 1; strange calling convention -typedef -VOID -(NTAPI *PKSTART_ROUTINE) ( - IN PVOID StartContext1, - IN PVOID StartContext2 - ); - -// Structure of a critical section -// Same as the XBOX's RTL_CRITICAL_SECTION, but with the more explicit header -typedef struct _KCRITICAL_SECTION -{ - // 000 Dispatcher header - DISPATCHER_HEADER Header; - // 010 Lock count of the critical section - LONG LockCount; - // 014 Recursion count of the critical section - LONG RecursionCount; - // 018 Thread ID of the thread that currently owns this critical section - ULONG OwningThread; -} KCRITICAL_SECTION, *PKCRITICAL_SECTION; - -// Structure of a thread object -typedef struct _KTHREAD -{ - // 000 Dispatcher header - DISPATCHER_HEADER Header; - // 010 Unknown - BYTE unknown[0x18]; - // 028 Pointer to TLS data - PVOID TlsData; - // ??? just padding - real size is unknown - BYTE unknown2[0x100]; -} KTHREAD, *PKTHREAD; - -// Structure of the data at FS -typedef struct _FS_STRUCTURE -{ - // 000 Current exception handler information - PVOID *ExceptionFrame; - // 004 Pointer to current TLS data top - PVOID TlsDataTop; - // 008 - BYTE unknown2[0x1C]; - // 024 Current IRQL of the OS - KIRQL CurrentIrql; - // 028 Thread structure of the current thread - PKTHREAD ThreadObject; - // ??? just padding - real size is unknown - BYTE unknown3[0x100]; -} FS_STRUCTURE, *PFS_STRUCTURE; - -// DPC routine -typedef -VOID -(*PKDEFERRED_ROUTINE) ( - IN struct _KDPC *Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2 - ); - -// DPC information -// It's not known which of these fields are used on XBOX. -typedef struct _KDPC { - CSHORT Type; - UCHAR Number; - UCHAR Importance; - LIST_ENTRY DpcListEntry; - PKDEFERRED_ROUTINE DeferredRoutine; - PVOID DeferredContext; - PVOID SystemArgument1; - PVOID SystemArgument2; - PULONG_PTR Lock; -} KDPC, *PKDPC; - - -// Timers -typedef enum _TIMER_TYPE { - NotificationTimer, - SynchronizationTimer - } TIMER_TYPE; - -typedef struct _KTIMER { - DISPATCHER_HEADER Header; - ULARGE_INTEGER DueTime; - LIST_ENTRY TimerListEntry; - struct _KDPC *Dpc; - LONG Period; -} KTIMER, *PKTIMER; - -/* XBE stuff - * Not used in any exported kernel calls, but still useful. - */ - -/* XBE header information */ -typedef struct _XBE_HEADER -{ - // 000 "XBEH" - CHAR Magic[4]; - // 004 RSA digital signature of the entire header area - UCHAR HeaderSignature[256]; - // 104 Base address of XBE image (must be 0x00010000?) - PVOID BaseAddress; - // 108 Size of all headers combined - other headers must be within this - ULONG HeaderSize; - // 10C Size of entire image - ULONG ImageSize; - // 110 Size of this header (always 0x178?) - ULONG XbeHeaderSize; - // 114 Image timestamp - unknown format - ULONG Timestamp; - // 118 Pointer to certificate data (must be within HeaderSize) - struct _XBE_CERTIFICATE *Certificate; - // 11C Number of sections - DWORD NumSections; - // 120 Pointer to section headers (must be within HeaderSize) - struct _XBE_SECTION *Sections; - // 124 Initialization flags - ULONG InitFlags; - // 128 Entry point (XOR'd; see xboxhacker.net) - PVOID EntryPoint; - // 12C Pointer to TLS directory - struct _XBE_TLS_DIRECTORY *TlsDirectory; - // 130 Stack commit size - ULONG StackCommit; - // 134 Heap reserve size - ULONG HeapReserve; - // 138 Heap commit size - ULONG HeapCommit; - // 13C PE base address (?) - PVOID PeBaseAddress; - // 140 PE image size (?) - ULONG PeImageSize; - // 144 PE checksum (?) - ULONG PeChecksum; - // 148 PE timestamp (?) - ULONG PeTimestamp; - // 14C PC path and filename to EXE file from which XBE is derived - PCSZ PcExePath; - // 150 PC filename (last part of PcExePath) from which XBE is derived - PCSZ PcExeFilename; - // 154 PC filename (Unicode version of PcExeFilename) - PWSTR PcExeFilenameUnicode; - // 158 Pointer to kernel thunk table (XOR'd; EFB1F152 debug) - ULONG_PTR *KernelThunkTable; - // 15C Non-kernel import table (debug only) - PVOID DebugImportTable; - // 160 Number of library headers - ULONG NumLibraries; - // 164 Pointer to library headers - struct _XBE_LIBRARY *Libraries; - // 168 Pointer to kernel library header - struct _XBE_LIBRARY *KernelLibrary; - // 16C Pointer to XAPI library - struct _XBE_LIBRARY *XapiLibrary; - // 170 Pointer to logo bitmap (NULL = use default of Microsoft) - PVOID LogoBitmap; - // 174 Size of logo bitmap - ULONG LogoBitmapSize; - // 178 -} XBE_HEADER, *PXBE_HEADER; - -// Certificate structure -typedef struct _XBE_CERTIFICATE { - // 000 Size of certificate - ULONG Size; - // 004 Certificate timestamp (unknown format) - ULONG Timestamp; - // 008 Title ID - ULONG TitleId; - // 00C Name of the game (Unicode) - WCHAR TitleName[40]; - // 05C Alternate title ID's (0-terminated) - ULONG AlternateTitleIds[16]; - // 09C Allowed media types - 1 bit match between XBE and media = boots - ULONG MediaTypes; - // 0A0 Allowed game regions - 1 bit match between this and XBOX = boots - ULONG GameRegion; - // 0A4 Allowed game ratings - 1 bit match between this and XBOX = boots - ULONG GameRating; - // 0A8 Disk number (?) - ULONG DiskNumber; - // 0AC Version (?) - ULONG Version; - // 0B0 LAN key for this game - UCHAR LanKey[16]; - // 0C0 Signature key for this game - UCHAR SignatureKey[16]; - // 0D0 Signature keys for the alternate title ID's - UCHAR AlternateSignatureKeys[16][16]; - // 1D0 -} XBE_CERTIFICATE, *PXBE_CERTIFICATE; - -// Section headers -typedef struct _XBE_SECTION { - // 000 Flags - ULONG Flags; - // 004 Virtual address (where this section loads in RAM) - PVOID VirtualAddress; - // 008 Virtual size (size of section in RAM; after FileSize it's 00'd) - ULONG VirtualSize; - // 00C File address (where in the file from which this section comes) - ULONG FileAddress; - // 010 File size (size of the section in the XBE file) - ULONG FileSize; - // 014 Pointer to section name - PCSZ SectionName; - // 018 Section reference count - when >= 1, section is loaded - LONG SectionReferenceCount; - // 01C Pointer to head shared page reference count - WORD *HeadReferenceCount; - // 020 Pointer to tail shared page reference count - WORD *TailReferenceCount; - // 024 SHA hash. Hash DWORD containing FileSize, then hash section. - DWORD ShaHash[5]; - // 038 -} XBE_SECTION, *PXBE_SECTION; - -/* TLS directory information needed later - * Library version data needed later */ - -/* Initialization flags */ -#define XBE_INIT_MOUNT_UTILITY 0x00000001 -#define XBE_INIT_FORMAT_UTILITY 0x00000002 -#define XBE_INIT_64M_RAM_ONLY 0x00000004 -#define XBE_INIT_DONT_SETUP_HDD 0x00000008 - -/* Region codes */ -#define XBE_REGION_US_CANADA 0x00000001 -#define XBE_REGION_JAPAN 0x00000002 -#define XBE_REGION_ELSEWHERE 0x00000004 -#define XBE_REGION_DEBUG 0x80000000 - -/* Media types */ -#define XBE_MEDIA_HDD 0x00000001 -#define XBE_MEDIA_XBOX_DVD 0x00000002 -#define XBE_MEDIA_ANY_CD_OR_DVD 0x00000004 -#define XBE_MEDIA_CD 0x00000008 -#define XBE_MEDIA_1LAYER_DVDROM 0x00000010 -#define XBE_MEDIA_2LAYER_DVDROM 0x00000020 -#define XBE_MEDIA_1LAYER_DVDR 0x00000040 -#define XBE_MEDIA_2LAYER_DVDR 0x00000080 -#define XBE_MEDIA_USB 0x00000100 -#define XBE_MEDIA_ALLOW_UNLOCKED_HDD 0x40000000 - -/* Section flags */ -#define XBE_SEC_WRITABLE 0x00000001 -#define XBE_SEC_PRELOAD 0x00000002 -#define XBE_SEC_EXECUTABLE 0x00000004 -#define XBE_SEC_INSERTED_FILE 0x00000008 -#define XBE_SEC_RO_HEAD_PAGE 0x00000010 -#define XBE_SEC_RO_TAIL_PAGE 0x00000020 - -/* x86 page size */ -#define PAGE_SIZE 0x1000 - -/* Native NT API calls on the XBOX */ - -/* PAGE_ALIGN: - * Returns an address rounded down to the nearest page boundary. - * - * Differences from NT: None. - */ -#define PAGE_ALIGN(Va) ((PVOID)((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1))) - -// NtReadFile: -// Reads a file. -// -// Differences from NT: There is no Key parameter. -NTSYSAPI -EXPORTNUM(219) -NTSTATUS -NTAPI -NtReadFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID Buffer, - IN ULONG Length, - IN PLARGE_INTEGER ByteOffset - ); - -// NtWriteFile: -// Writes a file. -// -// Differences from NT: There is no Key parameter. -NTSYSAPI -EXPORTNUM(236) -NTSTATUS -NTAPI -NtWriteFile( - IN HANDLE FileHandle, - IN HANDLE Event OPTIONAL, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PVOID Buffer, - IN ULONG Length, - IN PLARGE_INTEGER ByteOffset - ); - -// NtQueryVolumeInformation: -// Queries information about a file system. This is not documented by -// Microsoft even under NT. -// -// Differences from NT: None known. -NTSYSAPI -EXPORTNUM(218) -NTSTATUS -NTAPI -NtQueryVolumeInformationFile( - IN HANDLE FileHandle, - OUT PIO_STATUS_BLOCK IoStatusBlock, - OUT PVOID VolumeInformation, - IN ULONG VolumeInformationLength, - IN FS_INFORMATION_CLASS VolumeInformationClass - ); - -// NtClose: -// Closes a file or other handle. -// -// Differences from NT: None. -NTSYSAPI -EXPORTNUM(187) -NTSTATUS -NTAPI -NtClose( - IN HANDLE Handle - ); - -// NtAllocateVirtualMemory: -// Allocates virtual memory. -// -// Differences from NT: There is no ProcessHandle parameter. -NTSYSAPI -EXPORTNUM(184) -NTSTATUS -NTAPI -NtAllocateVirtualMemory( - IN OUT PVOID *BaseAddress, - IN ULONG ZeroBits, - IN OUT PULONG AllocationSize, - IN ULONG AllocationType, - IN ULONG Protect - ); - -// NtFreeVirtualMemory: -// Frees virtual memory. -// -// Differences from NT: There is no ProcessHandle parameter. -NTSYSAPI -EXPORTNUM(199) -NTSTATUS -NTAPI -NtFreeVirtualMemory( - IN OUT PVOID *BaseAddress, - IN OUT PULONG FreeSize, - IN ULONG FreeType - ); - - -// Kernel-level routines - -// MmMapIoSpace: -// Maps a physical address area into the virtual address space. -// DO NOT USE MEMORY MAPPED WITH THIS AS A BUFFER TO OTHER CALLS. For -// example, don't WriteFile or NtWriteFile these buffers. Copy them first. -// -// Differences from NT: PhysicalAddress is 32 bit, not 64. ProtectionType -// specifies the page protections, but it's a Win32 PAGE_ macro instead -// of the normal NT enumeration. PAGE_READWRITE is probably what you -// want... -NTSYSAPI -EXPORTNUM(177) -PVOID -NTAPI -MmMapIoSpace( - IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, - IN ULONG ProtectionType - ); - -// MmGetPhysicalAddress: -// Translates a virtual address into a physical address. -// -// Differences from NT: PhysicalAddress is 32 bit, not 64. -NTSYSAPI -EXPORTNUM(173) -PHYSICAL_ADDRESS -NTAPI -MmGetPhysicalAddress( - IN PVOID BaseAddress - ); - -// MmUnmapIoSpace: -// Unmaps a virtual address mapping made by MmMapIoSpace. -// -// Differences from NT: None. -NTSYSAPI -EXPORTNUM(183) -PVOID -NTAPI -MmUnmapIoSpace( - IN PVOID BaseAddress, - IN ULONG NumberOfBytes - ); - -// MmAllocateContiguousMemory: -// Allocates a range of physically contiguous, cache-aligned memory from the -// non-paged pool (= main pool on XBOX). -// -// Differences from NT: HighestAcceptableAddress was deleted, opting instead -// to not care about the highest address. -NTSYSAPI -EXPORTNUM(165) -PVOID -NTAPI -MmAllocateContiguousMemory( - IN ULONG NumberOfBytes - ); - -// MmFreeContiguousMemory: -// Frees memory allocated with MmAllocateContiguousMemory. -// -// Differences from NT: None. -NTSYSAPI -EXPORTNUM(171) -VOID -NTAPI -MmFreeContiguousMemory( - IN PVOID BaseAddress - ); - -// IoCreateSymbolicLink: -// Creates a symbolic link in the object namespace. -// NtCreateSymbolicLinkObject is much harder to use than this simple -// function, so just use this one. -// -// Differences from NT: Uses ANSI_STRING instead of UNICODE_STRING. -NTSYSAPI -EXPORTNUM(67) -NTSTATUS -NTAPI -IoCreateSymbolicLink( - IN PANSI_STRING SymbolicLinkName, - IN PANSI_STRING DeviceName - ); - -// IoDeleteSymbolicLink: -// Creates a symbolic link in the object namespace. Deleting symbolic links -// through the Nt* functions is a pain, so use this instead. -// -// Differences from NT: Uses ANSI_STRING instead of UNICODE_STRING. -NTSYSAPI -EXPORTNUM(69) -NTSTATUS -NTAPI -IoDeleteSymbolicLink( - IN PANSI_STRING SymbolicLinkName - ); - - -// ObReferenceObjectByHandle: -// Turns a handle into a kernel object pointer. The ObjectType parameter -// specifies what type of object it is. This function also increments the -// object's reference count. -// -// Differences from NT: There are no DesiredAccess, AccessMode, or -// HandleInformation parameters. -NTSYSAPI -EXPORTNUM(246) -NTSTATUS -NTAPI -ObReferenceObjectByHandle( - IN HANDLE Handle, - IN POBJECT_TYPE ObjectType OPTIONAL, - OUT PVOID *Object - ); - -// ObfReferenceObject/ObReferenceObject: -// Increments the object's reference count. -// -// Differences from NT: None. -#define ObReferenceObject(Object) ObfReferenceObject(Object) -NTSYSAPI -EXPORTNUM(251) -VOID -FASTCALL -ObfReferenceObject( - IN PVOID Object - ); - -// ObfDereferenceObject/ObDereferenceObject: -// Decrements the object's reference count, deleting it if it is now unused. -// -// Differences from NT: None. -#define ObDereferenceObject(a) ObfDereferenceObject(a) -NTSYSAPI -EXPORTNUM(250) -VOID -FASTCALL -ObfDereferenceObject( - IN PVOID Object - ); - -// Kernel routines only in the XBOX - -// HalEnableSecureTrayEject: -// Notifies the SMBUS that ejecting the DVD-ROM should not reset the system. -// Note that this function can't really be called directly... -// -// New to the XBOX. -NTSYSAPI -EXPORTNUM(365) -VOID -NTAPI -HalEnableSecureTrayEject( - VOID - ); - -// XeLoadSection: -// Adds one to the reference count of the specified section and loads if the -// count is now above zero. -// -// New to the XBOX. -NTSYSAPI -EXPORTNUM(327) -NTSTATUS -NTAPI -XeLoadSection( - IN OUT PXBE_SECTION section - ); - -/* Error codes */ -#define STATUS_SUCCESS 0x00000000 -#define STATUS_UNSUCCESSFUL 0xC0000001 -#define STATUS_UNRECOGNIZED_MEDIA 0xC0000014 - -/* The SCSI input buffer was too large (not necessarily an error!) */ -#define STATUS_DATA_OVERRUN 0xC000003C -#define STATUS_INVALID_IMAGE_FORMAT 0xC000007B -#define STATUS_INSUFFICIENT_RESOURCES 0xC000009A -#define STATUS_TOO_MANY_SECRETS 0xC0000156 -#define STATUS_REGION_MISMATCH 0xC0050001 - -#include - - // Thanks and credit go to Woodoo - extern VOID WINAPI HalWriteSMBusValue(BYTE, BYTE, BOOL, BYTE); - extern VOID WINAPI HalReadSMCTrayState(DWORD* state, DWORD* count); - - // Thanks and credit go to Team Evox - extern VOID WINAPI HalReturnToFirmware(DWORD); - - extern INT WINAPI XNetLoadConfigParams(LPBYTE); - extern INT WINAPI XNetSaveConfigParams(LPBYTE); - - extern INT WINAPI XWriteTitleInfoNoReboot(LPVOID,LPVOID,DWORD,DWORD,LPVOID); - - extern DWORD* LaunchDataPage; - -static HRESULT xbox_io_mount(char *szDrive, char *szDevice) -{ - STRING DeviceName, LinkName; -#ifndef IS_SALAMANDER - bool original_verbose = verbosity_is_enabled(); -#endif - char szSourceDevice[48] = {0}; - char szDestinationDrive[16] = {0}; - - snprintf(szSourceDevice, sizeof(szSourceDevice), - "\\Device\\%s", szDevice); - snprintf(szDestinationDrive, sizeof(szDestinationDrive), - "\\??\\%s", szDrive); - - DeviceName.Length = strlen(szSourceDevice); - DeviceName.MaximumLength = strlen(szSourceDevice) + 1; - DeviceName.Buffer = szSourceDevice; - - LinkName.Length = strlen(szDestinationDrive); - LinkName.MaximumLength = strlen(szDestinationDrive) + 1; - LinkName.Buffer = szDestinationDrive; - - IoCreateSymbolicLink(&LinkName, &DeviceName); - -#ifndef IS_SALAMANDER - if (original_verbose) - verbosity_enable(); - else - verbosity_disable(); -#endif - return S_OK; -} - -static HRESULT xbox_io_unmount(char *szDrive) -{ - STRING LinkName; - char szDestinationDrive[16] = {0}; - - snprintf(szDestinationDrive, sizeof(szDestinationDrive), - "\\??\\%s", szDrive); - - LinkName.Length = strlen(szDestinationDrive); - LinkName.MaximumLength = strlen(szDestinationDrive) + 1; - LinkName.Buffer = szDestinationDrive; - - IoDeleteSymbolicLink(&LinkName); - - return S_OK; -} -#endif - -#ifdef _XBOX360 -typedef struct _STRING -{ - USHORT Length; - USHORT MaximumLength; - PCHAR Buffer; -} STRING, *PSTRING; - -VOID RtlInitAnsiString(PSTRING DestinationString, PCHAR SourceString); -HRESULT ObDeleteSymbolicLink(PSTRING SymbolicLinkName); -HRESULT ObCreateSymbolicLink(PSTRING SymbolicLinkName, PSTRING DeviceName); - -static HRESULT xbox_io_mount(const char* szDrive, char* szDevice) -{ - STRING DeviceName, LinkName; - char szDestinationDrive[PATH_MAX_LENGTH]; - - snprintf(szDestinationDrive, sizeof(szDestinationDrive), - "\\??\\%s", szDrive); - RtlInitAnsiString(&DeviceName, szDevice); - RtlInitAnsiString(&LinkName, (PCHAR)szDestinationDrive); - ObDeleteSymbolicLink(&LinkName); - return (HRESULT)ObCreateSymbolicLink(&LinkName, &DeviceName); -} -#endif +#ifdef _XBOX1 +#include + +// Don't do __declspec(dllimport) for things like emulators +#if defined(NTSYSAPI) && defined(DONT_IMPORT_INTERNAL) +#undef NTSYSAPI +#endif +#ifdef DONT_IMPORT_INTERNAL +#define NTSYSAPI +#endif + +// The normal headers don't have this...? +#define FASTCALL __fastcall + +// The usual NTSTATUS +typedef LONG NTSTATUS; + +// The usual NT_SUCCESS +#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0) + +// Just for documentation +#define EXPORTNUM(x) + +// Needed for object structures and related things +typedef CONST SHORT CSHORT; + +// String types +typedef CHAR *PSZ; +typedef CONST CHAR *PCSZ; + +// ANSI_STRING +// Differences from NT: None. +typedef struct _STRING { + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} STRING; +typedef STRING *PSTRING; + +typedef STRING ANSI_STRING; +typedef PSTRING PANSI_STRING; + +// IO Status Block type (UNVERIFIED) +// Differences from NT: None. +typedef struct _IO_STATUS_BLOCK { + union { + NTSTATUS Status; + PVOID Pointer; + }; + + ULONG_PTR Information; +} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; + +// APC routine +typedef +VOID +(NTAPI *PIO_APC_ROUTINE) ( + IN PVOID ApcContext, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG Reserved + ); + +// Header for dispatcher objects +// Differences from NT: None. +typedef struct _DISPATCHER_HEADER { + UCHAR Type; + UCHAR Absolute; + UCHAR Size; + UCHAR Inserted; + LONG SignalState; + LIST_ENTRY WaitListHead; +} DISPATCHER_HEADER; + +// Object types +#define NotificationTimerObject 8 +#define SynchronizationTimerObject 9 +#define DpcObject 19 + +// Object Attributes type +// Differences from NT: There are no Length, SecurityDescriptor, or +// SecurityQualityOfService fields. Also, ObjectName is ANSI, not +// Unicode. +typedef struct _OBJECT_ATTRIBUTES { + HANDLE RootDirectory; + PANSI_STRING ObjectName; + ULONG Attributes; +} OBJECT_ATTRIBUTES; +typedef OBJECT_ATTRIBUTES *POBJECT_ATTRIBUTES; + +// Flags for OBJECT_ATTRIBUTES::Attributes +#define OBJ_INHERIT 0x00000002L +#define OBJ_PERMANENT 0x00000010L +#define OBJ_EXCLUSIVE 0x00000020L +#define OBJ_CASE_INSENSITIVE 0x00000040L +#define OBJ_OPENIF 0x00000080L +#define OBJ_OPENLINK 0x00000100L +#define OBJ_KERNEL_HANDLE 0x00000200L +#define OBJ_VALID_ATTRIBUTES 0x000003F2L + +// CreateDisposition values for NtCreateFile() +#define FILE_SUPERSEDE 0x00000000 +#define FILE_OPEN 0x00000001 +#define FILE_CREATE 0x00000002 +#define FILE_OPEN_IF 0x00000003 +#define FILE_OVERWRITE 0x00000004 +#define FILE_OVERWRITE_IF 0x00000005 +#define FILE_MAXIMUM_DISPOSITION 0x00000005 + +// CreateOption values for NtCreateFile() +// FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT is what CreateFile +// uses for most things when translating to NtCreateFile. +#define FILE_DIRECTORY_FILE 0x00000001 +#define FILE_WRITE_THROUGH 0x00000002 +#define FILE_SEQUENTIAL_ONLY 0x00000004 +#define FILE_NO_INTERMEDIATE_BUFFERING 0x00000008 +#define FILE_SYNCHRONOUS_IO_ALERT 0x00000010 +#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020 +#define FILE_NON_DIRECTORY_FILE 0x00000040 +#define FILE_CREATE_TREE_CONNECTION 0x00000080 +#define FILE_COMPLETE_IF_OPLOCKED 0x00000100 +#define FILE_NO_EA_KNOWLEDGE 0x00000200 +#define FILE_OPEN_FOR_RECOVERY 0x00000400 +#define FILE_RANDOM_ACCESS 0x00000800 +#define FILE_DELETE_ON_CLOSE 0x00001000 +#define FILE_OPEN_BY_FILE_ID 0x00002000 +#define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 +#define FILE_NO_COMPRESSION 0x00008000 +#define FILE_RESERVE_OPFILTER 0x00100000 +#define FILE_OPEN_REPARSE_POINT 0x00200000 +#define FILE_OPEN_NO_RECALL 0x00400000 +#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 +#define FILE_COPY_STRUCTURED_STORAGE 0x00000041 +#define FILE_STRUCTURED_STORAGE 0x00000441 +#define FILE_VALID_OPTION_FLAGS 0x00ffffff +#define FILE_VALID_PIPE_OPTION_FLAGS 0x00000032 +#define FILE_VALID_MAILSLOT_OPTION_FLAGS 0x00000032 +#define FILE_VALID_SET_FLAGS 0x00000036 + +// NtQueryVolumeInformation / NtSetVolumeInformation stuff +// Type of information to retrieve; FileFsSizeInformation and +// FileFsDeviceInformation are the only ones confirmed to work. +typedef enum _FSINFOCLASS { + FileFsVolumeInformation = 1, + FileFsLabelInformation, + FileFsSizeInformation, + FileFsDeviceInformation, + FileFsAttributeInformation, + FileFsControlInformation, + FileFsFullSizeInformation, + FileFsObjectInformation +} FS_INFORMATION_CLASS, *PFS_INFORMATION_CLASS; + +// Structure of FileFsSizeInformation +typedef struct _FILE_FS_SIZE_INFORMATION { + LARGE_INTEGER TotalAllocationUnits; + LARGE_INTEGER AvailableAllocationUnits; + ULONG SectorsPerAllocationUnit; + ULONG BytesPerSector; +} FILE_FS_SIZE_INFORMATION, *PFILE_FS_SIZE_INFORMATION; + +#define DEVICE_TYPE ULONG + +// Structure of FileFsDeviceInformation +typedef struct _FILE_FS_DEVICE_INFORMATION { + DEVICE_TYPE DeviceType; + ULONG Characteristics; +} FILE_FS_DEVICE_INFORMATION, *PFILE_FS_DEVICE_INFORMATION; + +// DEVICE_TYPEs (I took a guess as to which the XBOX might have.) +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_FILE_SYSTEM 0x00000009 +#define FILE_DEVICE_NULL 0x00000015 +#define FILE_DEVICE_SCREEN 0x0000001c +#define FILE_DEVICE_SOUND 0x0000001d +#define FILE_DEVICE_UNKNOWN 0x00000022 +#define FILE_DEVICE_VIDEO 0x00000023 +#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 +#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 + +// Characteristics +#define FILE_REMOVABLE_MEDIA 0x00000001 +#define FILE_READ_ONLY_DEVICE 0x00000002 +#define FILE_FLOPPY_DISKETTE 0x00000004 +#define FILE_WRITE_ONCE_MEDIA 0x00000008 +#define FILE_REMOTE_DEVICE 0x00000010 +#define FILE_DEVICE_IS_MOUNTED 0x00000020 +#define FILE_VIRTUAL_VOLUME 0x00000040 +#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 +#define FILE_DEVICE_SECURE_OPEN 0x00000100 + +/* Physical address + * Differences from NT: 32 bit address instead of 64. */ +typedef ULONG PHYSICAL_ADDRESS, *PPHYSICAL_ADDRESS; + +/* NtCreateFile/NtOpenFile stuff */ +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 + +// NtReadFile/NtWriteFile stuff +#define FILE_WRITE_TO_END_OF_FILE 0xffffffff +#define FILE_USE_FILE_POINTER_POSITION 0xfffffffe + +// Device types +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_SCSI FILE_DEVICE_CONTROLLER +#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_DVD 0x00000033 + +// Access types +#define FILE_ANY_ACCESS 0 +#define FILE_READ_ACCESS 0x0001 /* file & pipe */ +#define FILE_WRITE_ACCESS 0x0002 /* file & pipe */ + +// Method types +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +// The all-important CTL_CODE +#define CTL_CODE( DeviceType, Function, Method, Access ) ( \ + ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method) \ +) + +// IDE/SCSI codes +// IOCTL_SCSI_PASS_THROUGH_DIRECT is the only one known to be used. +// Differences from NT: None. +#define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_SCSI_MINIPORT CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_SCSI_GET_INQUIRY_DATA CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SCSI_GET_CAPABILITIES CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SCSI_PASS_THROUGH_DIRECT CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_SCSI_GET_ADDRESS CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SCSI_RESCAN_BUS CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SCSI_GET_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0408, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_SCSI_FREE_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0409, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_IDE_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x040a, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) + +// Special XBOX code? +#define IOCTL_CDROM_AUTHENTICATE_DISK CTL_CODE(FILE_DEVICE_CD_ROM, 0x0020, METHOD_BUFFERED, FILE_READ_ACCESS) + +/* Structure for IOCTL_SCSI_PASS_THROUGH_DIRECT + * Differences from NT: None, believe it or not. */ +typedef struct _SCSI_PASS_THROUGH_DIRECT { + /*000*/ USHORT Length; + /*002*/ UCHAR ScsiStatus; + /*003*/ UCHAR PathId; + /*004*/ UCHAR TargetId; + /*005*/ UCHAR Lun; + /*006*/ UCHAR CdbLength; + /*007*/ UCHAR SenseInfoLength; + /*008*/ UCHAR DataIn; + /*00C*/ ULONG DataTransferLength; + /*010*/ ULONG TimeOutValue; + /*014*/ PVOID DataBuffer; + /*018*/ ULONG SenseInfoOffset; + /*01C*/ UCHAR Cdb[16]; +}SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; + +/* DataIn fields for IOCTL_SCSI_PASS_THROUGH_DIRECT */ +#define SCSI_IOCTL_DATA_OUT 0 +#define SCSI_IOCTL_DATA_IN 1 +#define SCSI_IOCTL_DATA_UNSPECIFIED 2 + +/* Kernel object type (unsure about the structure...) */ +typedef struct _OBJECT_TYPE +{ + // Same prototype as ExAllocatePoolWithTag, because that's the usual one + PVOID + (NTAPI *AllocationFunction)( + SIZE_T NumberOfBytes, + ULONG Tag + ); + + // Same prototype as ExFreePool, because that's the usual one + VOID + (NTAPI *FreeFunction)( + IN PVOID P + ); + + // The prototypes of these are unknown + void *CloseFunction; + void *DeleteFunction; + void *ParseFunction; + + // Unknown DWORD... Size of this object type maybe? + void *DefaultObjectMaybe; + + // 4 letter tag for this object type + CHAR Tag[4]; +} OBJECT_TYPE; +typedef OBJECT_TYPE *POBJECT_TYPE; + +// Object types +extern POBJECT_TYPE IoFileObjectType; +extern POBJECT_TYPE ExEventObjectType; +extern POBJECT_TYPE ExSemaphoreObjectType; +extern POBJECT_TYPE IoCompletionObjectType; +extern POBJECT_TYPE IoDeviceObjectType; + +// *_OBJECT and related structures (mostly opaque since I'm lazy) +typedef struct _DRIVER_OBJECT { + CSHORT Type; + CSHORT Size; + struct _DEVICE_OBJECT *DeviceObject; + // ... +} DRIVER_OBJECT; +typedef DRIVER_OBJECT *PDRIVER_OBJECT; + +typedef struct _DEVICE_OBJECT { + CSHORT Type; + USHORT Size; + LONG ReferenceCount; + PDRIVER_OBJECT DriverObject; + // ... +} DEVICE_OBJECT; +typedef DEVICE_OBJECT *PDEVICE_OBJECT; + +typedef struct _FILE_OBJECT { + CSHORT Type; + CSHORT Size; + PDEVICE_OBJECT DeviceObject; + // ... +} FILE_OBJECT; +typedef FILE_OBJECT *PFILE_OBJECT; + +/* Thread information structures */ + +/* IRQL */ +typedef UCHAR KIRQL, *PKIRQL; +#define PASSIVE_LEVEL 0 // Passive release level +#define LOW_LEVEL 0 // Lowest interrupt level +#define APC_LEVEL 1 // APC interrupt level +#define DISPATCH_LEVEL 2 // Dispatcher level + +// Thread entry point +// NOTE: This is not a standard call! You can't call this function from C code! +// You push registers like stdcall, but ebp + 4 must point to the first argument before the call! +// +// Differences from NT: 2 parameters instead of 1; strange calling convention +typedef +VOID +(NTAPI *PKSTART_ROUTINE) ( + IN PVOID StartContext1, + IN PVOID StartContext2 + ); + +// Structure of a critical section +// Same as the XBOX's RTL_CRITICAL_SECTION, but with the more explicit header +typedef struct _KCRITICAL_SECTION +{ + // 000 Dispatcher header + DISPATCHER_HEADER Header; + // 010 Lock count of the critical section + LONG LockCount; + // 014 Recursion count of the critical section + LONG RecursionCount; + // 018 Thread ID of the thread that currently owns this critical section + ULONG OwningThread; +} KCRITICAL_SECTION, *PKCRITICAL_SECTION; + +// Structure of a thread object +typedef struct _KTHREAD +{ + // 000 Dispatcher header + DISPATCHER_HEADER Header; + // 010 Unknown + BYTE unknown[0x18]; + // 028 Pointer to TLS data + PVOID TlsData; + // ??? just padding - real size is unknown + BYTE unknown2[0x100]; +} KTHREAD, *PKTHREAD; + +// Structure of the data at FS +typedef struct _FS_STRUCTURE +{ + // 000 Current exception handler information + PVOID *ExceptionFrame; + // 004 Pointer to current TLS data top + PVOID TlsDataTop; + // 008 + BYTE unknown2[0x1C]; + // 024 Current IRQL of the OS + KIRQL CurrentIrql; + // 028 Thread structure of the current thread + PKTHREAD ThreadObject; + // ??? just padding - real size is unknown + BYTE unknown3[0x100]; +} FS_STRUCTURE, *PFS_STRUCTURE; + +// DPC routine +typedef +VOID +(*PKDEFERRED_ROUTINE) ( + IN struct _KDPC *Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2 + ); + +// DPC information +// It's not known which of these fields are used on XBOX. +typedef struct _KDPC { + CSHORT Type; + UCHAR Number; + UCHAR Importance; + LIST_ENTRY DpcListEntry; + PKDEFERRED_ROUTINE DeferredRoutine; + PVOID DeferredContext; + PVOID SystemArgument1; + PVOID SystemArgument2; + PULONG_PTR Lock; +} KDPC, *PKDPC; + +// Timers +typedef enum _TIMER_TYPE { + NotificationTimer, + SynchronizationTimer + } TIMER_TYPE; + +typedef struct _KTIMER { + DISPATCHER_HEADER Header; + ULARGE_INTEGER DueTime; + LIST_ENTRY TimerListEntry; + struct _KDPC *Dpc; + LONG Period; +} KTIMER, *PKTIMER; + +/* XBE stuff + * Not used in any exported kernel calls, but still useful. + */ + +/* XBE header information */ +typedef struct _XBE_HEADER +{ + // 000 "XBEH" + CHAR Magic[4]; + // 004 RSA digital signature of the entire header area + UCHAR HeaderSignature[256]; + // 104 Base address of XBE image (must be 0x00010000?) + PVOID BaseAddress; + // 108 Size of all headers combined - other headers must be within this + ULONG HeaderSize; + // 10C Size of entire image + ULONG ImageSize; + // 110 Size of this header (always 0x178?) + ULONG XbeHeaderSize; + // 114 Image timestamp - unknown format + ULONG Timestamp; + // 118 Pointer to certificate data (must be within HeaderSize) + struct _XBE_CERTIFICATE *Certificate; + // 11C Number of sections + DWORD NumSections; + // 120 Pointer to section headers (must be within HeaderSize) + struct _XBE_SECTION *Sections; + // 124 Initialization flags + ULONG InitFlags; + // 128 Entry point (XOR'd; see xboxhacker.net) + PVOID EntryPoint; + // 12C Pointer to TLS directory + struct _XBE_TLS_DIRECTORY *TlsDirectory; + // 130 Stack commit size + ULONG StackCommit; + // 134 Heap reserve size + ULONG HeapReserve; + // 138 Heap commit size + ULONG HeapCommit; + // 13C PE base address (?) + PVOID PeBaseAddress; + // 140 PE image size (?) + ULONG PeImageSize; + // 144 PE checksum (?) + ULONG PeChecksum; + // 148 PE timestamp (?) + ULONG PeTimestamp; + // 14C PC path and filename to EXE file from which XBE is derived + PCSZ PcExePath; + // 150 PC filename (last part of PcExePath) from which XBE is derived + PCSZ PcExeFilename; + // 154 PC filename (Unicode version of PcExeFilename) + PWSTR PcExeFilenameUnicode; + // 158 Pointer to kernel thunk table (XOR'd; EFB1F152 debug) + ULONG_PTR *KernelThunkTable; + // 15C Non-kernel import table (debug only) + PVOID DebugImportTable; + // 160 Number of library headers + ULONG NumLibraries; + // 164 Pointer to library headers + struct _XBE_LIBRARY *Libraries; + // 168 Pointer to kernel library header + struct _XBE_LIBRARY *KernelLibrary; + // 16C Pointer to XAPI library + struct _XBE_LIBRARY *XapiLibrary; + // 170 Pointer to logo bitmap (NULL = use default of Microsoft) + PVOID LogoBitmap; + // 174 Size of logo bitmap + ULONG LogoBitmapSize; + // 178 +} XBE_HEADER, *PXBE_HEADER; + +// Certificate structure +typedef struct _XBE_CERTIFICATE { + // 000 Size of certificate + ULONG Size; + // 004 Certificate timestamp (unknown format) + ULONG Timestamp; + // 008 Title ID + ULONG TitleId; + // 00C Name of the game (Unicode) + WCHAR TitleName[40]; + // 05C Alternate title ID's (0-terminated) + ULONG AlternateTitleIds[16]; + // 09C Allowed media types - 1 bit match between XBE and media = boots + ULONG MediaTypes; + // 0A0 Allowed game regions - 1 bit match between this and XBOX = boots + ULONG GameRegion; + // 0A4 Allowed game ratings - 1 bit match between this and XBOX = boots + ULONG GameRating; + // 0A8 Disk number (?) + ULONG DiskNumber; + // 0AC Version (?) + ULONG Version; + // 0B0 LAN key for this game + UCHAR LanKey[16]; + // 0C0 Signature key for this game + UCHAR SignatureKey[16]; + // 0D0 Signature keys for the alternate title ID's + UCHAR AlternateSignatureKeys[16][16]; + // 1D0 +} XBE_CERTIFICATE, *PXBE_CERTIFICATE; + +// Section headers +typedef struct _XBE_SECTION { + // 000 Flags + ULONG Flags; + // 004 Virtual address (where this section loads in RAM) + PVOID VirtualAddress; + // 008 Virtual size (size of section in RAM; after FileSize it's 00'd) + ULONG VirtualSize; + // 00C File address (where in the file from which this section comes) + ULONG FileAddress; + // 010 File size (size of the section in the XBE file) + ULONG FileSize; + // 014 Pointer to section name + PCSZ SectionName; + // 018 Section reference count - when >= 1, section is loaded + LONG SectionReferenceCount; + // 01C Pointer to head shared page reference count + WORD *HeadReferenceCount; + // 020 Pointer to tail shared page reference count + WORD *TailReferenceCount; + // 024 SHA hash. Hash DWORD containing FileSize, then hash section. + DWORD ShaHash[5]; + // 038 +} XBE_SECTION, *PXBE_SECTION; + +/* TLS directory information needed later + * Library version data needed later */ + +/* Initialization flags */ +#define XBE_INIT_MOUNT_UTILITY 0x00000001 +#define XBE_INIT_FORMAT_UTILITY 0x00000002 +#define XBE_INIT_64M_RAM_ONLY 0x00000004 +#define XBE_INIT_DONT_SETUP_HDD 0x00000008 + +/* Region codes */ +#define XBE_REGION_US_CANADA 0x00000001 +#define XBE_REGION_JAPAN 0x00000002 +#define XBE_REGION_ELSEWHERE 0x00000004 +#define XBE_REGION_DEBUG 0x80000000 + +/* Media types */ +#define XBE_MEDIA_HDD 0x00000001 +#define XBE_MEDIA_XBOX_DVD 0x00000002 +#define XBE_MEDIA_ANY_CD_OR_DVD 0x00000004 +#define XBE_MEDIA_CD 0x00000008 +#define XBE_MEDIA_1LAYER_DVDROM 0x00000010 +#define XBE_MEDIA_2LAYER_DVDROM 0x00000020 +#define XBE_MEDIA_1LAYER_DVDR 0x00000040 +#define XBE_MEDIA_2LAYER_DVDR 0x00000080 +#define XBE_MEDIA_USB 0x00000100 +#define XBE_MEDIA_ALLOW_UNLOCKED_HDD 0x40000000 + +/* Section flags */ +#define XBE_SEC_WRITABLE 0x00000001 +#define XBE_SEC_PRELOAD 0x00000002 +#define XBE_SEC_EXECUTABLE 0x00000004 +#define XBE_SEC_INSERTED_FILE 0x00000008 +#define XBE_SEC_RO_HEAD_PAGE 0x00000010 +#define XBE_SEC_RO_TAIL_PAGE 0x00000020 + +/* x86 page size */ +#define PAGE_SIZE 0x1000 + +/* Native NT API calls on the XBOX */ + +/* PAGE_ALIGN: + * Returns an address rounded down to the nearest page boundary. + * + * Differences from NT: None. + */ +#define PAGE_ALIGN(Va) ((PVOID)((ULONG_PTR)(Va) & ~(PAGE_SIZE - 1))) + +// NtReadFile: +// Reads a file. +// +// Differences from NT: There is no Key parameter. +NTSYSAPI +EXPORTNUM(219) +NTSTATUS +NTAPI +NtReadFile( + IN HANDLE FileHandle, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER ByteOffset + ); + +// NtWriteFile: +// Writes a file. +// +// Differences from NT: There is no Key parameter. +NTSYSAPI +EXPORTNUM(236) +NTSTATUS +NTAPI +NtWriteFile( + IN HANDLE FileHandle, + IN HANDLE Event OPTIONAL, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER ByteOffset + ); + +// NtQueryVolumeInformation: +// Queries information about a file system. This is not documented by +// Microsoft even under NT. +// +// Differences from NT: None known. +NTSYSAPI +EXPORTNUM(218) +NTSTATUS +NTAPI +NtQueryVolumeInformationFile( + IN HANDLE FileHandle, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID VolumeInformation, + IN ULONG VolumeInformationLength, + IN FS_INFORMATION_CLASS VolumeInformationClass + ); + +// NtClose: +// Closes a file or other handle. +// +// Differences from NT: None. +NTSYSAPI +EXPORTNUM(187) +NTSTATUS +NTAPI +NtClose( + IN HANDLE Handle + ); + +// NtAllocateVirtualMemory: +// Allocates virtual memory. +// +// Differences from NT: There is no ProcessHandle parameter. +NTSYSAPI +EXPORTNUM(184) +NTSTATUS +NTAPI +NtAllocateVirtualMemory( + IN OUT PVOID *BaseAddress, + IN ULONG ZeroBits, + IN OUT PULONG AllocationSize, + IN ULONG AllocationType, + IN ULONG Protect + ); + +// NtFreeVirtualMemory: +// Frees virtual memory. +// +// Differences from NT: There is no ProcessHandle parameter. +NTSYSAPI +EXPORTNUM(199) +NTSTATUS +NTAPI +NtFreeVirtualMemory( + IN OUT PVOID *BaseAddress, + IN OUT PULONG FreeSize, + IN ULONG FreeType + ); + +// Kernel-level routines + +// MmMapIoSpace: +// Maps a physical address area into the virtual address space. +// DO NOT USE MEMORY MAPPED WITH THIS AS A BUFFER TO OTHER CALLS. For +// example, don't WriteFile or NtWriteFile these buffers. Copy them first. +// +// Differences from NT: PhysicalAddress is 32 bit, not 64. ProtectionType +// specifies the page protections, but it's a Win32 PAGE_ macro instead +// of the normal NT enumeration. PAGE_READWRITE is probably what you +// want... +NTSYSAPI +EXPORTNUM(177) +PVOID +NTAPI +MmMapIoSpace( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberOfBytes, + IN ULONG ProtectionType + ); + +// MmGetPhysicalAddress: +// Translates a virtual address into a physical address. +// +// Differences from NT: PhysicalAddress is 32 bit, not 64. +NTSYSAPI +EXPORTNUM(173) +PHYSICAL_ADDRESS +NTAPI +MmGetPhysicalAddress( + IN PVOID BaseAddress + ); + +// MmUnmapIoSpace: +// Unmaps a virtual address mapping made by MmMapIoSpace. +// +// Differences from NT: None. +NTSYSAPI +EXPORTNUM(183) +PVOID +NTAPI +MmUnmapIoSpace( + IN PVOID BaseAddress, + IN ULONG NumberOfBytes + ); + +// MmAllocateContiguousMemory: +// Allocates a range of physically contiguous, cache-aligned memory from the +// non-paged pool (= main pool on XBOX). +// +// Differences from NT: HighestAcceptableAddress was deleted, opting instead +// to not care about the highest address. +NTSYSAPI +EXPORTNUM(165) +PVOID +NTAPI +MmAllocateContiguousMemory( + IN ULONG NumberOfBytes + ); + +// MmFreeContiguousMemory: +// Frees memory allocated with MmAllocateContiguousMemory. +// +// Differences from NT: None. +NTSYSAPI +EXPORTNUM(171) +VOID +NTAPI +MmFreeContiguousMemory( + IN PVOID BaseAddress + ); + +// IoCreateSymbolicLink: +// Creates a symbolic link in the object namespace. +// NtCreateSymbolicLinkObject is much harder to use than this simple +// function, so just use this one. +// +// Differences from NT: Uses ANSI_STRING instead of UNICODE_STRING. +NTSYSAPI +EXPORTNUM(67) +NTSTATUS +NTAPI +IoCreateSymbolicLink( + IN PANSI_STRING SymbolicLinkName, + IN PANSI_STRING DeviceName + ); + +// IoDeleteSymbolicLink: +// Creates a symbolic link in the object namespace. Deleting symbolic links +// through the Nt* functions is a pain, so use this instead. +// +// Differences from NT: Uses ANSI_STRING instead of UNICODE_STRING. +NTSYSAPI +EXPORTNUM(69) +NTSTATUS +NTAPI +IoDeleteSymbolicLink( + IN PANSI_STRING SymbolicLinkName + ); + +// ObReferenceObjectByHandle: +// Turns a handle into a kernel object pointer. The ObjectType parameter +// specifies what type of object it is. This function also increments the +// object's reference count. +// +// Differences from NT: There are no DesiredAccess, AccessMode, or +// HandleInformation parameters. +NTSYSAPI +EXPORTNUM(246) +NTSTATUS +NTAPI +ObReferenceObjectByHandle( + IN HANDLE Handle, + IN POBJECT_TYPE ObjectType OPTIONAL, + OUT PVOID *Object + ); + +// ObfReferenceObject/ObReferenceObject: +// Increments the object's reference count. +// +// Differences from NT: None. +#define ObReferenceObject(Object) ObfReferenceObject(Object) +NTSYSAPI +EXPORTNUM(251) +VOID +FASTCALL +ObfReferenceObject( + IN PVOID Object + ); + +// ObfDereferenceObject/ObDereferenceObject: +// Decrements the object's reference count, deleting it if it is now unused. +// +// Differences from NT: None. +#define ObDereferenceObject(a) ObfDereferenceObject(a) +NTSYSAPI +EXPORTNUM(250) +VOID +FASTCALL +ObfDereferenceObject( + IN PVOID Object + ); + +// Kernel routines only in the XBOX + +// HalEnableSecureTrayEject: +// Notifies the SMBUS that ejecting the DVD-ROM should not reset the system. +// Note that this function can't really be called directly... +// +// New to the XBOX. +NTSYSAPI +EXPORTNUM(365) +VOID +NTAPI +HalEnableSecureTrayEject( + VOID + ); + +// XeLoadSection: +// Adds one to the reference count of the specified section and loads if the +// count is now above zero. +// +// New to the XBOX. +NTSYSAPI +EXPORTNUM(327) +NTSTATUS +NTAPI +XeLoadSection( + IN OUT PXBE_SECTION section + ); + +/* Error codes */ +#define STATUS_SUCCESS 0x00000000 +#define STATUS_UNSUCCESSFUL 0xC0000001 +#define STATUS_UNRECOGNIZED_MEDIA 0xC0000014 + +/* The SCSI input buffer was too large (not necessarily an error!) */ +#define STATUS_DATA_OVERRUN 0xC000003C +#define STATUS_INVALID_IMAGE_FORMAT 0xC000007B +#define STATUS_INSUFFICIENT_RESOURCES 0xC000009A +#define STATUS_TOO_MANY_SECRETS 0xC0000156 +#define STATUS_REGION_MISMATCH 0xC0050001 + +#include + + // Thanks and credit go to Woodoo + extern VOID WINAPI HalWriteSMBusValue(BYTE, BYTE, BOOL, BYTE); + extern VOID WINAPI HalReadSMCTrayState(DWORD* state, DWORD* count); + + // Thanks and credit go to Team Evox + extern VOID WINAPI HalReturnToFirmware(DWORD); + + extern INT WINAPI XNetLoadConfigParams(LPBYTE); + extern INT WINAPI XNetSaveConfigParams(LPBYTE); + + extern INT WINAPI XWriteTitleInfoNoReboot(LPVOID,LPVOID,DWORD,DWORD,LPVOID); + + extern DWORD* LaunchDataPage; + +static HRESULT xbox_io_mount(char *szDrive, char *szDevice) +{ + STRING DeviceName, LinkName; +#ifndef IS_SALAMANDER + bool original_verbose = verbosity_is_enabled(); +#endif + char szSourceDevice[48] = {0}; + char szDestinationDrive[16] = {0}; + + snprintf(szSourceDevice, sizeof(szSourceDevice), + "\\Device\\%s", szDevice); + snprintf(szDestinationDrive, sizeof(szDestinationDrive), + "\\??\\%s", szDrive); + + DeviceName.Length = strlen(szSourceDevice); + DeviceName.MaximumLength = strlen(szSourceDevice) + 1; + DeviceName.Buffer = szSourceDevice; + + LinkName.Length = strlen(szDestinationDrive); + LinkName.MaximumLength = strlen(szDestinationDrive) + 1; + LinkName.Buffer = szDestinationDrive; + + IoCreateSymbolicLink(&LinkName, &DeviceName); + +#ifndef IS_SALAMANDER + if (original_verbose) + verbosity_enable(); + else + verbosity_disable(); +#endif + return S_OK; +} + +static HRESULT xbox_io_unmount(char *szDrive) +{ + STRING LinkName; + char szDestinationDrive[16] = {0}; + + snprintf(szDestinationDrive, sizeof(szDestinationDrive), + "\\??\\%s", szDrive); + + LinkName.Length = strlen(szDestinationDrive); + LinkName.MaximumLength = strlen(szDestinationDrive) + 1; + LinkName.Buffer = szDestinationDrive; + + IoDeleteSymbolicLink(&LinkName); + + return S_OK; +} +#endif + +#ifdef _XBOX360 +typedef struct _STRING +{ + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} STRING, *PSTRING; + +VOID RtlInitAnsiString(PSTRING DestinationString, PCHAR SourceString); +HRESULT ObDeleteSymbolicLink(PSTRING SymbolicLinkName); +HRESULT ObCreateSymbolicLink(PSTRING SymbolicLinkName, PSTRING DeviceName); + +static HRESULT xbox_io_mount(const char* szDrive, char* szDevice) +{ + STRING DeviceName, LinkName; + char szDestinationDrive[PATH_MAX_LENGTH]; + + snprintf(szDestinationDrive, sizeof(szDestinationDrive), + "\\??\\%s", szDrive); + RtlInitAnsiString(&DeviceName, szDevice); + RtlInitAnsiString(&LinkName, (PCHAR)szDestinationDrive); + ObDeleteSymbolicLink(&LinkName); + return (HRESULT)ObCreateSymbolicLink(&LinkName, &DeviceName); +} +#endif diff --git a/gfx/common/d3d10_common.c b/gfx/common/d3d10_common.c index 16a35b9c57..3a44fbffdf 100644 --- a/gfx/common/d3d10_common.c +++ b/gfx/common/d3d10_common.c @@ -246,7 +246,7 @@ bool d3d10_init_shader( if (vs_code && input_element_descs) D3D10CreateInputLayout( - device, + device, (D3D10_INPUT_ELEMENT_DESC*)input_element_descs, num_elements, D3DGetBufferPointer(vs_code), D3DGetBufferSize(vs_code), &out->layout); diff --git a/gfx/common/d3d8_common.c b/gfx/common/d3d8_common.c index 2da33c8eb6..3b5af8ef95 100644 --- a/gfx/common/d3d8_common.c +++ b/gfx/common/d3d8_common.c @@ -15,7 +15,7 @@ #define CINTERFACE -/* For Xbox we will just link statically +/* For Xbox we will just link statically * to Direct3D libraries instead. */ #if !defined(_XBOX) && defined(HAVE_DYLIB) @@ -113,7 +113,7 @@ bool d3d8_initialize_symbols(enum gfx_ctx_api api) if (!g_d3d8_dll) return false; #endif - + SDKVersion = 220; #ifdef HAVE_DYNAMIC_D3D D3DCreate = (D3DCreate_t)dylib_proc(g_d3d8_dll, "Direct3DCreate8"); diff --git a/gfx/common/d3d8_common.h b/gfx/common/d3d8_common.h index bb874a95ab..556086440b 100644 --- a/gfx/common/d3d8_common.h +++ b/gfx/common/d3d8_common.h @@ -72,7 +72,7 @@ typedef struct d3d8_video static INLINE bool d3d8_swap(void *data, LPDIRECT3DDEVICE8 dev) { - if (IDirect3DDevice8_Present(dev, NULL, NULL, NULL, NULL) + if (IDirect3DDevice8_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST) return false; return true; @@ -388,7 +388,7 @@ static INLINE void d3d8_device_set_render_target( static INLINE bool d3d8_get_render_state(LPDIRECT3DDEVICE8 dev, D3DRENDERSTATETYPE state, DWORD *value) { - if (dev && + if (dev && IDirect3DDevice8_GetRenderState(dev, state, value) == D3D_OK) return true; return false; @@ -433,8 +433,8 @@ bool d3d8_create_device(void *dev, bool d3d8_reset(void *dev, void *d3dpp); static INLINE bool d3d8_device_get_backbuffer( - LPDIRECT3DDEVICE8 dev, - unsigned idx, unsigned swapchain_idx, + LPDIRECT3DDEVICE8 dev, + unsigned idx, unsigned swapchain_idx, unsigned backbuffer_type, void **data) { if (dev && diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c index dd302671a4..c78caaad59 100644 --- a/gfx/common/d3d9_common.c +++ b/gfx/common/d3d9_common.c @@ -15,7 +15,7 @@ #define CINTERFACE -/* For Xbox we will just link statically +/* For Xbox we will just link statically * to Direct3D libraries instead. */ #if !defined(_XBOX) && defined(HAVE_DYLIB) @@ -115,7 +115,7 @@ void *d3d9_create(void) #ifdef HAVE_DYNAMIC_D3D #ifdef HAVE_D3DX -static const char *d3dx9_dll_list[] = +static const char *d3dx9_dll_list[] = { "d3dx9_24.dll", "d3dx9_25.dll", @@ -176,7 +176,7 @@ bool d3d9_initialize_symbols(enum gfx_ctx_api api) if (!g_d3d9_dll) return false; #endif - + d3d9_SDKVersion = 31; #ifdef HAVE_DYNAMIC_D3D D3D9Create = (D3D9Create_t)dylib_proc(g_d3d9_dll, "Direct3DCreate9"); @@ -301,7 +301,7 @@ void *d3d9_vertex_buffer_new(void *_dev, if (usage == 0) if (IDirect3DDevice9_GetSoftwareVertexProcessing(dev)) usage = D3DUSAGE_SOFTWAREPROCESSING; -#endif +#endif if (FAILED(IDirect3DDevice9_CreateVertexBuffer( dev, length, usage, fvf, @@ -316,7 +316,7 @@ void d3d9_vertex_buffer_free(void *vertex_data, void *vertex_declaration) { if (vertex_data) { - LPDIRECT3DVERTEXBUFFER9 buf = + LPDIRECT3DVERTEXBUFFER9 buf = (LPDIRECT3DVERTEXBUFFER9)vertex_data; IDirect3DVertexBuffer9_Release(buf); buf = NULL; @@ -324,7 +324,7 @@ void d3d9_vertex_buffer_free(void *vertex_data, void *vertex_declaration) if (vertex_declaration) { - LPDIRECT3DVERTEXDECLARATION9 vertex_decl = + LPDIRECT3DVERTEXDECLARATION9 vertex_decl = (LPDIRECT3DVERTEXDECLARATION9)vertex_declaration; d3d9_vertex_declaration_free(vertex_decl); vertex_decl = NULL; @@ -336,7 +336,7 @@ static bool d3d9_reset_internal(void *data, ) { LPDIRECT3DDEVICE9 dev = (LPDIRECT3DDEVICE9)data; - if (dev && + if (dev && IDirect3DDevice9_Reset(dev, d3dpp) == D3D_OK) return true; @@ -576,7 +576,7 @@ void d3d9x_constant_table_set_float_array(LPDIRECT3DDEVICE9 dev, D3DXHANDLE handle = (D3DXHANDLE)_handle; CONST FLOAT *pf = (CONST FLOAT*)_pf; if (consttbl && dev) - consttbl->lpVtbl->SetFloatArray(consttbl, dev, handle, pf, + consttbl->lpVtbl->SetFloatArray(consttbl, dev, handle, pf, (UINT)count); #endif } diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h index d99201132e..992447dcf6 100644 --- a/gfx/common/d3d9_common.h +++ b/gfx/common/d3d9_common.h @@ -111,7 +111,7 @@ static INLINE bool d3d9_swap(void *data, LPDIRECT3DDEVICE9 dev) #ifdef _XBOX IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL); #else - if (IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL) + if (IDirect3DDevice9_Present(dev, NULL, NULL, NULL, NULL) == D3DERR_DEVICELOST) return false; #endif @@ -161,7 +161,7 @@ static INLINE bool d3d9_texture_get_surface_level( LPDIRECT3DTEXTURE9 tex, unsigned idx, void **_ppsurface_level) { - if (tex && + if (tex && SUCCEEDED(IDirect3DTexture9_GetSurfaceLevel( tex, idx, (IDirect3DSurface9**)_ppsurface_level))) return true; @@ -485,7 +485,7 @@ static INLINE void d3d9_disable_blend_func(LPDIRECT3DDEVICE9 dev) d3d9_set_render_state(dev, D3DRS_ALPHABLENDENABLE, false); } -static INLINE void +static INLINE void d3d9_set_vertex_declaration(LPDIRECT3DDEVICE9 dev, LPDIRECT3DVERTEXDECLARATION9 vertex_data) { @@ -646,13 +646,13 @@ bool d3d9_create_device(void *dev, bool d3d9_reset(void *dev, void *d3dpp); static INLINE bool d3d9_device_get_backbuffer( - LPDIRECT3DDEVICE9 dev, - unsigned idx, unsigned swapchain_idx, + LPDIRECT3DDEVICE9 dev, + unsigned idx, unsigned swapchain_idx, unsigned backbuffer_type, void **data) { if (dev && - SUCCEEDED(IDirect3DDevice9_GetBackBuffer(dev, - swapchain_idx, idx, + SUCCEEDED(IDirect3DDevice9_GetBackBuffer(dev, + swapchain_idx, idx, (D3DBACKBUFFER_TYPE)backbuffer_type, (LPDIRECT3DSURFACE9*)data))) return true; diff --git a/gfx/common/d3d_common.c b/gfx/common/d3d_common.c index 8e8fff7099..e7af7248f6 100644 --- a/gfx/common/d3d_common.c +++ b/gfx/common/d3d_common.c @@ -88,9 +88,9 @@ void *d3d_matrix_multiply(void *_pout, for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) - pout->m[i][j] = pm1->m[i][0] * - pm2->m[0][j] + pm1->m[i][1] * pm2->m[1][j] + - pm1->m[i][2] * pm2->m[2][j] + + pout->m[i][j] = pm1->m[i][0] * + pm2->m[0][j] + pm1->m[i][1] * pm2->m[1][j] + + pm1->m[i][2] * pm2->m[2][j] + pm1->m[i][3] * pm2->m[3][j]; } return pout; @@ -131,7 +131,7 @@ int32_t d3d_translate_filter(unsigned type) void d3d_input_driver(const char* input_name, const char* joypad_name, const input_driver_t** input, void** input_data) { #if defined(__WINRT__) - /* Plain xinput is supported on UWP, but it + /* Plain xinput is supported on UWP, but it * supports joypad only (uwp driver was added later) */ if (string_is_equal(input_name, "xinput")) { diff --git a/gfx/common/d3d_common.h b/gfx/common/d3d_common.h index 326a50705e..0fae16d203 100644 --- a/gfx/common/d3d_common.h +++ b/gfx/common/d3d_common.h @@ -88,7 +88,7 @@ typedef struct Vertex #define D3DPT_COMM_TRIANGLESTRIP 5 /* Clear target surface */ -#define D3D_COMM_CLEAR_TARGET 0x00000001l +#define D3D_COMM_CLEAR_TARGET 0x00000001l void *d3d_matrix_transpose(void *_pout, const void *_pm); diff --git a/gfx/common/d3dcompiler_common.c b/gfx/common/d3dcompiler_common.c index 22d17704a3..8691f38e3f 100644 --- a/gfx/common/d3dcompiler_common.c +++ b/gfx/common/d3dcompiler_common.c @@ -132,10 +132,9 @@ bool d3d_compile(const char* src, size_t size, LPCSTR src_name, LPCSTR entrypoin compileflags |= D3DCOMPILE_DEBUG | D3DCOMPILE_SKIP_OPTIMIZATION; #endif - if (!size) size = strlen(src); - + if (FAILED(D3DCompile( src, size, src_name, NULL, NULL, entrypoint, target, compileflags, 0, out, &error_msg))) { diff --git a/gfx/common/metal/Context.m b/gfx/common/metal/Context.m index 34fc099afc..a16d486860 100644 --- a/gfx/common/metal/Context.m +++ b/gfx/common/metal/Context.m @@ -41,26 +41,26 @@ video_viewport_t _viewport; id _samplers[TEXTURE_FILTER_MIPMAP_NEAREST + 1]; Filter *_filters[RPixelFormatCount]; // convert to bgra8888 - + // main render pass state id _rce; - + id _blitCommandBuffer; - + NSUInteger _currentChain; BufferChain *_chain[CHAIN_LENGTH]; MTLClearColor _clearColor; - + id _states[GFX_MAX_SHADERS][2]; id _clearState; - + bool _captureEnabled; id _backBuffer; - + unsigned _rotation; matrix_float4x4 _mvp_no_rot; matrix_float4x4 _mvp; - + Uniforms _uniforms; Uniforms _uniformsNoRotate; } @@ -86,37 +86,37 @@ [self setRotation:0]; _mvp_no_rot = matrix_proj_ortho(0, 1, 0, 1); _mvp = matrix_proj_ortho(0, 1, 0, 1); - + { MTLSamplerDescriptor *sd = [MTLSamplerDescriptor new]; - + sd.label = @"NEAREST"; _samplers[TEXTURE_FILTER_NEAREST] = [d newSamplerStateWithDescriptor:sd]; - + sd.mipFilter = MTLSamplerMipFilterNearest; sd.label = @"MIPMAP_NEAREST"; _samplers[TEXTURE_FILTER_MIPMAP_NEAREST] = [d newSamplerStateWithDescriptor:sd]; - + sd.mipFilter = MTLSamplerMipFilterNotMipmapped; sd.minFilter = MTLSamplerMinMagFilterLinear; sd.magFilter = MTLSamplerMinMagFilterLinear; sd.label = @"LINEAR"; _samplers[TEXTURE_FILTER_LINEAR] = [d newSamplerStateWithDescriptor:sd]; - + sd.mipFilter = MTLSamplerMipFilterLinear; sd.label = @"MIPMAP_LINEAR"; _samplers[TEXTURE_FILTER_MIPMAP_LINEAR] = [d newSamplerStateWithDescriptor:sd]; } - + if (![self _initConversionFilters]) return nil; - + if (![self _initClearState]) return nil; - + if (![self _initMenuStates]) return nil; - + for (int i = 0; i < CHAIN_LENGTH; i++) { _chain[i] = [[BufferChain alloc] initWithDevice:_device blockLen:65536]; @@ -144,20 +144,20 @@ - (void)setRotation:(unsigned)rotation { _rotation = 270 * rotation; - + /* Calculate projection. */ _mvp_no_rot = matrix_proj_ortho(0, 1, 0, 1); - + bool allow_rotate = true; if (!allow_rotate) { _mvp = _mvp_no_rot; return; } - + matrix_float4x4 rot = matrix_rotate_z((float)(M_PI * _rotation / 180.0f)); _mvp = simd_mul(rot, _mvp_no_rot); - + _uniforms.projectionMatrix = _mvp; _uniformsNoRotate.projectionMatrix = _mvp_no_rot; } @@ -181,7 +181,7 @@ - (id)getStockShader:(int)index blend:(bool)blend { assert(index > 0 && index < GFX_MAX_SHADERS); - + switch (index) { case VIDEO_SHADER_STOCK_BLEND: @@ -196,7 +196,7 @@ index = VIDEO_SHADER_STOCK_BLEND; break; } - + return _states[index][blend ? 1 : 0]; } @@ -218,14 +218,14 @@ MTLVertexDescriptor *vd = [self _spriteVertexDescriptor]; MTLRenderPipelineDescriptor *psd = [MTLRenderPipelineDescriptor new]; psd.label = @"clear_state"; - + MTLRenderPipelineColorAttachmentDescriptor *ca = psd.colorAttachments[0]; ca.pixelFormat = _layer.pixelFormat; - + psd.vertexDescriptor = vd; psd.vertexFunction = [_library newFunctionWithName:@"stock_vertex"]; psd.fragmentFunction = [_library newFunctionWithName:@"stock_fragment_color"]; - + NSError *err; _clearState = [_device newRenderPipelineStateWithDescriptor:psd error:&err]; if (err != nil) @@ -233,7 +233,7 @@ RARCH_ERR("[Metal]: error creating clear pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + return YES; } @@ -242,7 +242,7 @@ MTLVertexDescriptor *vd = [self _spriteVertexDescriptor]; MTLRenderPipelineDescriptor *psd = [MTLRenderPipelineDescriptor new]; psd.label = @"stock"; - + MTLRenderPipelineColorAttachmentDescriptor *ca = psd.colorAttachments[0]; ca.pixelFormat = _layer.pixelFormat; ca.blendingEnabled = NO; @@ -250,12 +250,12 @@ ca.destinationRGBBlendFactor = MTLBlendFactorOneMinusSourceAlpha; ca.sourceAlphaBlendFactor = MTLBlendFactorSourceAlpha; ca.destinationAlphaBlendFactor = MTLBlendFactorOneMinusSourceAlpha; - + psd.sampleCount = 1; psd.vertexDescriptor = vd; psd.vertexFunction = [_library newFunctionWithName:@"stock_vertex"]; psd.fragmentFunction = [_library newFunctionWithName:@"stock_fragment"]; - + NSError *err; _states[VIDEO_SHADER_STOCK_BLEND][0] = [_device newRenderPipelineStateWithDescriptor:psd error:&err]; if (err != nil) @@ -263,7 +263,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"stock_blend"; ca.blendingEnabled = YES; _states[VIDEO_SHADER_STOCK_BLEND][1] = [_device newRenderPipelineStateWithDescriptor:psd error:&err]; @@ -272,9 +272,9 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + MTLFunctionConstantValues *vals; - + psd.label = @"snow_simple"; ca.blendingEnabled = YES; { @@ -295,7 +295,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"snow"; ca.blendingEnabled = YES; { @@ -316,7 +316,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"bokeh"; ca.blendingEnabled = YES; psd.fragmentFunction = [_library newFunctionWithName:@"bokeh_fragment"]; @@ -326,7 +326,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"snowflake"; ca.blendingEnabled = YES; psd.fragmentFunction = [_library newFunctionWithName:@"snowflake_fragment"]; @@ -336,7 +336,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"ribbon"; ca.blendingEnabled = NO; psd.vertexFunction = [_library newFunctionWithName:@"ribbon_vertex"]; @@ -347,7 +347,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"ribbon_blend"; ca.blendingEnabled = YES; ca.sourceRGBBlendFactor = MTLBlendFactorOne; @@ -358,7 +358,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"ribbon_simple"; ca.blendingEnabled = NO; psd.vertexFunction = [_library newFunctionWithName:@"ribbon_simple_vertex"]; @@ -369,7 +369,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"ribbon_simple_blend"; ca.blendingEnabled = YES; ca.sourceRGBBlendFactor = MTLBlendFactorOne; @@ -380,11 +380,10 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + return YES; } - - (bool)_initConversionFilters { NSError *err = nil; @@ -398,7 +397,7 @@ err.localizedDescription.UTF8String); return NO; } - + _filters[RPixelFormatB5G6R5Unorm] = [Filter newFilterWithFunctionName:@"convert_rgb565_to_bgra8888" device:_device library:_library @@ -409,14 +408,14 @@ err.localizedDescription.UTF8String); return NO; } - + return YES; } - (Texture *)newTexture:(struct texture_image)image filter:(enum texture_filter_type)filter { assert(filter >= TEXTURE_FILTER_LINEAR && filter <= TEXTURE_FILTER_MIPMAP_NEAREST); - + if (!image.pixels || !image.width || !image.height) { /* Create a dummy texture instead. */ @@ -434,19 +433,19 @@ }; #undef T0 #undef T1 - + image.pixels = (uint32_t *)checkerboard; image.width = 8; image.height = 8; filter = TEXTURE_FILTER_MIPMAP_NEAREST; } - + BOOL mipmapped = filter == TEXTURE_FILTER_MIPMAP_LINEAR || filter == TEXTURE_FILTER_MIPMAP_NEAREST; - + Texture *tex = [Texture new]; tex.texture = [self newTexture:image mipmapped:mipmapped]; tex.sampler = _samplers[filter]; - + return tex; } @@ -456,13 +455,13 @@ width:image.width height:image.height mipmapped:mipmapped]; - + id t = [_device newTextureWithDescriptor:td]; [t replaceRegion:MTLRegionMake2D(0, 0, image.width, image.height) mipmapLevel:0 withBytes:image.pixels bytesPerRow:4 * image.width]; - + if (mipmapped) { id cb = self.blitCommandBuffer; @@ -470,7 +469,7 @@ [bce generateMipmapsForTexture:t]; [bce endEncoding]; } - + return t; } @@ -509,7 +508,7 @@ { if (_captureEnabled == captureEnabled) return; - + _captureEnabled = captureEnabled; //_layer.framebufferOnly = !captureEnabled; } @@ -523,26 +522,26 @@ { if (!_captureEnabled || _backBuffer == nil) return NO; - + if (_backBuffer.pixelFormat != MTLPixelFormatBGRA8Unorm) { RARCH_WARN("[Metal]: unexpected pixel format %d\n", _backBuffer.pixelFormat); return NO; } - + uint8_t *tmp = malloc(_backBuffer.width * _backBuffer.height * 4); - + [_backBuffer getBytes:tmp bytesPerRow:4 * _backBuffer.width fromRegion:MTLRegionMake2D(0, 0, _backBuffer.width, _backBuffer.height) mipmapLevel:0]; - + NSUInteger srcStride = _backBuffer.width * 4; uint8_t const *src = tmp + (_viewport.y * srcStride); - + NSUInteger dstStride = _viewport.width * 3; uint8_t *dst = buffer + (_viewport.height - 1) * dstStride; - + for (int y = _viewport.y; y < _viewport.height; y++, src += srcStride, dst -= dstStride) { for (int x = _viewport.x; x < _viewport.width; x++) @@ -552,9 +551,9 @@ dst[3 * x + 2] = src[4 * x + 2]; } } - + free(tmp); - + return YES; } @@ -616,13 +615,13 @@ v[1].position = simd_make_float2(x + w, y); v[2].position = simd_make_float2(x, y + h); v[3].position = simd_make_float2(x + w, y + h); - + simd_float4 color = simd_make_float4(r, g, b, a); v[0].color = color; v[1].color = color; v[2].color = color; v[3].color = color; - + id rce = self.rce; [rce setRenderPipelineState:_clearState]; [rce setVertexBytes:&v length:sizeof(v) atIndex:BufferIndexPositions]; @@ -633,9 +632,9 @@ - (void)end { assert(_commandBuffer != nil); - + [_chain[_currentChain] commitRanges]; - + if (_blitCommandBuffer) { // pending blits for mipmaps or render passes for slang shaders @@ -643,25 +642,25 @@ [_blitCommandBuffer waitUntilCompleted]; _blitCommandBuffer = nil; } - + if (_rce) { [_rce endEncoding]; _rce = nil; } - + __block dispatch_semaphore_t inflight = _inflightSemaphore; [_commandBuffer addCompletedHandler:^(id _) { dispatch_semaphore_signal(inflight); }]; - + if (self.nextDrawable) { [_commandBuffer presentDrawable:self.nextDrawable]; } - + [_commandBuffer commit]; - + _commandBuffer = nil; _drawable = nil; [self _nextChain]; @@ -708,7 +707,6 @@ static const NSUInteger kConstantAlignment = 256; static const NSUInteger kConstantAlignment = 4; #endif - - (instancetype)initWithDevice:(id)device blockLen:(NSUInteger)blockLen { if (self = [super init]) @@ -753,7 +751,7 @@ static const NSUInteger kConstantAlignment = 4; #else MTLResourceOptions opts = MTLResourceStorageModeShared; #endif - + if (!_head) { _head = [[BufferNode alloc] initWithBuffer:[_device newBufferWithLength:_blockLen options:opts]]; @@ -761,29 +759,29 @@ static const NSUInteger kConstantAlignment = 4; _current = _head; _offset = 0; } - + if ([self _subAllocRange:range length:length]) return YES; - + while (_current.next) { [self _nextNode]; if ([self _subAllocRange:range length:length]) return YES; } - + NSUInteger blockLen = _blockLen; if (length > blockLen) { blockLen = length; } - + _current.next = [[BufferNode alloc] initWithBuffer:[_device newBufferWithLength:blockLen options:opts]]; if (!_current.next) return NO; - + _length += blockLen; - + [self _nextNode]; retro_assert([self _subAllocRange:range length:length]); return YES; @@ -811,5 +809,4 @@ static const NSUInteger kConstantAlignment = 4; return NO; } - @end diff --git a/gfx/common/metal/Filter.m b/gfx/common/metal/Filter.m index 94490aff66..c9909815e3 100644 --- a/gfx/common/metal/Filter.m +++ b/gfx/common/metal/Filter.m @@ -26,7 +26,7 @@ { return nil; } - + MTLSamplerDescriptor *sd = [MTLSamplerDescriptor new]; sd.minFilter = MTLSamplerMinMagFilterNearest; sd.magFilter = MTLSamplerMinMagFilterNearest; @@ -34,7 +34,7 @@ sd.tAddressMode = MTLSamplerAddressModeClampToEdge; sd.mipFilter = MTLSamplerMipFilterNotMipmapped; id sampler = [device newSamplerStateWithDescriptor:sd]; - + return [[Filter alloc] initWithKernel:kernel sampler:sampler]; } @@ -53,20 +53,20 @@ id ce = [cb computeCommandEncoder]; ce.label = @"filter kernel"; [ce pushDebugGroup:@"filter kernel"]; - + [ce setComputePipelineState:_kernel]; - + [ce setTexture:tin atIndex:0]; [ce setTexture:tout atIndex:1]; - + [self.delegate configure:ce]; - + MTLSize size = MTLSizeMake(16, 16, 1); MTLSize count = MTLSizeMake((tin.width + size.width + 1) / size.width, (tin.height + size.height + 1) / size.height, 1); - + [ce dispatchThreadgroups:count threadsPerThreadgroup:size]; - + [ce popDebugGroup]; [ce endEncoding]; } @@ -76,19 +76,19 @@ id ce = [cb computeCommandEncoder]; ce.label = @"filter kernel"; [ce pushDebugGroup:@"filter kernel"]; - + [ce setComputePipelineState:_kernel]; - + [ce setBuffer:tin offset:0 atIndex:0]; [ce setTexture:tout atIndex:0]; - + [self.delegate configure:ce]; - + MTLSize size = MTLSizeMake(32, 1, 1); MTLSize count = MTLSizeMake((tin.length + 00) / 32, 1, 1); - + [ce dispatchThreadgroups:count threadsPerThreadgroup:size]; - + [ce popDebugGroup]; [ce endEncoding]; } diff --git a/gfx/common/metal/MenuDisplay.m b/gfx/common/metal/MenuDisplay.m index c5ad4e3c52..f35c16f908 100644 --- a/gfx/common/metal/MenuDisplay.m +++ b/gfx/common/metal/MenuDisplay.m @@ -88,7 +88,6 @@ [_context resetScissorRect]; } - - (MTLPrimitiveType)_toPrimitiveType:(enum menu_display_prim_type)prim { switch (prim) @@ -106,16 +105,16 @@ - (void)drawPipeline:(menu_display_ctx_draw_t *)draw video:(video_frame_info_t *)video { static struct video_coords blank_coords; - + draw->x = 0; draw->y = 0; draw->matrix_data = NULL; - + _uniforms.outputSize = simd_make_float2(_context.viewport->full_width, _context.viewport->full_height); - + draw->pipeline.backend_data = &_uniforms; draw->pipeline.backend_data_size = sizeof(_uniforms); - + switch (draw->pipeline.id) { // ribbon @@ -127,7 +126,7 @@ draw->coords = (struct video_coords *)&ca->coords; break; } - + case VIDEO_SHADER_MENU_3: case VIDEO_SHADER_MENU_4: case VIDEO_SHADER_MENU_5: @@ -139,7 +138,7 @@ break; } } - + _uniforms.time += 0.01; } @@ -148,7 +147,7 @@ const float *vertex = draw->coords->vertex ?: MenuDisplay.defaultVertices; const float *tex_coord = draw->coords->tex_coord ?: MenuDisplay.defaultTexCoords; const float *color = draw->coords->color ?: MenuDisplay.defaultColor; - + NSUInteger needed = draw->coords->vertices * sizeof(SpriteVertex); BufferRange range; if (![_context allocRange:&range length:needed]) @@ -156,21 +155,21 @@ RARCH_ERR("[Metal]: MenuDisplay unable to allocate buffer of %d bytes", needed); return; } - + NSUInteger vertexCount = draw->coords->vertices; SpriteVertex *pv = (SpriteVertex *)range.data; for (unsigned i = 0; i < draw->coords->vertices; i++, pv++) { pv->position = simd_make_float2(vertex[0], 1.0f - vertex[1]); vertex += 2; - + pv->texCoord = simd_make_float2(tex_coord[0], tex_coord[1]); tex_coord += 2; - + pv->color = simd_make_float4(color[0], color[1], color[2], color[3]); color += 4; } - + id rce = _context.rce; if (_clearNextRender) { @@ -186,7 +185,7 @@ ]; _clearNextRender = NO; } - + MTLViewport vp = { .originX = draw->x, .originY = _context.viewport->full_height - draw->y - draw->height, @@ -196,11 +195,11 @@ .zfar = 1, }; [rce setViewport:vp]; - + if (_useScissorRect) { [rce setScissorRect:_scissorRect]; } - + switch (draw->pipeline.id) { #if HAVE_SHADERPIPELINE @@ -220,13 +219,13 @@ default: break; } - + Texture *tex = (__bridge Texture *)(void *)draw->texture; if (tex == nil) return; - + [rce setRenderPipelineState:[_context getStockShader:VIDEO_SHADER_STOCK_BLEND blend:_blend]]; - + Uniforms uniforms = { .projectionMatrix = draw->matrix_data ? make_matrix_float4x4((const float *)draw->matrix_data) : _uniforms.projectionMatrix diff --git a/gfx/common/metal/RendererCommon.h b/gfx/common/metal/RendererCommon.h index f0835f271e..ae47daf814 100644 --- a/gfx/common/metal/RendererCommon.h +++ b/gfx/common/metal/RendererCommon.h @@ -30,16 +30,16 @@ typedef NS_ENUM(NSUInteger, RPixelFormat) { - + RPixelFormatInvalid, - + /* 16-bit formats */ RPixelFormatBGRA4Unorm, RPixelFormatB5G6R5Unorm, - + RPixelFormatBGRA8Unorm, RPixelFormatBGRX8Unorm, // RetroArch XRGB - + RPixelFormatCount, }; @@ -50,7 +50,7 @@ typedef NS_ENUM(NSUInteger, RTextureFilter) { RTextureFilterNearest, RTextureFilterLinear, - + RTextureFilterCount, }; diff --git a/gfx/common/metal/RendererCommon.m b/gfx/common/metal/RendererCommon.m index 95ff5c889c..573c08b16d 100644 --- a/gfx/common/metal/RendererCommon.m +++ b/gfx/common/metal/RendererCommon.m @@ -16,11 +16,11 @@ NSUInteger RPixelFormatToBPP(RPixelFormat format) case RPixelFormatBGRA8Unorm: case RPixelFormatBGRX8Unorm: return 4; - + case RPixelFormatB5G6R5Unorm: case RPixelFormatBGRA4Unorm: return 2; - + default: RARCH_ERR("[Metal]: unknown RPixel format: %d\n", format); return 4; @@ -41,14 +41,14 @@ NSString *NSStringFromRPixelFormat(RPixelFormat format) STRING(RPixelFormatBGRA8Unorm); STRING(RPixelFormatBGRX8Unorm); #undef STRING - + }); - + if (format >= RPixelFormatCount) { format = RPixelFormatInvalid; } - + return RPixelStrings[format]; } @@ -61,7 +61,7 @@ matrix_float4x4 make_matrix_float4x4(const float *v) simd_float4 R = simd_make_float4(v[0], v[1], v[2], v[3]); v += 4; simd_float4 S = simd_make_float4(v[0], v[1], v[2], v[3]); - + matrix_float4x4 mat = {P, Q, R, S}; return mat; } @@ -70,19 +70,19 @@ matrix_float4x4 matrix_proj_ortho(float left, float right, float top, float bott { float near = 0; float far = 1; - + float sx = 2 / (right - left); float sy = 2 / (top - bottom); float sz = 1 / (far - near); float tx = (right + left) / (left - right); float ty = (top + bottom) / (bottom - top); float tz = near / (far - near); - + simd_float4 P = simd_make_float4(sx, 0, 0, 0); simd_float4 Q = simd_make_float4(0, sy, 0, 0); simd_float4 R = simd_make_float4(0, 0, sz, 0); simd_float4 S = simd_make_float4(tx, ty, tz, 1); - + matrix_float4x4 mat = {P, Q, R, S}; return mat; } @@ -91,12 +91,12 @@ matrix_float4x4 matrix_rotate_z(float rot) { float cz, sz; __sincosf(rot, &sz, &cz); - + simd_float4 P = simd_make_float4(cz, -sz, 0, 0); simd_float4 Q = simd_make_float4(sz, cz, 0, 0); simd_float4 R = simd_make_float4( 0, 0, 1, 0); simd_float4 S = simd_make_float4( 0, 0, 0, 1); - + matrix_float4x4 mat = {P, Q, R, S}; return mat; } diff --git a/gfx/common/metal/Shaders.metal b/gfx/common/metal/Shaders.metal index 396eafd050..def08fb2f0 100644 --- a/gfx/common/metal/Shaders.metal +++ b/gfx/common/metal/Shaders.metal @@ -92,7 +92,7 @@ kernel void convert_bgra4444_to_bgra8888(texture2d in [[ extract_bits(pix, 12, 4), extract_bits(pix, 0, 4) ); - + out.write(half4(pix2) / 15.0, gid); } @@ -107,6 +107,6 @@ kernel void convert_rgb565_to_bgra8888(texture2d in [[ te extract_bits(pix, 0, 5), 0xf ); - + out.write(half4(pix2) / half4(0x1f, 0x3f, 0x1f, 0xf), gid); } diff --git a/gfx/common/metal/TexturedView.m b/gfx/common/metal/TexturedView.m index e41355f3a5..50df1a8ce0 100644 --- a/gfx/common/metal/TexturedView.m +++ b/gfx/common/metal/TexturedView.m @@ -15,7 +15,7 @@ CGSize _size; // size of view in pixels CGRect _frame; NSUInteger _bpp; - + id _src; // source texture bool _srcDirty; } @@ -50,9 +50,9 @@ { return; } - + _size = size; - + { MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatBGRA8Unorm width:(NSUInteger)size.width @@ -61,7 +61,7 @@ td.usage = MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite; _texture = [_context.device newTextureWithDescriptor:td]; } - + if (_format != RPixelFormatBGRA8Unorm && _format != RPixelFormatBGRX8Unorm) { MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatR16Uint @@ -83,14 +83,14 @@ { return; } - + _frame = frame; - + float l = (float)CGRectGetMinX(frame); float t = (float)CGRectGetMinY(frame); float r = (float)CGRectGetMaxX(frame); float b = (float)CGRectGetMaxY(frame); - + Vertex v[4] = { {simd_make_float3(l, b, 0), simd_make_float2(0, 1)}, {simd_make_float3(r, b, 0), simd_make_float2(1, 1)}, @@ -109,10 +109,10 @@ { if (_format == RPixelFormatBGRA8Unorm || _format == RPixelFormatBGRX8Unorm) return; - + if (!_srcDirty) return; - + [_context convertFormat:_format from:_src to:_texture]; _srcDirty = NO; } diff --git a/gfx/common/metal/View.h b/gfx/common/metal/View.h index ce1485a31a..cd8fe06779 100644 --- a/gfx/common/metal/View.h +++ b/gfx/common/metal/View.h @@ -15,7 +15,7 @@ typedef NS_ENUM(NSInteger, ViewDrawState) ViewDrawStateNone = 0x00, ViewDrawStateContext = 0x01, ViewDrawStateEncoder = 0x02, - + ViewDrawStateAll = 0x03, }; diff --git a/gfx/common/metal/menu_pipeline.metal b/gfx/common/metal/menu_pipeline.metal index df1e587496..1119972957 100644 --- a/gfx/common/metal/menu_pipeline.metal +++ b/gfx/common/metal/menu_pipeline.metal @@ -44,10 +44,10 @@ float xmb_noise2(float3 x, const device Uniforms &constants) vertex FontFragmentIn ribbon_simple_vertex(const SpriteVertex in [[ stage_in ]], const device Uniforms &constants [[ buffer(BufferIndexUniforms) ]]) { float4 t = (constants.projectionMatrix * float4(in.position, 0, 1)); - + float3 v = float3(t.x, 0.0, 1.0-t.y); float3 v2 = v; - + v2.x = v2.x + constants.time / 2.0; v2.z = v.z * 3.0; v.y = cos((v.x + v.z / 3.0 + constants.time) * 2.0) / 10.0 + ribbon::noise(v2.xyz) / 4.0; @@ -71,7 +71,6 @@ typedef struct vector_float3 vEC; } RibbonOutIn; - vertex RibbonOutIn ribbon_vertex(const SpriteVertex in [[ stage_in ]], const device Uniforms &constants [[ buffer(BufferIndexUniforms) ]]) { float4 t = (constants.projectionMatrix * float4(in.position, 0, 1)); diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m index d2afec6184..ca190ede8b 100644 --- a/gfx/common/metal_common.m +++ b/gfx/common/metal_common.m @@ -55,22 +55,22 @@ FrameView *_frameView; MetalMenu *_menu; Overlay *_overlay; - + video_info_t _video; - + id _device; id _library; Context *_context; - + CAMetalLayer *_layer; - + // render target layer state id _t_pipelineState; id _t_pipelineStateNoAlpha; - + id _samplerStateLinear; id _samplerStateNearest; - + // other state Uniforms _uniforms; Uniforms _viewportMVP; @@ -87,24 +87,24 @@ view.device = _device; view.delegate = self; _layer = (CAMetalLayer *)view.layer; - + if (![self _initMetal]) { return nil; } - + _video = *video; _viewport = (video_viewport_t *)calloc(1, sizeof(video_viewport_t)); _viewportMVP.projectionMatrix = matrix_proj_ortho(0, 1, 0, 1); - + _keepAspect = _video.force_aspect; - + gfx_ctx_mode_t mode = { .width = _video.width, .height = _video.height, .fullscreen = _video.fullscreen, }; - + if (mode.width == 0 || mode.height == 0) { // 0 indicates full screen, so we'll use the view's dimensions, which should already be full screen @@ -113,18 +113,18 @@ mode.width = (unsigned int)size.width; mode.height = (unsigned int)size.height; } - + [apple_platform setVideoMode:mode]; - + *input = NULL; *inputData = NULL; - + // menu display _display = [[MenuDisplay alloc] initWithContext:_context]; - + // menu view _menu = [[MetalMenu alloc] initWithContext:_context]; - + // frame buffer view { ViewDescriptor *vd = [ViewDescriptor new]; @@ -135,10 +135,10 @@ _frameView.viewport = _viewport; [_frameView setFilteringIndex:0 smooth:video->smooth]; } - + // overlay view _overlay = [[Overlay alloc] initWithContext:_context]; - + font_driver_init_osd((__bridge void *)self, false, video->is_threaded, FONT_DRIVER_RENDER_METAL_API); } return self; @@ -161,7 +161,7 @@ _context = [[Context alloc] initWithDevice:_device layer:_layer library:_library]; - + { MTLVertexDescriptor *vd = [MTLVertexDescriptor new]; vd.attributes[0].offset = 0; @@ -169,10 +169,10 @@ vd.attributes[1].offset = offsetof(Vertex, texCoord); vd.attributes[1].format = MTLVertexFormatFloat2; vd.layouts[0].stride = sizeof(Vertex); - + MTLRenderPipelineDescriptor *psd = [MTLRenderPipelineDescriptor new]; psd.label = @"Pipeline+Alpha"; - + MTLRenderPipelineColorAttachmentDescriptor *ca = psd.colorAttachments[0]; ca.pixelFormat = _layer.pixelFormat; ca.blendingEnabled = YES; @@ -180,12 +180,12 @@ ca.sourceRGBBlendFactor = MTLBlendFactorSourceAlpha; ca.destinationAlphaBlendFactor = MTLBlendFactorOneMinusSourceAlpha; ca.destinationRGBBlendFactor = MTLBlendFactorOneMinusSourceAlpha; - + psd.sampleCount = 1; psd.vertexDescriptor = vd; psd.vertexFunction = [_library newFunctionWithName:@"basic_vertex_proj_tex"]; psd.fragmentFunction = [_library newFunctionWithName:@"basic_fragment_proj_tex"]; - + NSError *err; _t_pipelineState = [_device newRenderPipelineStateWithDescriptor:psd error:&err]; if (err != nil) @@ -193,7 +193,7 @@ RARCH_ERR("[Metal]: error creating pipeline state %s\n", err.localizedDescription.UTF8String); return NO; } - + psd.label = @"Pipeline+No Alpha"; ca.blendingEnabled = NO; _t_pipelineStateNoAlpha = [_device newRenderPipelineStateWithDescriptor:psd error:&err]; @@ -203,16 +203,16 @@ return NO; } } - + { MTLSamplerDescriptor *sd = [MTLSamplerDescriptor new]; _samplerStateNearest = [_device newSamplerStateWithDescriptor:sd]; - + sd.minFilter = MTLSamplerMinMagFilterLinear; sd.magFilter = MTLSamplerMinMagFilterLinear; _samplerStateLinear = [_device newSamplerStateWithDescriptor:sd]; } - + return YES; } @@ -221,16 +221,16 @@ #if 0 RARCH_LOG("[Metal]: setViewportWidth size %dx%d\n", width, height); #endif - + _viewport->full_width = width; _viewport->full_height = height; video_driver_set_size(&_viewport->full_width, &_viewport->full_height); _layer.drawableSize = CGSizeMake(width, height); video_driver_update_viewport(_viewport, forceFull, _keepAspect); - + // update matrix _context.viewport = _viewport; - + _viewportMVP.outputSize = simd_make_float2(_viewport->full_width, _viewport->full_height); } @@ -238,7 +238,7 @@ - (void)setVideo:(const video_info_t *)video { - + } - (bool)renderFrame:(const void *)data @@ -252,19 +252,19 @@ @autoreleasepool { [self _beginFrame]; - + _frameView.frameCount = frameCount; if (data && width && height) { _frameView.size = CGSizeMake(width, height); [_frameView updateFrame:data pitch:pitch]; } - + [self _drawViews:video_info]; - + if (video_info->statistics_show) { struct font_params *osd_params = (struct font_params *)&video_info->osd_stat_params; - + if (osd_params) { font_driver_render_msg(video_info, NULL, video_info->stat_text, osd_params); @@ -283,13 +283,13 @@ [rce popDebugGroup]; } #endif - + if (msg && *msg) [self _renderMessage:msg info:video_info]; - + [self _endFrame]; } - + return YES; } @@ -301,23 +301,23 @@ { int msg_width = font_driver_get_message_width(NULL, msg, (unsigned)strlen(msg), 1.0f); - + float x = video_info->font_msg_pos_x; float y = 1.0f - video_info->font_msg_pos_y; float width = msg_width / (float)_viewport->full_width; float height = settings->floats.video_font_size / (float)_viewport->full_height; - + y -= height; - + float x2 = 0.005f; /* extend background around text */ float y2 = 0.005f; - + x -= x2; y -= y2; width += x2; height += y2; - + float r = settings->uints.video_msg_bgcolor_red / 255.0f; float g = settings->uints.video_msg_bgcolor_green / 255.0f; float b = settings->uints.video_msg_bgcolor_blue / 255.0f; @@ -325,7 +325,7 @@ [_context resetRenderViewport]; [_context drawQuadX:x y:y w:width h:height r:r g:g b:b a:a]; } - + font_driver_render_msg(video_info, NULL, msg, NULL); } @@ -343,11 +343,11 @@ - (void)_drawViews:(video_frame_info_t *)video_info { id rce = _context.rce; - + // draw back buffer [rce pushDebugGroup:@"core frame"]; [_frameView drawWithContext:_context]; - + if ((_frameView.drawState & ViewDrawStateEncoder) != 0) { [rce setVertexBytes:_context.uniforms length:sizeof(*_context.uniforms) atIndex:BufferIndexUniforms]; @@ -363,7 +363,7 @@ [_frameView drawWithEncoder:rce]; } [rce popDebugGroup]; - + if (_menu.enabled && _menu.hasFrame) { [_menu.view drawWithContext:_context]; @@ -428,7 +428,7 @@ - (void)drawInMTKView:(MTKView *)view { - + } @end @@ -472,7 +472,7 @@ filter:(RTextureFilter)filter { CGSize size = CGSizeMake(width, height); - + if (_view) { if (!(CGSizeEqualToSize(_view.size, size) && @@ -482,7 +482,7 @@ _view = nil; } } - + if (!_view) { ViewDescriptor *vd = [ViewDescriptor new]; @@ -522,14 +522,14 @@ typedef struct texture typedef struct MTLALIGN(16) { matrix_float4x4 mvp; - + struct { texture_t texture[GFX_MAX_FRAME_HISTORY + 1]; MTLViewport viewport; float4_t output_size; } frame; - + struct { __unsafe_unretained id buffers[SLANG_CBUFFER_MAX]; @@ -540,9 +540,9 @@ typedef struct MTLALIGN(16) MTLViewport viewport; __unsafe_unretained id _state; } pass[GFX_MAX_SHADERS]; - + texture_t luts[GFX_MAX_TEXTURES]; - + } engine_t; @implementation FrameView @@ -554,15 +554,15 @@ typedef struct MTLALIGN(16) CGSize _size; // size of view in pixels CGRect _frame; NSUInteger _bpp; - + id _src; // src texture bool _srcDirty; - + id _samplers[RARCH_FILTER_MAX][RARCH_WRAP_MAX]; struct video_shader *_shader; - + engine_t _engine; - + bool resize_render_targets; bool init_history; video_viewport_t *_viewport; @@ -588,11 +588,11 @@ typedef struct MTLALIGN(16) _visible = YES; _engine.mvp = matrix_proj_ortho(0, 1, 0, 1); [self _initSamplers]; - + self.size = d.size; self.frame = CGRectMake(0, 0, 1, 1); resize_render_targets = YES; - + // init slang vertex buffer VertexSlang v[4] = { {simd_make_float4(0, 1, 0, 1), simd_make_float2(0, 1)}, @@ -608,7 +608,7 @@ typedef struct MTLALIGN(16) - (void)_initSamplers { MTLSamplerDescriptor *sd = [MTLSamplerDescriptor new]; - + /* Initialize samplers */ for (unsigned i = 0; i < RARCH_WRAP_MAX; i++) { @@ -617,19 +617,19 @@ typedef struct MTLALIGN(16) case RARCH_WRAP_BORDER: sd.sAddressMode = MTLSamplerAddressModeClampToBorderColor; break; - + case RARCH_WRAP_EDGE: sd.sAddressMode = MTLSamplerAddressModeClampToEdge; break; - + case RARCH_WRAP_REPEAT: sd.sAddressMode = MTLSamplerAddressModeRepeat; break; - + case RARCH_WRAP_MIRRORED_REPEAT: sd.sAddressMode = MTLSamplerAddressModeMirrorRepeat; break; - + default: continue; } @@ -637,13 +637,13 @@ typedef struct MTLALIGN(16) sd.rAddressMode = sd.sAddressMode; sd.minFilter = MTLSamplerMinMagFilterLinear; sd.magFilter = MTLSamplerMinMagFilterLinear; - + id ss = [_context.device newSamplerStateWithDescriptor:sd]; _samplers[RARCH_FILTER_LINEAR][i] = ss; - + sd.minFilter = MTLSamplerMinMagFilterNearest; sd.magFilter = MTLSamplerMinMagFilterNearest; - + ss = [_context.device newSamplerStateWithDescriptor:sd]; _samplers[RARCH_FILTER_NEAREST][i] = ss; } @@ -666,11 +666,11 @@ typedef struct MTLALIGN(16) { return; } - + _size = size; - + resize_render_targets = YES; - + if (_format != RPixelFormatBGRA8Unorm && _format != RPixelFormatBGRX8Unorm) { MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatR16Uint @@ -692,18 +692,18 @@ typedef struct MTLALIGN(16) { return; } - + _frame = frame; - + // update vertices CGPoint o = frame.origin; CGSize s = frame.size; - + CGFloat l = o.x; CGFloat t = o.y; CGFloat r = o.x + s.width; CGFloat b = o.y + s.height; - + Vertex v[4] = { {simd_make_float3(l, b, 0), simd_make_float2(0, 1)}, {simd_make_float3(r, b, 0), simd_make_float2(1, 1)}, @@ -722,10 +722,10 @@ typedef struct MTLALIGN(16) { if (_format == RPixelFormatBGRA8Unorm || _format == RPixelFormatBGRX8Unorm) return; - + if (!_srcDirty) return; - + [_context convertFormat:_format from:_src to:_texture]; _srcDirty = NO; } @@ -750,7 +750,7 @@ typedef struct MTLALIGN(16) } } } - + /* either no history, or we moved a texture of a different size in the front slot */ if (_engine.frame.texture[0].size_data.x != _size.width || _engine.frame.texture[0].size_data.y != _size.height) @@ -767,18 +767,18 @@ typedef struct MTLALIGN(16) - (bool)readViewport:(uint8_t *)buffer isIdle:(bool)isIdle { RARCH_LOG("[Metal]: readViewport is_idle = %s\n", isIdle ? "YES" : "NO"); - + bool enabled = _context.captureEnabled; if (!enabled) _context.captureEnabled = YES; - + video_driver_cached_frame(); - + bool res = [_context readBackBuffer:buffer]; - + if (!enabled) _context.captureEnabled = NO; - + return res; } @@ -789,7 +789,7 @@ typedef struct MTLALIGN(16) { resize_render_targets = YES; } - + _engine.frame.viewport.originX = _viewport->x; _engine.frame.viewport.originY = _viewport->y; _engine.frame.viewport.width = _viewport->width; @@ -800,14 +800,14 @@ typedef struct MTLALIGN(16) _engine.frame.output_size.y = _viewport->height; _engine.frame.output_size.z = 1.0f / _viewport->width; _engine.frame.output_size.w = 1.0f / _viewport->height; - + if (resize_render_targets) { [self _updateRenderTargets]; } - + [self _updateHistory]; - + if (_format == RPixelFormatBGRA8Unorm || _format == RPixelFormatBGRX8Unorm) { id tex = _engine.frame.texture[0].view; @@ -840,7 +840,7 @@ typedef struct MTLALIGN(16) height:(NSUInteger)_size.height mipmapped:false]; td.usage = MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite | MTLTextureUsageRenderTarget; - + for (int i = 0; i < _shader->history_size + 1; i++) { [self _initTexture:&_engine.frame.texture[i] withDescriptor:td]; @@ -863,12 +863,12 @@ typedef struct MTLALIGN(16) { _texture = _engine.frame.texture[0].view; [self _convertFormat]; - + if (!_shader || _shader->passes == 0) { return; } - + for (unsigned i = 0; i < _shader->passes; i++) { if (_shader->pass[i].feedback) @@ -878,19 +878,19 @@ typedef struct MTLALIGN(16) _engine.pass[i].rt = tmp; } } - + id cb = ctx.blitCommandBuffer; - + MTLRenderPassDescriptor *rpd = [MTLRenderPassDescriptor new]; rpd.colorAttachments[0].loadAction = MTLLoadActionDontCare; rpd.colorAttachments[0].storeAction = MTLStoreActionStore; - + for (unsigned i = 0; i < _shader->passes; i++) { id rce = nil; - + BOOL backBuffer = (_engine.pass[i].rt.view == nil); - + if (backBuffer) { rce = _context.rce; @@ -904,42 +904,42 @@ typedef struct MTLALIGN(16) #if DEBUG && METAL_DEBUG rce.label = [NSString stringWithFormat:@"pass %d", i]; #endif - + [rce setRenderPipelineState:_engine.pass[i]._state]; - + _engine.pass[i].frame_count = (uint32_t)_frameCount; if (_shader->pass[i].frame_count_mod) _engine.pass[i].frame_count %= _shader->pass[i].frame_count_mod; - + for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++) { id buffer = _engine.pass[i].buffers[j]; cbuffer_sem_t *buffer_sem = &_engine.pass[i].semantics.cbuffers[j]; - + if (buffer_sem->stage_mask && buffer_sem->uniforms) { void *data = buffer.contents; uniform_sem_t *uniform = buffer_sem->uniforms; - + while (uniform->size) { if (uniform->data) memcpy((uint8_t *)data + uniform->offset, uniform->data, uniform->size); uniform++; } - + if (buffer_sem->stage_mask & SLANG_STAGE_VERTEX_MASK) [rce setVertexBuffer:buffer offset:0 atIndex:buffer_sem->binding]; - + if (buffer_sem->stage_mask & SLANG_STAGE_FRAGMENT_MASK) [rce setFragmentBuffer:buffer offset:0 atIndex:buffer_sem->binding]; [buffer didModifyRange:NSMakeRange(0, buffer.length)]; } } - + __unsafe_unretained id textures[SLANG_NUM_BINDINGS] = {NULL}; id samplers[SLANG_NUM_BINDINGS] = {NULL}; - + texture_sem_t *texture_sem = _engine.pass[i].semantics.textures; while (texture_sem->stage_mask) { @@ -949,7 +949,7 @@ typedef struct MTLALIGN(16) samplers[binding] = _samplers[texture_sem->filter][texture_sem->wrap]; texture_sem++; } - + if (backBuffer) { [rce setViewport:_engine.frame.viewport]; @@ -958,20 +958,20 @@ typedef struct MTLALIGN(16) { [rce setViewport:_engine.pass[i].viewport]; } - + [rce setFragmentTextures:textures withRange:NSMakeRange(0, SLANG_NUM_BINDINGS)]; [rce setFragmentSamplerStates:samplers withRange:NSMakeRange(0, SLANG_NUM_BINDINGS)]; [rce setVertexBytes:_vertex length:sizeof(_vertex) atIndex:4]; [rce drawPrimitives:MTLPrimitiveTypeTriangleStrip vertexStart:0 vertexCount:4]; - + if (!backBuffer) { [rce endEncoding]; } - + _texture = _engine.pass[i].rt.view; } - + if (_texture == nil) _drawState = ViewDrawStateContext; else @@ -981,7 +981,7 @@ typedef struct MTLALIGN(16) - (void)_updateRenderTargets { if (!_shader || !resize_render_targets) return; - + // release existing targets for (int i = 0; i < _shader->passes; i++) { @@ -990,13 +990,13 @@ typedef struct MTLALIGN(16) memset(&_engine.pass[i].rt, 0, sizeof(_engine.pass[i].rt)); memset(&_engine.pass[i].feedback, 0, sizeof(_engine.pass[i].feedback)); } - + NSUInteger width = (NSUInteger)_size.width, height = (NSUInteger)_size.height; - + for (unsigned i = 0; i < _shader->passes; i++) { struct video_shader_pass *shader_pass = &_shader->pass[i]; - + if (shader_pass->fbo.valid) { switch (shader_pass->fbo.type_x) @@ -1004,40 +1004,40 @@ typedef struct MTLALIGN(16) case RARCH_SCALE_INPUT: width *= shader_pass->fbo.scale_x; break; - + case RARCH_SCALE_VIEWPORT: width = (NSUInteger)(_viewport->width * shader_pass->fbo.scale_x); break; - + case RARCH_SCALE_ABSOLUTE: width = shader_pass->fbo.abs_x; break; - + default: break; } - + if (!width) width = _viewport->width; - + switch (shader_pass->fbo.type_y) { case RARCH_SCALE_INPUT: height *= shader_pass->fbo.scale_y; break; - + case RARCH_SCALE_VIEWPORT: height = (NSUInteger)(_viewport->height * shader_pass->fbo.scale_y); break; - + case RARCH_SCALE_ABSOLUTE: height = shader_pass->fbo.abs_y; break; - + default: break; } - + if (!height) height = _viewport->height; } @@ -1046,9 +1046,9 @@ typedef struct MTLALIGN(16) width = _viewport->width; height = _viewport->height; } - + RARCH_LOG("[Metal]: Updating framebuffer size %u x %u.\n", width, height); - + MTLPixelFormat fmt = SelectOptimalPixelFormat(glslang_format_to_metal(_engine.pass[i].semantics.format)); if ((i != (_shader->passes - 1)) || (width != _viewport->width) || (height != _viewport->height) || @@ -1058,7 +1058,7 @@ typedef struct MTLALIGN(16) _engine.pass[i].viewport.height = height; _engine.pass[i].viewport.znear = 0.0; _engine.pass[i].viewport.zfar = 1.0; - + MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:fmt width:width height:height @@ -1066,7 +1066,7 @@ typedef struct MTLALIGN(16) td.storageMode = MTLStorageModePrivate; td.usage = MTLTextureUsageShaderRead | MTLTextureUsageRenderTarget; [self _initTexture:&_engine.pass[i].rt withDescriptor:td]; - + if (shader_pass->feedback) { [self _initTexture:&_engine.pass[i].feedback withDescriptor:td]; @@ -1080,7 +1080,7 @@ typedef struct MTLALIGN(16) _engine.pass[i].rt.size_data.w = 1.0f / height; } } - + resize_render_targets = NO; } @@ -1088,27 +1088,27 @@ typedef struct MTLALIGN(16) { if (!shader) return; - + for (int i = 0; i < GFX_MAX_SHADERS; i++) { STRUCT_ASSIGN(_engine.pass[i].rt.view, nil); STRUCT_ASSIGN(_engine.pass[i].feedback.view, nil); memset(&_engine.pass[i].rt, 0, sizeof(_engine.pass[i].rt)); memset(&_engine.pass[i].feedback, 0, sizeof(_engine.pass[i].feedback)); - + STRUCT_ASSIGN(_engine.pass[i]._state, nil); - + for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++) { STRUCT_ASSIGN(_engine.pass[i].buffers[j], nil); } } - + for (int i = 0; i < GFX_MAX_TEXTURES; i++) { STRUCT_ASSIGN(_engine.luts[i].view, nil); } - + free(shader); } @@ -1116,45 +1116,45 @@ typedef struct MTLALIGN(16) { [self _freeVideoShader:_shader]; _shader = nil; - + config_file_t *conf = config_file_new(path.UTF8String); struct video_shader *shader = (struct video_shader *)calloc(1, sizeof(*shader)); - + @try { if (!video_shader_read_conf_cgp(conf, shader)) return NO; - + video_shader_resolve_relative(shader, path.UTF8String); - + texture_t *source = &_engine.frame.texture[0]; for (unsigned i = 0; i < shader->passes; source = &_engine.pass[i++].rt) { matrix_float4x4 *mvp = (i == shader->passes-1) ? &_context.uniforms->projectionMatrix : &_engine.mvp; - + /* clang-format off */ semantics_map_t semantics_map = { { /* Original */ {&_engine.frame.texture[0].view, 0, &_engine.frame.texture[0].size_data, 0}, - + /* Source */ {&source->view, 0, &source->size_data, 0}, - + /* OriginalHistory */ {&_engine.frame.texture[0].view, sizeof(*_engine.frame.texture), &_engine.frame.texture[0].size_data, sizeof(*_engine.frame.texture)}, - + /* PassOutput */ {&_engine.pass[0].rt.view, sizeof(*_engine.pass), &_engine.pass[0].rt.size_data, sizeof(*_engine.pass)}, - + /* PassFeedback */ {&_engine.pass[0].feedback.view, sizeof(*_engine.pass), &_engine.pass[0].feedback.size_data, sizeof(*_engine.pass)}, - + /* User */ {&_engine.luts[0].view, sizeof(*_engine.luts), &_engine.luts[0].size_data, sizeof(*_engine.luts)}, @@ -1167,7 +1167,7 @@ typedef struct MTLALIGN(16) } }; /* clang-format on */ - + if (!slang_process(shader, i, RARCH_SHADER_METAL, 20000, &semantics_map, &_engine.pass[i].semantics)) return NO; @@ -1178,7 +1178,7 @@ typedef struct MTLALIGN(16) #endif NSString *vs_src = [NSString stringWithUTF8String:shader->pass[i].source.string.vertex]; NSString *fs_src = [NSString stringWithUTF8String:shader->pass[i].source.string.fragment]; - + // vertex descriptor @try { @@ -1191,24 +1191,24 @@ typedef struct MTLALIGN(16) vd.attributes[1].bufferIndex = 4; vd.layouts[4].stride = sizeof(VertexSlang); vd.layouts[4].stepFunction = MTLVertexStepFunctionPerVertex; - + MTLRenderPipelineDescriptor *psd = [MTLRenderPipelineDescriptor new]; psd.label = [NSString stringWithFormat:@"pass %d", i]; - + MTLRenderPipelineColorAttachmentDescriptor *ca = psd.colorAttachments[0]; - + ca.pixelFormat = SelectOptimalPixelFormat(glslang_format_to_metal(_engine.pass[i].semantics.format)); - + // TODO(sgc): confirm we never need blending for render passes ca.blendingEnabled = NO; ca.sourceAlphaBlendFactor = MTLBlendFactorSourceAlpha; ca.sourceRGBBlendFactor = MTLBlendFactorSourceAlpha; ca.destinationAlphaBlendFactor = MTLBlendFactorOneMinusSourceAlpha; ca.destinationRGBBlendFactor = MTLBlendFactorOneMinusSourceAlpha; - + psd.sampleCount = 1; psd.vertexDescriptor = vd; - + NSError *err; id lib = [_context.device newLibraryWithSource:vs_src options:nil error:&err]; if (err != nil) @@ -1223,9 +1223,9 @@ typedef struct MTLALIGN(16) RARCH_WARN("[Metal]: warnings compiling vertex shader: %s\n", err.localizedDescription.UTF8String); #endif } - + psd.vertexFunction = [lib newFunctionWithName:@"main0"]; - + lib = [_context.device newLibraryWithSource:fs_src options:nil error:&err]; if (err != nil) { @@ -1240,7 +1240,7 @@ typedef struct MTLALIGN(16) #endif } psd.fragmentFunction = [lib newFunctionWithName:@"main0"]; - + STRUCT_ASSIGN(_engine.pass[i]._state, [_context.device newRenderPipelineStateWithDescriptor:psd error:&err]); if (err != nil) @@ -1250,7 +1250,7 @@ typedef struct MTLALIGN(16) err.localizedDescription.UTF8String); return NO; } - + for (unsigned j = 0; j < SLANG_CBUFFER_MAX; j++) { unsigned int size = _engine.pass[i].semantics.cbuffers[j].size; @@ -1258,7 +1258,7 @@ typedef struct MTLALIGN(16) { continue; } - + id buf = [_context.device newBufferWithLength:size options:MTLResourceStorageModeManaged]; STRUCT_ASSIGN(_engine.pass[i].buffers[j], buf); } @@ -1267,9 +1267,9 @@ typedef struct MTLALIGN(16) if (save_msl) { NSString *basePath = [[NSString stringWithUTF8String:shader->pass[i].source.path] stringByDeletingPathExtension]; - + RARCH_LOG("[Metal]: saving metal shader files to %s\n", basePath.UTF8String); - + NSError *err = nil; [vs_src writeToFile:[basePath stringByAppendingPathExtension:@"vs.metal"] atomically:NO @@ -1279,7 +1279,7 @@ typedef struct MTLALIGN(16) { RARCH_ERR("[Metal]: unable to save vertex shader source: %s\n", err.localizedDescription.UTF8String); } - + err = nil; [fs_src writeToFile:[basePath stringByAppendingPathExtension:@"fs.metal"] atomically:NO @@ -1291,38 +1291,38 @@ typedef struct MTLALIGN(16) err.localizedDescription.UTF8String); } } - + free(shader->pass[i].source.string.vertex); free(shader->pass[i].source.string.fragment); - + shader->pass[i].source.string.vertex = NULL; shader->pass[i].source.string.fragment = NULL; } } - + for (unsigned i = 0; i < shader->luts; i++) { struct texture_image image = {0}; image.supports_rgba = true; - + if (!image_texture_load(&image, shader->lut[i].path)) return NO; - + MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatRGBA8Unorm width:image.width height:image.height mipmapped:shader->lut[i].mipmap]; td.usage = MTLTextureUsageShaderRead; [self _initTexture:&_engine.luts[i] withDescriptor:td]; - + [_engine.luts[i].view replaceRegion:MTLRegionMake2D(0, 0, image.width, image.height) mipmapLevel:0 withBytes:image.pixels bytesPerRow:4 * image.width]; - + // TODO(sgc): generate mip maps image_texture_free(&image); } - + video_shader_resolve_current_parameters(conf, shader); _shader = shader; shader = nil; @@ -1333,17 +1333,17 @@ typedef struct MTLALIGN(16) { [self _freeVideoShader:shader]; } - + if (conf) { config_file_free(conf); conf = nil; } } - + resize_render_targets = YES; init_history = YES; - + return YES; } @@ -1369,15 +1369,15 @@ typedef struct MTLALIGN(16) - (bool)loadImages:(const struct texture_image *)images count:(NSUInteger)count { [self _freeImages]; - + _images = [NSMutableArray arrayWithCapacity:count]; - + NSUInteger needed = sizeof(SpriteVertex) * count * 4; if (!_vert || _vert.length < needed) { _vert = [_context.device newBufferWithLength:needed options:MTLResourceStorageModeManaged]; } - + for (NSUInteger i = 0; i < count; i++) { _images[i] = [_context newTexture:images[i] mipmapped:NO]; @@ -1385,9 +1385,9 @@ typedef struct MTLALIGN(16) [self updateTextureCoordsX:0 y:0 w:1 h:1 index:i]; [self _updateColorRed:1.0 green:1.0 blue:1.0 alpha:1.0 index:i]; } - + _vertDirty = YES; - + return YES; } @@ -1398,7 +1398,7 @@ typedef struct MTLALIGN(16) [_vert didModifyRange:NSMakeRange(0, _vert.length)]; _vertDirty = NO; } - + NSUInteger count = _images.count; for (NSUInteger i = 0; i < count; ++i) { @@ -1462,7 +1462,7 @@ MTLPixelFormat glslang_format_to_metal(glslang_format fmt) { #undef FMT2 #define FMT2(x, y) case SLANG_FORMAT_##x: return MTLPixelFormat##y - + switch (fmt) { FMT2(R8_UNORM, R8Unorm); @@ -1475,10 +1475,10 @@ MTLPixelFormat glslang_format_to_metal(glslang_format fmt) FMT2(R8G8B8A8_SINT, RGBA8Sint); FMT2(R8G8B8A8_UINT, RGBA8Uint); FMT2(R8G8B8A8_SRGB, RGBA8Unorm_sRGB); - + FMT2(A2B10G10R10_UNORM_PACK32, RGB10A2Unorm); FMT2(A2B10G10R10_UINT_PACK32, RGB10A2Uint); - + FMT2(R16_UINT, R16Uint); FMT2(R16_SINT, R16Sint); FMT2(R16_SFLOAT, R16Float); @@ -1488,7 +1488,7 @@ MTLPixelFormat glslang_format_to_metal(glslang_format fmt) FMT2(R16G16B16A16_UINT, RGBA16Uint); FMT2(R16G16B16A16_SINT, RGBA16Sint); FMT2(R16G16B16A16_SFLOAT, RGBA16Float); - + FMT2(R32_UINT, R32Uint); FMT2(R32_SINT, R32Sint); FMT2(R32_SFLOAT, R32Float); @@ -1498,7 +1498,7 @@ MTLPixelFormat glslang_format_to_metal(glslang_format fmt) FMT2(R32G32B32A32_UINT, RGBA32Uint); FMT2(R32G32B32A32_SINT, RGBA32Sint); FMT2(R32G32B32A32_SFLOAT, RGBA32Float); - + case SLANG_FORMAT_UNKNOWN: default: break; @@ -1513,10 +1513,10 @@ MTLPixelFormat SelectOptimalPixelFormat(MTLPixelFormat fmt) { case MTLPixelFormatRGBA8Unorm: return MTLPixelFormatBGRA8Unorm; - + case MTLPixelFormatRGBA8Unorm_sRGB: return MTLPixelFormatBGRA8Unorm_sRGB; - + default: return fmt; } diff --git a/gfx/common/orbis_common.h b/gfx/common/orbis_common.h index 2463fa2754..289c7786cf 100644 --- a/gfx/common/orbis_common.h +++ b/gfx/common/orbis_common.h @@ -6,7 +6,7 @@ #include "../common/egl_common.h" #endif -#define ATTR_ORBISGL_WIDTH 1920 +#define ATTR_ORBISGL_WIDTH 1920 #define ATTR_ORBISGL_HEIGHT 1080 typedef struct diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index 2dff930de7..9de79fb7f0 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -2446,7 +2446,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.pNext = NULL; surf_info.flags = 0; surf_info.pView = surface; - + if (create(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; @@ -2467,7 +2467,7 @@ bool vulkan_surface_create(gfx_ctx_vulkan_data_t *vk, surf_info.pNext = NULL; surf_info.flags = 0; surf_info.pView = surface; - + if (create(vk->context.instance, &surf_info, NULL, &vk->vk_surface) != VK_SUCCESS) return false; diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c index 7afdfdb845..acf7da61d1 100644 --- a/gfx/common/win32_common.c +++ b/gfx/common/win32_common.c @@ -635,9 +635,9 @@ static void win32_set_position_from_config(void) g_win32_pos_x = settings->uints.window_position_x; g_win32_pos_y = settings->uints.window_position_y; - g_win32_pos_width = settings->uints.window_position_width + g_win32_pos_width = settings->uints.window_position_width + border_thickness * 2; - g_win32_pos_height = settings->uints.window_position_height + g_win32_pos_height = settings->uints.window_position_height + border_thickness * 2 + title_bar_height; } @@ -719,7 +719,7 @@ static LRESULT CALLBACK WndProcCommon(bool *quit, HWND hwnd, UINT message, break; case WM_SIZE: /* Do not send resize message if we minimize. */ - if ( wparam != SIZE_MAXHIDE && + if ( wparam != SIZE_MAXHIDE && wparam != SIZE_MINIMIZED) { if (LOWORD(lparam) != g_win32_resize_width || @@ -1171,14 +1171,14 @@ bool win32_suppress_screensaver(void *data, bool enable) POWER_REQUEST_CONTEXT RequestContext; HANDLE Request; - RequestContext.Version = + RequestContext.Version = POWER_REQUEST_CONTEXT_VERSION; - RequestContext.Flags = + RequestContext.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING; RequestContext.Reason.SimpleReasonString = (LPWSTR) L"RetroArch running"; - Request = + Request = powerCreateRequest(&RequestContext); powerSetRequest( Request, PowerRequestDisplayRequired); diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c index 1916bc71e2..e9ca2ec57c 100644 --- a/gfx/common/x11_common.c +++ b/gfx/common/x11_common.c @@ -455,7 +455,7 @@ static void x11_handle_key_event(unsigned keycode, XEvent *event, XIC ic, bool f * to feed it keysyms anyway, so here is a little hack... */ if (keysym >= XK_A && keysym <= XK_Z) keysym += XK_z - XK_Z; - + /* Get the real keycode, that correctly ignores international layouts as windows code does. */ key = input_keymaps_translate_keysym_to_rk(keycode); @@ -490,7 +490,7 @@ bool x11_alive(void *data) /* Can get events from older windows. Check this. */ XNextEvent(g_x11_dpy, &event); - + /* IMPORTANT - Get keycode before XFilterEvent because the event is localizated after the call */ keycode = event.xkey.keycode; diff --git a/gfx/display_servers/dispserv_win32.c b/gfx/display_servers/dispserv_win32.c index 69f6bca91f..f06aea3487 100644 --- a/gfx/display_servers/dispserv_win32.c +++ b/gfx/display_servers/dispserv_win32.c @@ -328,9 +328,9 @@ void *win32_display_server_get_resolution_list(void *data, if (!win32_get_video_output(&dm, i, sizeof(dm))) break; - conf[i].width = dm.dmPelsWidth; - conf[i].height = dm.dmPelsHeight; - conf[i].bpp = dm.dmBitsPerPel; + conf[i].width = dm.dmPelsWidth; + conf[i].height = dm.dmPelsHeight; + conf[i].bpp = dm.dmBitsPerPel; conf[i].refreshrate = dm.dmDisplayFrequency; conf[i].idx = i; conf[i].current = false; diff --git a/gfx/display_servers/dispserv_x11.c b/gfx/display_servers/dispserv_x11.c index c6ce13c8dd..4ada2b313d 100644 --- a/gfx/display_servers/dispserv_x11.c +++ b/gfx/display_servers/dispserv_x11.c @@ -20,7 +20,7 @@ #include #include #include -#include // run pkg-config --static --libs xrandr +#include // run pkg-config --static --libs xrandr #include #include @@ -86,8 +86,6 @@ static void x11_display_server_destroy(void *data) "xrandr --delmode %s %.s",orig_output, old_mode); system(output); - - snprintf(output, sizeof(output), "xrandr --rmmode %s", old_mode); system(output); } @@ -122,7 +120,7 @@ static bool x11_display_server_set_window_decorations(void *data, bool on) if (serv) serv->decorations = on; - /* menu_setting performs a reinit instead to properly apply + /* menu_setting performs a reinit instead to properly apply * decoration changes */ return true; @@ -153,7 +151,7 @@ static bool x11_display_server_set_resolution(void *data, crt_en = true; - snprintf(old_mode, sizeof(old_mode), "%s", new_mode); + snprintf(old_mode, sizeof(old_mode), "%s", new_mode); dsp = XOpenDisplay(NULL); scrn = DefaultScreenOfDisplay(dsp); @@ -246,7 +244,7 @@ static bool x11_display_server_set_resolution(void *data, /* variable for new mode */ snprintf(new_mode, sizeof(new_mode), "CRT_%dx%d_%0.2f", width, height, hz); - /* need to run loops for DVI0 - DVI-2 and VGA0 - VGA-2 outputs to + /* need to run loops for DVI0 - DVI-2 and VGA0 - VGA-2 outputs to * add and delete modes */ crt_rrmode.id = crtid; crt_rrmode.width = width; @@ -262,27 +260,26 @@ static bool x11_display_server_set_resolution(void *data, crt_rrmode.name = new_mode; crt_rrmode.nameLength = sizeof(new_mode); crt_rrmode.modeFlags = 0; - + res = XRRGetScreenResources (dsp, window); - + if (monitor_index == 0) { - + for (int i = 0; i < res->noutput; i++) - { + { XRROutputInfo *outputs = XRRGetOutputInfo (dsp, res, res->outputs[i]); - if (outputs->connection == RR_Connected) { snprintf(orig_output, sizeof(orig_output),"%s", outputs->name); - + snprintf(output4, sizeof(output4),"xrandr --addmode %s %s",outputs->name ,new_mode); system(output4); snprintf(output4, sizeof(output4),"xrandr --output %s --mode %s", outputs->name, new_mode); system(output4); - + snprintf(output4, sizeof(output4),"xrandr --delmode %s %s", outputs->name,old_mode); system(output4); snprintf(output4, sizeof(output4),"xrandr --rmmode %s", old_mode); @@ -293,22 +290,22 @@ static bool x11_display_server_set_resolution(void *data, } if (monitor_index > 0) { - + XRROutputInfo *outputs = XRRGetOutputInfo (dsp, res, res->outputs[monitor_index]); if (outputs->connection == RR_Connected) { snprintf(orig_output, sizeof(orig_output),"%s", outputs->name); - + snprintf(output4, sizeof(output4),"xrandr --addmode %s %s",outputs->name ,new_mode); system(output4); snprintf(output4, sizeof(output4),"xrandr --output %s --mode %s", outputs->name, new_mode); system(output4); - + snprintf(output4, sizeof(output4),"xrandr --delmode %s %s", outputs->name, old_mode); system(output4); snprintf(output4, sizeof(output4),"xrandr --rmmode %s", old_mode); system(output4); - + } } return true; diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c index 79b8fe526d..e9beb69fb0 100644 --- a/gfx/drivers/d3d10.c +++ b/gfx/drivers/d3d10.c @@ -59,7 +59,7 @@ d3d10_overlay_vertex_geom(void* data, unsigned index, float x, float y, float w, if (!d3d10) return; - D3D10MapBuffer(d3d10->overlays.vbo, + D3D10MapBuffer(d3d10->overlays.vbo, D3D10_MAP_WRITE_NO_OVERWRITE, 0, (void**)&sprites); sprites[index].pos.x = x; sprites[index].pos.y = y; @@ -89,7 +89,7 @@ static void d3d10_overlay_tex_geom(void* data, unsigned index, float u, float v, return; D3D10MapBuffer( - d3d10->overlays.vbo, + d3d10->overlays.vbo, D3D10_MAP_WRITE_NO_OVERWRITE, 0, (void**)&sprites); sprites[index].coords.u = u; sprites[index].coords.v = v; @@ -142,7 +142,7 @@ static bool d3d10_overlay_load(void* data, const void* image_data, unsigned num_ #endif D3D10CreateBuffer(d3d10->device, &desc, NULL, &d3d10->overlays.vbo); - D3D10MapBuffer(d3d10->overlays.vbo, + D3D10MapBuffer(d3d10->overlays.vbo, D3D10_MAP_WRITE_DISCARD, 0, (void**)&sprites); for (i = 0; i < (unsigned)num_images; i++) @@ -615,10 +615,10 @@ d3d10_gfx_init(const video_info_t* video, #ifdef HAVE_MONITOR if (!d3d10->vp.full_width) - d3d10->vp.full_width = + d3d10->vp.full_width = current_mon.rcMonitor.right - current_mon.rcMonitor.left; if (!d3d10->vp.full_height) - d3d10->vp.full_height = + d3d10->vp.full_height = current_mon.rcMonitor.bottom - current_mon.rcMonitor.top; #endif @@ -680,7 +680,7 @@ d3d10_gfx_init(const video_info_t* video, d3d10->viewport.Height = d3d10->vp.full_height; d3d10->resize_viewport = true; d3d10->vsync = video->vsync; - d3d10->format = video->rgb32 ? + d3d10->format = video->rgb32 ? DXGI_FORMAT_B8G8R8X8_UNORM : DXGI_FORMAT_B5G6R5_UNORM; d3d10->frame.texture[0].desc.Format = d3d10->format; @@ -768,7 +768,7 @@ d3d10_gfx_init(const video_info_t* video, { { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 1.0f, 1.0f, 1.0f, 1.0f } }, { { 1.0f, 1.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f, 1.0f } }, }; - D3D10_SUBRESOURCE_DATA + D3D10_SUBRESOURCE_DATA vertexData = { vertices }; desc.ByteWidth = sizeof(vertices); @@ -926,7 +926,7 @@ d3d10_gfx_init(const video_info_t* video, blend_desc.BlendEnable[0] = FALSE; D3D10CreateBlendState(d3d10->device, &blend_desc, &d3d10->blend_disable); - } + } { D3D10_RASTERIZER_DESC desc = { (D3D10_FILL_MODE)0 }; diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c index e7e1c54e53..3a858b5645 100644 --- a/gfx/drivers/d3d11.c +++ b/gfx/drivers/d3d11.c @@ -639,8 +639,8 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i { UINT flags = 0; - D3D_FEATURE_LEVEL - requested_feature_levels[] = + D3D_FEATURE_LEVEL + requested_feature_levels[] = { D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_1, @@ -753,7 +753,7 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i d3d11->viewport.Height = d3d11->vp.full_height; d3d11->resize_viewport = true; d3d11->vsync = video->vsync; - d3d11->format = video->rgb32 ? + d3d11->format = video->rgb32 ? DXGI_FORMAT_B8G8R8X8_UNORM : DXGI_FORMAT_B5G6R5_UNORM; d3d11->frame.texture[0].desc.Format = d3d11->format; @@ -839,7 +839,7 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i { { 1.0f, 0.0f }, { 1.0f, 1.0f }, { 1.0f, 1.0f, 1.0f, 1.0f } }, { { 1.0f, 1.0f }, { 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f, 1.0f } }, }; - D3D11_SUBRESOURCE_DATA + D3D11_SUBRESOURCE_DATA vertexData = { vertices }; desc.ByteWidth = sizeof(vertices); @@ -1549,11 +1549,11 @@ static void d3d11_set_menu_texture_frame( { d3d11_video_t* d3d11 = (d3d11_video_t*)data; settings_t* settings = config_get_ptr(); - DXGI_FORMAT format = rgb32 ? DXGI_FORMAT_B8G8R8A8_UNORM : + DXGI_FORMAT format = rgb32 ? DXGI_FORMAT_B8G8R8A8_UNORM : (DXGI_FORMAT)DXGI_FORMAT_EX_A4R4G4B4_UNORM; if ( - d3d11->menu.texture.desc.Width != width || + d3d11->menu.texture.desc.Width != width || d3d11->menu.texture.desc.Height != height) { d3d11->menu.texture.desc.Format = format; diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 2251a428d4..53da70d305 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -1627,13 +1627,13 @@ static void d3d12_set_menu_texture_frame( { d3d12_video_t* d3d12 = (d3d12_video_t*)data; settings_t* settings = config_get_ptr(); - int pitch = width * + int pitch = width * (rgb32 ? sizeof(uint32_t) : sizeof(uint16_t)); - DXGI_FORMAT format = rgb32 ? DXGI_FORMAT_B8G8R8A8_UNORM + DXGI_FORMAT format = rgb32 ? DXGI_FORMAT_B8G8R8A8_UNORM : (DXGI_FORMAT)DXGI_FORMAT_EX_A4R4G4B4_UNORM; if ( - d3d12->menu.texture.desc.Width != width || + d3d12->menu.texture.desc.Width != width || d3d12->menu.texture.desc.Height != height) { d3d12->menu.texture.desc.Width = width; diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c index 21830cd500..ae9d9015fa 100644 --- a/gfx/drivers/d3d8.c +++ b/gfx/drivers/d3d8.c @@ -1663,7 +1663,7 @@ static void d3d8_set_menu_texture_frame(void *data, (void)height; (void)alpha; - if ( !d3d->menu->tex || + if ( !d3d->menu->tex || d3d->menu->tex_w != width || d3d->menu->tex_h != height) { diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c index 891937c482..02298010ba 100644 --- a/gfx/drivers/d3d9.c +++ b/gfx/drivers/d3d9.c @@ -121,7 +121,7 @@ static bool d3d9_init_imports(d3d9_video_t *d3d) tracker_info.script_class = d3d->shader.script_class; #endif - state_tracker = + state_tracker = state_tracker_init(&tracker_info); if (!state_tracker) @@ -690,7 +690,7 @@ void d3d9_make_d3dpp(void *data, #ifdef _XBOX /* TODO/FIXME - get rid of global state dependencies. */ global_t *global = global_get_ptr(); - bool gamma_enable = global ? + bool gamma_enable = global ? global->console.screen.gamma_correction : false; #endif bool windowed_enable = d3d9_is_windowed_enable(info->fullscreen); @@ -1113,7 +1113,7 @@ static bool d3d9_alive(void *data) ret = !quit; - if ( temp_width != 0 && + if ( temp_width != 0 && temp_height != 0) video_driver_set_size(&temp_width, &temp_height); @@ -1830,7 +1830,7 @@ static void d3d9_set_menu_texture_frame(void *data, if (!d3d || !d3d->menu) return; - if ( !d3d->menu->tex || + if ( !d3d->menu->tex || d3d->menu->tex_w != width || d3d->menu->tex_h != height) { diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c index acb26144a1..bf04766711 100644 --- a/gfx/drivers/drm_gfx.c +++ b/gfx/drivers/drm_gfx.c @@ -405,9 +405,9 @@ static uint64_t drm_plane_type(drmModePlane *plane) { int i,j; - /* The property values and their names are stored in different arrays, + /* The property values and their names are stored in different arrays, * so we access them simultaneously here. - * We are interested in OVERLAY planes only, that's + * We are interested in OVERLAY planes only, that's * type 0 or DRM_PLANE_TYPE_OVERLAY * (see /usr/xf86drmMode.h for definition). */ drmModeObjectPropertiesPtr props = diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c index 6e954bb5c6..ce2256a84e 100644 --- a/gfx/drivers/exynos_gfx.c +++ b/gfx/drivers/exynos_gfx.c @@ -1325,7 +1325,7 @@ static bool exynos_gfx_frame(void *data, const void *frame, unsigned width, } else if (video_info->statistics_show) { - struct font_params *osd_params = video_info ? + struct font_params *osd_params = video_info ? (struct font_params*)&video_info->osd_stat_params : NULL; if (osd_params) diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c index 034a6db400..1b738dfcd3 100644 --- a/gfx/drivers/gdi_gfx.c +++ b/gfx/drivers/gdi_gfx.c @@ -214,8 +214,8 @@ static bool gdi_gfx_frame(void *data, const void *frame, menu_driver_frame(video_info); #endif - if ( gdi_video_width != frame_width || - gdi_video_height != frame_height || + if ( gdi_video_width != frame_width || + gdi_video_height != frame_height || gdi_video_pitch != pitch) { if (frame_width > 4 && frame_height > 4) @@ -240,8 +240,8 @@ static bool gdi_gfx_frame(void *data, const void *frame, height = gdi_video_height; pitch = gdi_video_pitch; - if ( frame_width == 4 && - frame_height == 4 && + if ( frame_width == 4 && + frame_height == 4 && (frame_width < width && frame_height < height) ) draw = false; @@ -280,7 +280,7 @@ static bool gdi_gfx_frame(void *data, const void *frame, if (gdi_temp_buf) free(gdi_temp_buf); - tmp = (unsigned short*)malloc(width * height + tmp = (unsigned short*)malloc(width * height * sizeof(unsigned short)); if (tmp) @@ -509,9 +509,9 @@ static void gdi_set_texture_frame(void *data, gdi_menu_frame = NULL; } - if ( !gdi_menu_frame || - gdi_menu_width != width || - gdi_menu_height != height || + if ( !gdi_menu_frame || + gdi_menu_width != width || + gdi_menu_height != height || gdi_menu_pitch != pitch) { if (pitch && height) @@ -579,7 +579,7 @@ static uintptr_t gdi_load_texture(void *video_data, void *data, void *tmpdata = NULL; gdi_texture_t *texture = NULL; struct texture_image *image = (struct texture_image*)data; - int size = image->width * + int size = image->width * image->height * sizeof(uint32_t); if (!image || image->width > 2048 || image->height > 2048) @@ -594,7 +594,7 @@ static uintptr_t gdi_load_texture(void *video_data, void *data, texture->height = image->height; texture->active_width = image->width; texture->active_height = image->height; - texture->data = calloc(1, + texture->data = calloc(1, texture->width * texture->height * sizeof(uint32_t)); texture->type = filter_type; diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index 0a350d9876..b324fad0f2 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -1849,7 +1849,7 @@ bool gl_load_luts( GLuint *textures_lut) { unsigned i; - const struct video_shader *shader = + const struct video_shader *shader = (const struct video_shader*)shader_data; unsigned num_luts = MIN(shader->luts, GFX_MAX_TEXTURES); @@ -1991,8 +1991,6 @@ static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info) } #endif - - static void gl_set_viewport_wrapper(void *data, unsigned viewport_width, unsigned viewport_height, bool force_full, bool allow_rotate) { @@ -2239,7 +2237,6 @@ static INLINE void gl_set_shader_viewports(gl_t *gl) } } - static void gl_set_texture_frame(void *data, const void *frame, bool rgb32, unsigned width, unsigned height, float alpha) diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c index bed3e8de8e..b15d1e2f3a 100644 --- a/gfx/drivers/gx2_gfx.c +++ b/gfx/drivers/gx2_gfx.c @@ -1436,7 +1436,7 @@ static bool wiiu_gfx_set_shader(void *data, #else for (int i = 0; i < wiiu->shader_preset->passes; i++) slang_preprocess_parse_parameters(wiiu->shader_preset->pass[i].source.path, wiiu->shader_preset); - + video_shader_resolve_current_parameters(conf, wiiu->shader_preset); #endif config_file_free(conf); diff --git a/gfx/drivers/gx2_shaders/bokeh.c b/gfx/drivers/gx2_shaders/bokeh.c index 6ce7c43ff9..050b4378ad 100644 --- a/gfx/drivers/gx2_shaders/bokeh.c +++ b/gfx/drivers/gx2_shaders/bokeh.c @@ -794,6 +794,6 @@ GX2Shader bokeh_shader = .uniformBlockCount = countof(uniform_blocks), uniform_blocks, .uniformVarCount = countof(uniform_vars), uniform_vars, .samplerVarCount = countof(samplers), samplers, - }, + }, .attribute_stream = attribute_stream, }; diff --git a/gfx/drivers/gx2_shaders/frame.c b/gfx/drivers/gx2_shaders/frame.c index 9bc5976a62..f6614cb4d4 100644 --- a/gfx/drivers/gx2_shaders/frame.c +++ b/gfx/drivers/gx2_shaders/frame.c @@ -157,6 +157,6 @@ GX2Shader frame_shader = .program = (uint8_t*)&ps_program, .mode = GX2_SHADER_MODE_UNIFORM_BLOCK, .samplerVarCount = countof(samplers), samplers, - }, + }, .attribute_stream = attribute_stream, }; diff --git a/gfx/drivers/gx2_shaders/ribbon.c b/gfx/drivers/gx2_shaders/ribbon.c index a1207401a1..d87f41eb32 100644 --- a/gfx/drivers/gx2_shaders/ribbon.c +++ b/gfx/drivers/gx2_shaders/ribbon.c @@ -383,6 +383,6 @@ GX2Shader ribbon_shader = .program = (uint8_t*)&ps_program, .mode = GX2_SHADER_MODE_UNIFORM_BLOCK, .samplerVarCount = countof(samplers), samplers, - }, + }, .attribute_stream = attribute_stream, }; diff --git a/gfx/drivers/gx2_shaders/snow.c b/gfx/drivers/gx2_shaders/snow.c index 7a4d5915b3..455facee07 100644 --- a/gfx/drivers/gx2_shaders/snow.c +++ b/gfx/drivers/gx2_shaders/snow.c @@ -1457,6 +1457,6 @@ GX2Shader snow_shader = .program = (uint8_t*)&ps_program, .mode = GX2_SHADER_MODE_UNIFORM_BLOCK, .samplerVarCount = countof(samplers), samplers, - }, + }, .attribute_stream = attribute_stream, }; diff --git a/gfx/drivers/gx2_shaders/tex.c b/gfx/drivers/gx2_shaders/tex.c index 7a13e79075..654a84f51c 100644 --- a/gfx/drivers/gx2_shaders/tex.c +++ b/gfx/drivers/gx2_shaders/tex.c @@ -168,6 +168,6 @@ GX2Shader tex_shader = .program = (uint8_t*)&ps_program, .mode = GX2_SHADER_MODE_UNIFORM_BLOCK, .samplerVarCount = countof(samplers), samplers, - }, + }, .attribute_stream = attribute_stream, }; diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m index 81d9fdf4dc..30a962d587 100644 --- a/gfx/drivers/metal.m +++ b/gfx/drivers/metal.m @@ -60,21 +60,21 @@ static void *metal_init(const video_info_t *video, void **input_data) { [apple_platform setViewType:APPLE_VIEW_TYPE_METAL]; - + MetalDriver *md = [[MetalDriver alloc] initWithVideo:video input:input inputData:input_data]; if (md == nil) { return NULL; } - + const char *shader_path = retroarch_get_shader_preset(); - + if (shader_path) { enum rarch_shader_type type = video_shader_parse_type(shader_path, RARCH_SHADER_SLANG); metal_set_shader(((__bridge void *)md), type, shader_path); } - + return (__bridge_retained void *)md; } @@ -129,13 +129,13 @@ static bool metal_set_shader(void *data, return false; if (!path) return true; - + if (type != RARCH_SHADER_SLANG) { RARCH_WARN("[Metal] Only .slang or .slangp shaders are supported. Falling back to stock.\n"); return false; } - + return [md.frameView setShaderFromPath:[NSString stringWithUTF8String:path]]; #else return false; @@ -155,7 +155,7 @@ static void metal_set_viewport(void *data, unsigned viewport_width, if (md == nil) { return; } - + [md setViewportWidth:viewport_width height:viewport_height forceFull:force_full allowRotate:allow_rotate]; } @@ -165,7 +165,7 @@ static void metal_set_rotation(void *data, unsigned rotation) if (md == nil) { return; } - + [md setRotation:rotation]; } @@ -188,7 +188,7 @@ static uintptr_t metal_load_texture(void *video_data, void *data, struct texture_image *img = (struct texture_image *)data; if (!img) return 0; - + struct texture_image image = *img; Texture *t = [md.context newTexture:image filter:filter_type]; return (uintptr_t)(__bridge_retained void *)(t); @@ -215,7 +215,7 @@ static float metal_get_refresh_rate(void *data) { MetalDriver *md = (__bridge MetalDriver *)data; (void)md; - + return 0.0f; } @@ -228,28 +228,28 @@ static void metal_set_filtering(void *data, unsigned index, bool smooth) static void metal_set_aspect_ratio(void *data, unsigned aspect_ratio_idx) { MetalDriver *md = (__bridge MetalDriver *)data; - + switch (aspect_ratio_idx) { case ASPECT_RATIO_SQUARE: video_driver_set_viewport_square_pixel(); break; - + case ASPECT_RATIO_CORE: video_driver_set_viewport_core(); break; - + case ASPECT_RATIO_CONFIG: video_driver_set_viewport_config(); break; - + default: break; } - + video_driver_set_aspect_ratio_value( aspectratio_lut[aspect_ratio_idx].value); - + md.keepAspect = YES; [md setNeedsResize]; } @@ -266,7 +266,7 @@ static void metal_set_texture_frame(void *data, const void *frame, { MetalDriver *md = (__bridge MetalDriver *)data; settings_t *settings = config_get_ptr(); - + [md.menu updateWidth:width height:height format:rgb32 ? RPixelFormatBGRA8Unorm : RPixelFormatBGRA4Unorm @@ -280,7 +280,7 @@ static void metal_set_texture_enable(void *data, bool state, bool full_screen) MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return; - + md.menu.enabled = state; #if 0 md.menu.fullScreen = full_screen; @@ -305,19 +305,18 @@ static struct video_shader *metal_get_current_shader(void *data) MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return NULL; - + return md.frameView.shader; } - static uint32_t metal_get_flags(void *data) { uint32_t flags = 0; - + BIT32_SET(flags, GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES); BIT32_SET(flags, GFX_CTX_FLAGS_BLACK_FRAME_INSERTION); BIT32_SET(flags, GFX_CTX_FLAGS_MENU_FRAME_FILTERING); - + return flags; } @@ -360,7 +359,7 @@ static bool metal_overlay_load(void *data, MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return NO; - + return [md.overlay loadImages:(const struct texture_image *)images count:num_images]; } @@ -370,7 +369,7 @@ static void metal_overlay_tex_geom(void *data, unsigned index, MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return; - + [md.overlay updateTextureCoordsX:x y:y w:w h:h index:index]; } @@ -380,7 +379,7 @@ static void metal_overlay_vertex_geom(void *data, unsigned index, MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return; - + [md.overlay updateVertexX:x y:y w:w h:h index:index]; } @@ -389,7 +388,7 @@ static void metal_overlay_full_screen(void *data, bool enable) MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return; - + md.overlay.fullscreen = enable; } @@ -398,7 +397,7 @@ static void metal_overlay_set_alpha(void *data, unsigned index, float mod) MetalDriver *md = (__bridge MetalDriver *)data; if (!md) return; - + [md.overlay updateAlpha:mod index:index]; } @@ -420,7 +419,6 @@ static void metal_get_overlay_interface(void *data, #endif - video_driver_t video_metal = { .init = metal_init, .frame = metal_frame, diff --git a/gfx/drivers/ps2_gfx.c b/gfx/drivers/ps2_gfx.c index 5971c53676..ca72ebb3f6 100644 --- a/gfx/drivers/ps2_gfx.c +++ b/gfx/drivers/ps2_gfx.c @@ -36,7 +36,7 @@ typedef struct ps2_video GSTEXTURE *coreTexture; bool clearVRAM; struct retro_hw_render_interface_gskit_ps2 iface; /* Palette in the cores */ - + bool menuVisible; bool fullscreen; @@ -58,14 +58,14 @@ static GSGLOBAL *init_GSGlobal(void) gsGlobal->Field = GS_FIELD; gsGlobal->Width = NTSC_WIDTH; gsGlobal->Height = NTSC_HEIGHT; - + gsGlobal->PSM = GS_PSM_CT16; gsGlobal->PSMZ = GS_PSMZ_16; gsGlobal->DoubleBuffering = GS_SETTING_OFF; gsGlobal->ZBuffering = GS_SETTING_OFF; gsGlobal->PrimAlphaEnable = GS_SETTING_OFF; - dmaKit_init(D_CTRL_RELE_OFF,D_CTRL_MFD_OFF, D_CTRL_STS_UNSPEC, + dmaKit_init(D_CTRL_RELE_OFF,D_CTRL_MFD_OFF, D_CTRL_STS_UNSPEC, D_CTRL_STD_OFF, D_CTRL_RCYC_8, 1 << DMA_CHANNEL_GIF); /* Initialize the DMAC */ @@ -109,7 +109,7 @@ static bool texture_need_prepare(GSTEXTURE *texture, int width, int height, int return texture->Width != width || texture->Height != height || texture->PSM != PSM; } -static void transfer_texture(GSTEXTURE *texture, const void *frame, +static void transfer_texture(GSTEXTURE *texture, const void *frame, int width, int height, int PSM, int filter, bool color_correction) { texture->Width = width; @@ -143,7 +143,7 @@ static void prim_texture(GSGLOBAL *gsGlobal, GSTEXTURE *texture, int zPosition, float delta = MIN(width_proportion, height_proportion); float newWidth = texture->Width * delta; float newHeight = texture->Height * delta; - + x1 = (gsGlobal->Width - newWidth) / 2.0f; y1 = (gsGlobal->Height - newHeight) / 2.0f; x2 = newWidth + x1; @@ -251,7 +251,7 @@ static bool ps2_gfx_frame(void *data, const void *frame, if(ps2->clearVRAM) { vram_alloc(ps2->gsGlobal, ps2->coreTexture); } - gsKit_texture_upload(ps2->gsGlobal, ps2->coreTexture); + gsKit_texture_upload(ps2->gsGlobal, ps2->coreTexture); prim_texture(ps2->gsGlobal, ps2->coreTexture, 1, ps2->force_aspect); } @@ -386,11 +386,11 @@ static void ps2_set_texture_frame(void *data, const void *frame, bool rgb32, unsigned width, unsigned height, float alpha) { ps2_video_t *ps2 = (ps2_video_t*)data; - + bool color_correction = false; int PSM = (rgb32 ? GS_PSM_CT32 : GS_PSM_CT16); bool texture_changed = texture_need_prepare(ps2->menuTexture, width, height, PSM); - + transfer_texture(ps2->menuTexture, frame, width, height, PSM, ps2->menu_filter, color_correction); ps2->clearVRAM = ps2->clearVRAM || texture_changed; } @@ -414,7 +414,7 @@ static void ps2_set_osd_msg(void *data, font_driver_render_msg(video_info, font, msg, params); } -static bool ps2_get_hw_render_interface(void* data, +static bool ps2_get_hw_render_interface(void* data, const struct retro_hw_render_interface** iface) { ps2_video_t* ps2 = (ps2_video_t*)data; diff --git a/gfx/drivers/switch_gfx.c b/gfx/drivers/switch_gfx.c index b024a12be1..954938ef3f 100644 --- a/gfx/drivers/switch_gfx.c +++ b/gfx/drivers/switch_gfx.c @@ -74,7 +74,7 @@ typedef struct surface_t surface; revent_h vsync_h; uint32_t image[1280*720]; - + struct scaler_ctx scaler; uint32_t last_width; uint32_t last_height; @@ -144,7 +144,7 @@ static bool switch_frame(void *data, const void *frame, const char *msg, video_frame_info_t *video_info) { static uint64_t last_frame = 0; - + unsigned x, y; result_t r; int tgtw, tgth, centerx, centery; @@ -253,9 +253,9 @@ static bool switch_frame(void *data, const void *frame, if(r != RESULT_OK) return true; gfx_slow_swizzling_blit(out_buffer, sw->image, 1280, 720, 0, 0); - + r = surface_queue_buffer(&sw->surface); - + if (r != RESULT_OK) return false; @@ -341,7 +341,7 @@ static void switch_set_texture_frame( { switch_video_t *sw = data; - if ( !sw->menu_texture.pixels || + if ( !sw->menu_texture.pixels || sw->menu_texture.width != width || sw->menu_texture.height != height) { @@ -360,10 +360,10 @@ static void switch_set_texture_frame( xsf = 1280 / width; ysf = 720 / height; sf = xsf; - + if (ysf < sf) sf = ysf; - + sw->menu_texture.width = width; sw->menu_texture.height = height; sw->menu_texture.tgtw = width * sf; diff --git a/gfx/drivers/switch_nx_gfx.c b/gfx/drivers/switch_nx_gfx.c index 46fd5a6345..b54701e720 100644 --- a/gfx/drivers/switch_nx_gfx.c +++ b/gfx/drivers/switch_nx_gfx.c @@ -283,7 +283,7 @@ static void switch_update_viewport(switch_video_t *sw, if (fabsf(device_aspect - desired_aspect) < 0.0001f) { - /* + /* * If the aspect ratios of screen and desired aspect * ratio are sufficiently equal (floating point stuff), * assume they are actually equal. diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index e5395e1d07..830d674a95 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -2084,7 +2084,7 @@ static bool vulkan_frame(void *data, const void *frame, } /* Vulkan doesn't directly support swap_interval > 1, so we fake it by duping out more frames. */ - if ( vk->context->swap_interval > 1 + if ( vk->context->swap_interval > 1 && !vk->context->swap_interval_emulation_lock) { unsigned i; diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m index 18649c2b34..80febccef4 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -1,7 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2013-2014 - Jason Fetters * Copyright (C) 2011-2017 - Daniel De Matteis - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -89,7 +89,7 @@ static enum gfx_ctx_api cocoagl_api = GFX_CTX_NONE; typedef struct cocoa_ctx_data { - bool core_hw_context_enable; + bool core_hw_context_enable; } cocoa_ctx_data_t; #if defined(HAVE_COCOATOUCH) @@ -143,7 +143,7 @@ void *glkitview_init(void) [g_view addSubview:g_pause_indicator_view]; #endif g_view.enableSetNeedsDisplay = NO; - + return (BRIDGE void *)((GLKView*)g_view); #else return nsview_get_ptr(); @@ -191,14 +191,13 @@ void *get_chosen_screen(void) RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead."); return (BRIDGE void*)screens; } - + return ((BRIDGE void*)[screens objectAtIndex:settings->uints.video_monitor_index]); } - float get_backing_scale_factor(void) { - static float + static float backing_scale_def = 0.0f; RAScreen *screen = NULL; @@ -296,11 +295,11 @@ static bool cocoagl_gfx_ctx_bind_api(void *data, enum gfx_ctx_api api, unsigned if (api != GFX_CTX_OPENGL_API) return false; #endif - + cocoagl_api = api; g_minor = minor; g_major = major; - + return true; } @@ -315,14 +314,14 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int i) #elif defined(HAVE_COCOA) GLint value = interval ? 1 : 0; [g_context setValues:&value forParameter:NSOpenGLCPSwapInterval]; - + #endif } static void cocoagl_gfx_ctx_show_mouse(void *data, bool state) { (void)data; - + #ifdef HAVE_COCOA if (state) [NSCursor unhide]; @@ -339,7 +338,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, CocoaView *g_view = (CocoaView*)nsview_get_ptr(); if ([g_view respondsToSelector: @selector(setWantsBestResolutionOpenGLSurface:)]) [g_view setWantsBestResolutionOpenGLSurface:YES]; - + NSOpenGLPixelFormatAttribute attributes [] = { NSOpenGLPFAColorSize, 24, @@ -367,9 +366,9 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, attributes[7] = NSOpenGLProfileVersion4_1Core; } #endif - + g_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; - + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 if (g_format == nil) { @@ -379,7 +378,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, g_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; } #endif - + if (g_use_hw_ctx) g_hw_ctx = [[NSOpenGLContext alloc] initWithFormat:g_format shareContext:nil]; g_context = [[NSOpenGLContext alloc] initWithFormat:g_format shareContext:(g_use_hw_ctx) ? g_hw_ctx : nil]; @@ -390,9 +389,9 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, g_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; g_view.context = g_context; #endif - + [g_context makeCurrentContext]; - + #if defined(HAVE_COCOA) static bool has_went_fullscreen = false; /* TODO: Screen mode support. */ @@ -502,7 +501,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty NSSize display_pixel_size = [[description objectForKey:NSDeviceSize] sizeValue]; CGSize display_physical_size = CGDisplayScreenSize( [[description objectForKey:@"NSScreenNumber"] unsignedIntValue]); - + float display_width = display_pixel_size.width; float display_height = display_pixel_size.height; float physical_width = display_physical_size.width; @@ -535,9 +534,9 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty break; } #endif - + (void)display_height; - + switch (type) { case DISPLAY_METRIC_MM_WIDTH: @@ -554,7 +553,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty *value = 0; return false; } - + return true; } @@ -587,7 +586,7 @@ static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2) { if (!(--g_fast_forward_skips < 0)) return; - + #if defined(HAVE_COCOA) [g_context flushBuffer]; [g_hw_ctx flushBuffer]; @@ -595,7 +594,7 @@ static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2) if (g_view) [g_view display]; #endif - + g_fast_forward_skips = g_is_syncing ? 0 : 3; } @@ -634,7 +633,7 @@ static void cocoagl_gfx_ctx_bind_hw_render(void *data, bool enable) { (void)data; g_use_hw_ctx = enable; - + if (enable) [g_hw_ctx makeCurrentContext]; else diff --git a/gfx/drivers_context/cocoa_gl_ctx_metal.m b/gfx/drivers_context/cocoa_gl_ctx_metal.m index d554ab8385..4bf637d51c 100644 --- a/gfx/drivers_context/cocoa_gl_ctx_metal.m +++ b/gfx/drivers_context/cocoa_gl_ctx_metal.m @@ -136,12 +136,12 @@ void *glkitview_init(void) { #if defined(HAVE_COCOATOUCH) glkitview_init_xibs(); - + g_view = [GLKView new]; g_view.multipleTouchEnabled = YES; g_view.enableSetNeedsDisplay = NO; [g_view addSubview:g_pause_indicator_view]; - + return (BRIDGE void *)((GLKView*)g_view); #else return nsview_get_ptr(); @@ -180,32 +180,31 @@ void *get_chosen_screen(void) NSArray *screens = [RAScreen screens]; if (!screens || !settings) return NULL; - + if (settings->uints.video_monitor_index >= screens.count) { RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead."); return (BRIDGE void*)screens; } - + return ((BRIDGE void*)[screens objectAtIndex:settings->uints.video_monitor_index]); } - float get_backing_scale_factor(void) { static float backing_scale_def = 0.0f; RAScreen *screen = NULL; - + (void)screen; - + if (backing_scale_def != 0.0f) return backing_scale_def; - + backing_scale_def = 1.0f; #ifdef HAVE_COCOA_METAL screen = (BRIDGE RAScreen*)get_chosen_screen(); - + if (screen) { SEL selector = NSSelectorFromString(BOXSTRING("backingScaleFactor")); @@ -219,7 +218,7 @@ float get_backing_scale_factor(void) } } #endif - + return backing_scale_def; } @@ -246,16 +245,16 @@ void cocoagl_gfx_ctx_update(void) static void cocoagl_gfx_ctx_destroy(void *data) { cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; - + if (!cocoa_ctx) return; - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: [GLContextClass clearCurrentContext]; - + #if defined(HAVE_COCOA_METAL) [g_context clearDrawable]; RELEASE(g_context); @@ -276,14 +275,14 @@ static void cocoagl_gfx_ctx_destroy(void *data) slock_free(cocoa_ctx->vk.context.queue_lock); } memset(&cocoa_ctx->vk, 0, sizeof(cocoa_ctx->vk)); - + #endif break; case GFX_CTX_NONE: default: break; } - + free(cocoa_ctx); } @@ -291,10 +290,10 @@ static void *cocoagl_gfx_ctx_init(video_frame_info_t *video_info, void *video_dr { cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*) calloc(1, sizeof(cocoa_ctx_data_t)); - + if (!cocoa_ctx) return NULL; - + switch (cocoagl_api) { #if defined(HAVE_COCOATOUCH) @@ -320,9 +319,9 @@ static void *cocoagl_gfx_ctx_init(video_frame_info_t *video_info, void *video_dr default: break; } - + return cocoa_ctx; - + error: free(cocoa_ctx); return NULL; @@ -353,11 +352,11 @@ static bool cocoagl_gfx_ctx_bind_api(void *data, enum gfx_ctx_api api, unsigned default: return false; } - + cocoagl_api = api; g_minor = minor; g_major = major; - + return true; } @@ -366,7 +365,7 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int interval) #ifdef HAVE_VULKAN cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; #endif - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: @@ -398,13 +397,13 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int interval) default: break; } - + } static void cocoagl_gfx_ctx_show_mouse(void *data, bool state) { (void)data; - + #ifdef HAVE_COCOA_METAL if (state) [NSCursor unhide]; @@ -420,12 +419,12 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; cocoa_ctx->width = width; cocoa_ctx->height = height; - + #if defined(HAVE_COCOA_METAL) //CocoaView *g_view = (BRIDGE CocoaView *)nsview_get_ptr(); NSView *g_view = apple_platform.renderView; #endif - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: @@ -434,7 +433,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, #if defined(HAVE_COCOA_METAL) if ([g_view respondsToSelector: @selector(setWantsBestResolutionOpenGLSurface:)]) [g_view setWantsBestResolutionOpenGLSurface:YES]; - + NSOpenGLPixelFormatAttribute attributes [] = { NSOpenGLPFAColorSize, 24, @@ -446,7 +445,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, 0, /* profile enum */ (NSOpenGLPixelFormatAttribute)0 }; - + #if MAC_OS_X_VERSION_10_7 if (g_major == 3 && (g_minor >= 1 && g_minor <= 3)) { @@ -454,7 +453,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, attributes[7] = NSOpenGLProfileVersion3_2Core; } #endif - + #if MAC_OS_X_VERSION_10_10 if (g_major == 4 && g_minor == 1) { @@ -462,9 +461,9 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, attributes[7] = NSOpenGLProfileVersion4_1Core; } #endif - + g_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; - + #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 if (g_format == nil) { @@ -474,7 +473,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, g_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; } #endif - + if (g_use_hw_ctx) g_hw_ctx = [[NSOpenGLContext alloc] initWithFormat:g_format shareContext:nil]; g_context = [[NSOpenGLContext alloc] initWithFormat:g_format shareContext:(g_use_hw_ctx) ? g_hw_ctx : nil]; @@ -485,7 +484,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, g_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; g_view.context = g_context; #endif - + [g_context makeCurrentContext]; break; } @@ -506,11 +505,11 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, default: break; } - + #if defined(HAVE_COCOA_METAL) static bool has_went_fullscreen = false; /* TODO: Screen mode support. */ - + if (fullscreen) { if (!has_went_fullscreen) @@ -527,15 +526,15 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data, [[g_view window] makeFirstResponder:g_view]; cocoagl_gfx_ctx_show_mouse(data, true); } - + [[g_view window] setContentSize:NSMakeSize(width, height)]; } - + has_went_fullscreen = fullscreen; #endif - + /* TODO: Maybe iOS users should be able to show/hide the status bar here? */ - + return true; } @@ -544,15 +543,15 @@ float cocoagl_gfx_ctx_get_native_scale(void) static CGFloat ret = 0.0f; SEL selector = NSSelectorFromString(BOXSTRING("nativeScale")); RAScreen *screen = (BRIDGE RAScreen*)get_chosen_screen(); - + if (ret != 0.0f) return ret; if (!screen) return 0.0f; - + if ([screen respondsToSelector:selector]) return (float)get_from_selector([screen class], screen, selector, &ret); - + ret = 1.0f; selector = NSSelectorFromString(BOXSTRING("scale")); if ([screen respondsToSelector:selector]) @@ -589,18 +588,18 @@ static void cocoagl_gfx_ctx_update_title(void *data, void *data2) { ui_window_cocoa_t view; const ui_window_t *window = ui_companion_driver_get_window_ptr(); - + //view.data = (CocoaView*)nsview_get_ptr(); view.data = (BRIDGE void *)apple_platform.renderView; - + if (window) { char title[128]; - + title[0] = '\0'; - + video_driver_get_window_title(title, sizeof(title)); - + if (title[0]) window->set_title(&view, title); } @@ -616,7 +615,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty NSSize display_pixel_size = [[description objectForKey:NSDeviceSize] sizeValue]; CGSize display_physical_size = CGDisplayScreenSize( [[description objectForKey:@"NSScreenNumber"] unsignedIntValue]); - + float display_width = display_pixel_size.width; float display_height = display_pixel_size.height; float physical_width = display_physical_size.width; @@ -631,7 +630,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty float physical_height = screen_rect.size.height * scale; float dpi = 160 * scale; unsigned idiom_type = UI_USER_INTERFACE_IDIOM(); - + switch (idiom_type) { case -1: /* UIUserInterfaceIdiomUnspecified */ @@ -649,9 +648,9 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty break; } #endif - + (void)display_height; - + switch (type) { case DISPLAY_METRIC_MM_WIDTH: @@ -668,7 +667,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty *value = 0; return false; } - + return true; } @@ -686,7 +685,7 @@ static bool cocoagl_gfx_ctx_suppress_screensaver(void *data, bool enable) { (void)data; (void)enable; - + return false; } @@ -705,20 +704,19 @@ static void *cocoagl_gfx_ctx_get_context_data(void *data) } #endif - static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2) { #ifdef HAVE_VULKAN cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; #endif - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: if (!(--g_fast_forward_skips < 0)) return; - + #if defined(HAVE_COCOA_METAL) [g_context flushBuffer]; [g_hw_ctx flushBuffer]; @@ -726,7 +724,7 @@ static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2) if (g_view) [g_view display]; #endif - + g_fast_forward_skips = g_is_syncing ? 0 : 3; break; case GFX_CTX_VULKAN_API: @@ -754,7 +752,7 @@ static gfx_ctx_proc_t cocoagl_gfx_ctx_get_proc_address(const char *symbol_name) default: break; } - + return NULL; } @@ -763,7 +761,7 @@ static bool cocoagl_gfx_ctx_set_resize(void *data, unsigned width, unsigned heig #ifdef HAVE_VULKAN cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; #endif - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: @@ -773,7 +771,7 @@ static bool cocoagl_gfx_ctx_set_resize(void *data, unsigned width, unsigned heig #ifdef HAVE_VULKAN cocoa_ctx->width = width; cocoa_ctx->height = height; - + if (vulkan_create_swapchain(&cocoa_ctx->vk, width, height, cocoa_ctx->swap_interval)) { @@ -786,7 +784,7 @@ static bool cocoagl_gfx_ctx_set_resize(void *data, unsigned width, unsigned heig RARCH_ERR("[macOS/Vulkan]: Failed to update swapchain.\n"); return false; } - + cocoa_ctx->vk.need_new_swapchain = false; #endif break; @@ -794,11 +792,10 @@ static bool cocoagl_gfx_ctx_set_resize(void *data, unsigned width, unsigned heig default: break; } - + return true; } - static void cocoagl_gfx_ctx_check_window(void *data, bool *quit, bool *resize, unsigned *width, unsigned *height, bool is_shutdown) { @@ -806,9 +803,9 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit, #ifdef HAVE_VULKAN cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; #endif - + *quit = false; - + switch (cocoagl_api) { case GFX_CTX_OPENGL_API: @@ -849,7 +846,7 @@ static void cocoagl_gfx_ctx_bind_hw_render(void *data, bool enable) case GFX_CTX_OPENGL_API: case GFX_CTX_OPENGL_ES_API: g_use_hw_ctx = enable; - + if (enable) [g_hw_ctx makeCurrentContext]; else @@ -865,12 +862,12 @@ static uint32_t cocoagl_gfx_ctx_get_flags(void *data) { uint32_t flags = 0; cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; - + BIT32_SET(flags, GFX_CTX_FLAGS_NONE); - + if (cocoa_ctx->core_hw_context_enable) BIT32_SET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT); - + return flags; } @@ -878,7 +875,7 @@ static void cocoagl_gfx_ctx_set_flags(void *data, uint32_t flags) { (void)flags; cocoa_ctx_data_t *cocoa_ctx = (cocoa_ctx_data_t*)data; - + if (BIT32_GET(flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) cocoa_ctx->core_hw_context_enable = true; } diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c index 2a5e1836b3..12d2a72d7f 100644 --- a/gfx/drivers_context/vc_egl_ctx.c +++ b/gfx/drivers_context/vc_egl_ctx.c @@ -476,7 +476,7 @@ static void gfx_ctx_vc_destroy(void *data) vc->vgimage[i] = 0; } - /* Stop generating vsync callbacks if we are doing so. + /* Stop generating vsync callbacks if we are doing so. * Don't destroy the context while cbs are being generated! */ if (vc->vsync_callback_set) vc_dispmanx_vsync_callback(vc->dispman_display, NULL, NULL); @@ -536,7 +536,7 @@ static bool gfx_ctx_vc_image_buffer_init(void *data, peglCreateImageKHR = (PFNEGLCREATEIMAGEKHRPROC)egl_get_proc_address("eglCreateImageKHR"); peglDestroyImageKHR = (PFNEGLDESTROYIMAGEKHRPROC)egl_get_proc_address("eglDestroyImageKHR"); - if ( !peglCreateImageKHR || + if ( !peglCreateImageKHR || !peglDestroyImageKHR || !gfx_ctx_vc_egl_query_extension(vc, "KHR_image") ) @@ -651,7 +651,7 @@ static void gfx_ctx_vc_swap_buffers(void *data, void *data2) egl_swap_buffers(&vc->egl); - /* Wait for vsync immediately if we don't + /* Wait for vsync immediately if we don't * want egl_swap_buffers to triple-buffer */ if (video_info->max_swapchain_images <= 2) { diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c index 6751775e63..c67a4c7163 100644 --- a/gfx/drivers_context/wayland_ctx.c +++ b/gfx/drivers_context/wayland_ctx.c @@ -658,7 +658,7 @@ static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel, wl->width = width; wl->height = height; } - + if (wl->win) wl_egl_window_resize(wl->win, width, height, 0, 0); else @@ -727,7 +727,7 @@ static void handle_zxdg_toplevel_config(void *data, struct zxdg_toplevel_v6 *top wl->width = width; wl->height = height; } - + if (wl->win) wl_egl_window_resize(wl->win, width, height, 0, 0); else @@ -1630,7 +1630,6 @@ static bool gfx_ctx_wl_set_video_mode(void *data, wl_shell_surface_set_title(wl->shell_surf, "RetroArch"); } - switch (wl_api) { case GFX_CTX_OPENGL_API: diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 8d373ce91d..0baf837afa 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -530,7 +530,6 @@ static void *gfx_ctx_wgl_init(video_frame_info_t *video_info, void *video_driver #ifdef HAVE_DYNAMIC dll_handle = dylib_load("OpenGL32.dll"); #endif - win32_window_reset(); win32_monitor_init(); diff --git a/gfx/drivers_font/d3d10_font.c b/gfx/drivers_font/d3d10_font.c index 80bb3c357d..e272a5f793 100644 --- a/gfx/drivers_font/d3d10_font.c +++ b/gfx/drivers_font/d3d10_font.c @@ -138,8 +138,8 @@ static void d3d10_font_render_line( int x = roundf(pos_x * width); int y = roundf((1.0 - pos_y) * height); - if ( !d3d10 || - !d3d10->sprites.enabled || + if ( !d3d10 || + !d3d10->sprites.enabled || msg_len > (unsigned)d3d10->sprites.capacity) return; @@ -309,7 +309,7 @@ static void d3d10_font_render_msg( g = FONT_COLOR_GET_GREEN(params->color); b = FONT_COLOR_GET_BLUE(params->color); alpha = FONT_COLOR_GET_ALPHA(params->color); - + color = DXGI_COLOR_RGBA(r, g, b, alpha); } else diff --git a/gfx/drivers_font/d3d11_font.c b/gfx/drivers_font/d3d11_font.c index de4f29ade3..f72de3563a 100644 --- a/gfx/drivers_font/d3d11_font.c +++ b/gfx/drivers_font/d3d11_font.c @@ -136,8 +136,8 @@ static void d3d11_font_render_line( int x = roundf(pos_x * width); int y = roundf((1.0 - pos_y) * height); - if ( !d3d11 || - !d3d11->sprites.enabled || + if ( !d3d11 || + !d3d11->sprites.enabled || msg_len > (unsigned)d3d11->sprites.capacity) return; @@ -306,7 +306,7 @@ static void d3d11_font_render_msg( g = FONT_COLOR_GET_GREEN(params->color); b = FONT_COLOR_GET_BLUE(params->color); alpha = FONT_COLOR_GET_ALPHA(params->color); - + color = DXGI_COLOR_RGBA(r, g, b, alpha); } else diff --git a/gfx/drivers_font/d3d12_font.c b/gfx/drivers_font/d3d12_font.c index d7f81262bc..6812c3b043 100644 --- a/gfx/drivers_font/d3d12_font.c +++ b/gfx/drivers_font/d3d12_font.c @@ -142,8 +142,8 @@ static void d3d12_font_render_line( int y = roundf((1.0 - pos_y) * height); D3D12_RANGE range = { 0, 0 }; - if ( !d3d12 || - !d3d12->sprites.enabled || + if ( !d3d12 || + !d3d12->sprites.enabled || msg_len > (unsigned)d3d12->sprites.capacity) return; @@ -263,7 +263,7 @@ static void d3d12_font_render_message( return; } - line_height = font->font_driver->get_line_height(font->font_data) + line_height = font->font_driver->get_line_height(font->font_data) * scale / video_info->height; for (;;) diff --git a/gfx/drivers_font/metal_raster_font.m b/gfx/drivers_font/metal_raster_font.m index 287410f150..734034c643 100644 --- a/gfx/drivers_font/metal_raster_font.m +++ b/gfx/drivers_font/metal_raster_font.m @@ -28,16 +28,16 @@ const font_renderer_driver_t *_font_driver; void *_font_data; struct font_atlas *_atlas; - + NSUInteger _stride; id _buffer; id _texture; - + id _state; id _sampler; - + Context *_context; - + Uniforms _uniforms; id _vert; unsigned _capacity; @@ -61,7 +61,7 @@ { if (driver == nil) return nil; - + _driver = driver; _context = driver.context; if (!font_renderer_create_default( @@ -71,7 +71,7 @@ RARCH_WARN("Couldn't initialize font renderer.\n"); return nil; } - + _uniforms.projectionMatrix = matrix_proj_ortho(0, 1, 0, 1); _atlas = _font_driver->get_atlas(_font_data); _stride = MTL_ALIGN_BUFFER(_atlas->width); @@ -95,14 +95,14 @@ } [_buffer didModifyRange:NSMakeRange(0, _buffer.length)]; } - + MTLTextureDescriptor *td = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat:MTLPixelFormatR8Unorm width:_atlas->width height:_atlas->height mipmapped:NO]; - + _texture = [_buffer newTextureWithDescriptor:td offset:0 bytesPerRow:_stride]; - + _capacity = 12000; _vert = [_context.device newBufferWithLength:sizeof(SpriteVertex) * _capacity options:MTLResourceStorageModeManaged]; @@ -126,10 +126,10 @@ vd.attributes[2].format = MTLVertexFormatFloat4; vd.layouts[0].stride = sizeof(SpriteVertex); vd.layouts[0].stepFunction = MTLVertexStepFunctionPerVertex; - + MTLRenderPipelineDescriptor *psd = [MTLRenderPipelineDescriptor new]; psd.label = @"font pipeline"; - + MTLRenderPipelineColorAttachmentDescriptor *ca = psd.colorAttachments[0]; ca.pixelFormat = MTLPixelFormatBGRA8Unorm; ca.blendingEnabled = YES; @@ -137,12 +137,12 @@ ca.sourceRGBBlendFactor = MTLBlendFactorSourceAlpha; ca.destinationAlphaBlendFactor = MTLBlendFactorOneMinusSourceAlpha; ca.destinationRGBBlendFactor = MTLBlendFactorOneMinusSourceAlpha; - + psd.sampleCount = 1; psd.vertexDescriptor = vd; psd.vertexFunction = [_context.library newFunctionWithName:@"sprite_vertex"]; psd.fragmentFunction = [_context.library newFunctionWithName:@"sprite_fragment_a8"]; - + NSError *err; _state = [_context.device newRenderPipelineStateWithDescriptor:psd error:&err]; if (err != nil) @@ -151,7 +151,7 @@ return NO; } } - + { MTLSamplerDescriptor *sd = [MTLSamplerDescriptor new]; sd.minFilter = MTLSamplerMinMagFilterLinear; @@ -172,11 +172,11 @@ uint8_t *dst = (uint8_t *)_buffer.contents + row * _stride + glyph->atlas_offset_x; memcpy(dst, src, glyph->width); } - + NSUInteger offset = glyph->atlas_offset_y; NSUInteger len = glyph->height * _stride; [_buffer didModifyRange:NSMakeRange(offset, len)]; - + _atlas->dirty = false; } } @@ -184,21 +184,20 @@ - (int)getWidthForMessage:(const char *)msg length:(NSUInteger)length scale:(float)scale { int delta_x = 0; - + for (NSUInteger i = 0; i < length; i++) { const struct font_glyph *glyph = _font_driver->get_glyph(_font_data, (uint8_t)msg[i]); if (!glyph) /* Do something smarter here ... */ glyph = _font_driver->get_glyph(_font_data, '?'); - - + if (glyph) { [self updateGlyph:glyph]; delta_x += glyph->advance_x; } } - + return (int)(delta_x * scale); } @@ -206,13 +205,13 @@ { if (!_font_driver->ident) return NULL; - + const struct font_glyph *glyph = _font_driver->get_glyph((void *)_font_driver, code); if (glyph) { [self updateGlyph:glyph]; } - + return glyph; } @@ -230,7 +229,7 @@ static INLINE void write_quad6(SpriteVertex *pv, 1.0f, 0.0f, 0.0f, 1.0f, }; - + for (i = 0; i < 6; i++) { pv[i].position = simd_make_float2(x + strip[2 * i + 0] * width, @@ -259,37 +258,37 @@ static INLINE void write_quad6(SpriteVertex *pv, float inv_tex_size_y = 1.0f / _texture.height; float inv_win_width = 1.0f / _driver.viewport->full_width; float inv_win_height = 1.0f / _driver.viewport->full_height; - + switch (aligned) { case TEXT_ALIGN_RIGHT: x -= [self getWidthForMessage:msg length:length scale:scale]; break; - + case TEXT_ALIGN_CENTER: x -= [self getWidthForMessage:msg length:length scale:scale] / 2; break; - + default: break; } - + SpriteVertex *v = (SpriteVertex *)_vert.contents; v += _offset + _vertices; - + while (msg < msg_end) { unsigned code = utf8_walk(&msg); const struct font_glyph *glyph = _font_driver->get_glyph(_font_data, code); - + if (!glyph) /* Do something smarter here ... */ glyph = _font_driver->get_glyph(_font_data, '?'); - + if (!glyph) continue; - + [self updateGlyph:glyph]; - + int off_x, off_y, tex_x, tex_y, width, height; off_x = glyph->draw_offset_x; off_y = glyph->draw_offset_y; @@ -297,7 +296,7 @@ static INLINE void write_quad6(SpriteVertex *pv, tex_y = glyph->atlas_offset_y; width = glyph->width; height = glyph->height; - + write_quad6(v, (x + off_x + delta_x * scale) * inv_win_width, (y + off_y + delta_y * scale) * inv_win_height, @@ -308,10 +307,10 @@ static INLINE void write_quad6(SpriteVertex *pv, width * inv_tex_size_x, height * inv_tex_size_y, &color); - + _vertices += 6; v += 6; - + delta_x += glyph->advance_x; delta_y += glyph->advance_y; } @@ -321,7 +320,7 @@ static INLINE void write_quad6(SpriteVertex *pv, { NSUInteger start = _offset * sizeof(SpriteVertex); [_vert didModifyRange:NSMakeRange(start, sizeof(SpriteVertex) * _vertices)]; - + id rce = _context.rce; [rce pushDebugGroup:@"render fonts"]; @@ -333,7 +332,7 @@ static INLINE void write_quad6(SpriteVertex *pv, [rce setFragmentSamplerState:_sampler atIndex:SamplerIndexDraw]; [rce drawPrimitives:MTLPrimitiveTypeTriangle vertexStart:0 vertexCount:_vertices]; [rce popDebugGroup]; - + _offset += _vertices; _vertices = 0; } @@ -352,14 +351,14 @@ static INLINE void write_quad6(SpriteVertex *pv, [self _renderLine:msg video:video length:strlen(msg) scale:scale color:color posX:posX posY:posY aligned:aligned]; return; } - + int lines = 0; float line_height = _font_driver->get_line_height(_font_data) * scale / video->height; - + for (;;) { const char *delim = strchr(msg, '\n'); - + /* Draw the line */ if (delim) { @@ -395,17 +394,17 @@ static INLINE void write_quad6(SpriteVertex *pv, video:(video_frame_info_t *)video params:(const struct font_params *)params { - + if (!msg || !*msg) return; - + float x, y, scale, drop_mod, drop_alpha; int drop_x, drop_y; enum text_alignment text_align; vector_float4 color, color_dark; unsigned width = video->width; unsigned height = video->height; - + if (params) { x = params->x; @@ -416,13 +415,13 @@ static INLINE void write_quad6(SpriteVertex *pv, drop_y = params->drop_y; drop_mod = params->drop_mod; drop_alpha = params->drop_alpha; - + color = simd_make_float4( FONT_COLOR_GET_RED(params->color) / 255.0f, FONT_COLOR_GET_GREEN(params->color) / 255.0f, FONT_COLOR_GET_BLUE(params->color) / 255.0f, FONT_COLOR_GET_ALPHA(params->color) / 255.0f); - + } else { @@ -430,38 +429,38 @@ static INLINE void write_quad6(SpriteVertex *pv, y = video->font_msg_pos_y; scale = 1.0f; text_align = TEXT_ALIGN_LEFT; - + color = simd_make_float4( video->font_msg_color_r, video->font_msg_color_g, video->font_msg_color_b, 1.0f); - + drop_x = -2; drop_y = -2; drop_mod = 0.3f; drop_alpha = 1.0f; } - + @autoreleasepool { - + NSUInteger max_glyphs = strlen(msg); if (drop_x || drop_y) max_glyphs *= 2; - + if (max_glyphs * 6 + _offset > _capacity) { _offset = 0; } - + if (drop_x || drop_y) { color_dark.x = color.x * drop_mod; color_dark.y = color.y * drop_mod; color_dark.z = color.z * drop_mod; color_dark.w = color.w * drop_alpha; - + [self renderMessage:msg video:video scale:scale @@ -470,7 +469,7 @@ static INLINE void write_quad6(SpriteVertex *pv, posY:y + scale * drop_y / height aligned:text_align]; } - + [self renderMessage:msg video:video scale:scale @@ -478,7 +477,7 @@ static INLINE void write_quad6(SpriteVertex *pv, posX:x posY:y aligned:text_align]; - + [self _flush]; } } @@ -492,10 +491,10 @@ static void *metal_raster_font_init_font(void *data, bool is_threaded) { MetalRaster *r = [[MetalRaster alloc] initWithDriver:(__bridge MetalDriver *)data fontPath:font_path fontSize:(unsigned)font_size]; - + if (!r) return NULL; - + return (__bridge_retained void *)r; } diff --git a/gfx/drivers_font/ps2_font.c b/gfx/drivers_font/ps2_font.c index 312d7926e1..663b364c0c 100644 --- a/gfx/drivers_font/ps2_font.c +++ b/gfx/drivers_font/ps2_font.c @@ -61,12 +61,12 @@ static void ps2_upload_font(GSGLOBAL *gsGlobal, GSFONTM *gsFontM) int TexSize = gsKit_texture_size(gsFontM->Texture->Width, gsFontM->Texture->Height, gsFontM->Texture->PSM); gsFontM->Texture->VramClut = gsKit_vram_alloc(gsGlobal, FONTM_VRAM_SIZE, GSKIT_ALLOC_USERBUFFER); - + for (pgindx = 0; pgindx < GS_FONTM_PAGE_COUNT; ++pgindx) { gsFontM->Vram[pgindx] = gsKit_vram_alloc(gsGlobal, TexSize, GSKIT_ALLOC_USERBUFFER); gsFontM->LastPage[pgindx] = (u32) -1; } - + gsFontM->Texture->Vram = gsFontM->Vram[0]; gsFontM->VramIdx = 0; gsFontM->Spacing = FONTM_TEXTURE_SPACING; @@ -111,7 +111,7 @@ static void ps2_font_render_msg( if (ps2->ps2_video->clearVRAM) { ps2_upload_font(ps2->ps2_video->gsGlobal, ps2->gsFontM); } - gsKit_fontm_print_scaled(ps2->ps2_video->gsGlobal, ps2->gsFontM, x, y, FONTM_TEXTURE_ZPOSITION, + gsKit_fontm_print_scaled(ps2->ps2_video->gsGlobal, ps2->gsFontM, x, y, FONTM_TEXTURE_ZPOSITION, FONTM_TEXTURE_SCALED , FONTM_TEXTURE_COLOR, msg); } } diff --git a/gfx/drivers_font/xdk360_fonts.cpp b/gfx/drivers_font/xdk360_fonts.cpp index b7bc9b6f1b..6794358afd 100644 --- a/gfx/drivers_font/xdk360_fonts.cpp +++ b/gfx/drivers_font/xdk360_fonts.cpp @@ -1,7 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2011-2017 - Daniel De Matteis - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -76,7 +76,7 @@ class PackedResource public: /* Loads the resources out of the specified bundle */ - HRESULT Create(const char *strFilename, DWORD dwNumResourceTags, + HRESULT Create(const char *strFilename, DWORD dwNumResourceTags, void *pResourceTags); void Destroy(); @@ -93,7 +93,7 @@ class PackedResource }; LPDIRECT3DTEXTURE9 *PackedResource::GetTexture(const char* strName) -{ +{ LPDIRECT3DRESOURCE9 pResource = (LPDIRECT3DRESOURCE9)GetData(strName); return (LPDIRECT3DTEXTURE9*)pResource; } @@ -281,7 +281,7 @@ typedef struct { uint32_t m_dwNumGlyphs; /* Size of font strike array (First entry is the unknown glyph). */ GLYPH_ATTR m_Glyphs[1]; /* Array of font strike uv's etc... NOTE: It's m_dwNumGlyphs in size. */ -} FontFileStrikesImage_t; +} FontFileStrikesImage_t; static PackedResource m_xprResource; @@ -371,7 +371,7 @@ static void *xdk360_init_font(void *video_data, goto error; pFontTexture = (LPDIRECT3DTEXTURE9)m_xprResource.GetTexture( "FontTexture" ); - pFontData = m_xprResource.GetData( "FontData"); + pFontData = m_xprResource.GetData( "FontData"); /* Save a copy of the texture. */ font->m_pFontTexture = (LPDIRECT3DTEXTURE9)pFontTexture; @@ -574,7 +574,7 @@ static void xdk360_draw_text(xdk360_video_font_t *font, #ifdef MSB_FIRST /* Convert shorts to 32 bit longs for in register merging */ - tu1 = pGlyph->tu1; + tu1 = pGlyph->tu1; tv1 = pGlyph->tv1; tu2 = pGlyph->tu2; tv2 = pGlyph->tv2; @@ -586,11 +586,11 @@ static void xdk360_draw_text(xdk360_video_font_t *font, * * This makes for 16 bytes per vertex data (Easier to read) * - * Second NOTE: The U/V coordinates are merged and written - * using a DWORD due to the write combining hardware + * Second NOTE: The U/V coordinates are merged and written + * using a DWORD due to the write combining hardware * being only able to handle 32, 64 and 128 writes. * - * Never store to write combined memory with 8 or 16bit + * Never store to write combined memory with 8 or 16bit * instructions. You've been warned. */ @@ -620,9 +620,9 @@ static void xdk360_draw_text(xdk360_video_font_t *font, dwNumChars--; } - /* Since we allocated vertex data space + /* Since we allocated vertex data space * based on the string length, we now need to - * add some dummy verts for any skipped + * add some dummy verts for any skipped * characters (like newlines, etc.) */ while (dwNumChars) diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c index 6970f81b12..6b3cded183 100644 --- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c @@ -252,7 +252,7 @@ static void d3d9_cg_renderchain_set_shader_params( frame_cnt = chain->frame_count; if (pass->info.pass->frame_count_mod) - frame_cnt = chain->frame_count + frame_cnt = chain->frame_count % pass->info.pass->frame_count_mod; d3d9_cg_set_param_1f(fprg, dev, "IN.frame_count", &frame_cnt); @@ -587,7 +587,7 @@ static void d3d9_cg_renderchain_bind_pass( param = d3d9_cg_get_constant_by_name(pass->vprg, attr_coord); if (param) { - struct unsigned_vector_list *attrib_map = + struct unsigned_vector_list *attrib_map = (struct unsigned_vector_list*)pass->attrib_map; unsigned index = attrib_map->data[cgGetParameterResourceIndex(param)]; @@ -717,7 +717,7 @@ static bool d3d9_cg_renderchain_create_first_pass( unsigned i; struct shader_pass pass; struct d3d_matrix ident; - unsigned fmt = (_fmt == RETRO_PIXEL_FORMAT_RGB565) ? + unsigned fmt = (_fmt == RETRO_PIXEL_FORMAT_RGB565) ? d3d9_get_rgb565_format() : d3d9_get_xrgb8888_format(); d3d_matrix_identity(&ident); diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c index 32627dfee2..3b51024352 100644 --- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c +++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c @@ -92,7 +92,7 @@ static INLINE void d3d9_hlsl_set_param_matrix(void *data, void *userdata, LPD3DXCONSTANTTABLE prog = (LPD3DXCONSTANTTABLE)data; D3DXHANDLE param = (D3DXHANDLE)d3d9_hlsl_get_constant_by_name(prog, name); if (param) - d3d9x_constant_table_set_matrix((LPDIRECT3DDEVICE9)userdata, prog, + d3d9x_constant_table_set_matrix((LPDIRECT3DDEVICE9)userdata, prog, (void*)param, (D3DMATRIX*)values); } @@ -220,7 +220,7 @@ static void hlsl_d3d9_renderchain_set_shader_params( frame_cnt = chain->frame_count; if (pass->info.pass->frame_count_mod) - frame_cnt = chain->frame_count + frame_cnt = chain->frame_count % pass->info.pass->frame_count_mod; d3d9_hlsl_set_param_1f(fprg, dev, "IN.frame_count", &frame_cnt); @@ -250,8 +250,8 @@ static bool hlsl_d3d9_renderchain_create_first_pass( { unsigned i; struct shader_pass pass; - unsigned fmt = - (_fmt == RETRO_PIXEL_FORMAT_RGB565) ? + unsigned fmt = + (_fmt == RETRO_PIXEL_FORMAT_RGB565) ? d3d9_get_rgb565_format() : d3d9_get_xrgb8888_format(); pass.info = *info; diff --git a/gfx/drivers_renderchain/d3d9_renderchain.h b/gfx/drivers_renderchain/d3d9_renderchain.h index 7e6274d0d6..338f547aec 100644 --- a/gfx/drivers_renderchain/d3d9_renderchain.h +++ b/gfx/drivers_renderchain/d3d9_renderchain.h @@ -114,7 +114,7 @@ static INLINE void d3d9_renderchain_set_vertices_on_change( struct D3D9Vertex vert[4]; unsigned i; void *verts = NULL; - const struct + const struct LinkInfo *info = (const struct LinkInfo*)&pass->info; float _u = (float)(width) / info->tex_w; float _v = (float)(height) / info->tex_h; @@ -403,7 +403,7 @@ static INLINE void d3d9_recompute_pass_sizes( { unsigned i; struct LinkInfo link_info; - unsigned input_scale = d3d->video_info.input_scale + unsigned input_scale = d3d->video_info.input_scale * RARCH_SCALE_BASE; unsigned current_width = input_scale; unsigned current_height = input_scale; diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp index a817ac3ac3..0ca684a982 100644 --- a/gfx/drivers_shader/glslang_util.cpp +++ b/gfx/drivers_shader/glslang_util.cpp @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -102,7 +102,7 @@ bool glslang_read_shader_file(const char *path, vector *output, bool roo output->push_back("#extension GL_GOOGLE_cpp_style_line_directive : require"); } - /* At least VIM treats the first line as line #1, + /* At least VIM treats the first line as line #1, * so offset everything by one. */ snprintf(tmp, sizeof(tmp), "#line %u \"%s\"", root_file ? 2 : 1, basename); output->push_back(tmp); @@ -138,7 +138,7 @@ bool glslang_read_shader_file(const char *path, vector *output, bool roo if (!glslang_read_shader_file(include_path, output, false)) goto error; - /* After including a file, use line directive + /* After including a file, use line directive * to pull it back to current file. */ snprintf(tmp, sizeof(tmp), "#line %u \"%s\"", unsigned(i + 1), basename); output->push_back(tmp); @@ -147,7 +147,7 @@ bool glslang_read_shader_file(const char *path, vector *output, bool roo { /* #line seems to be ignored if preprocessor tests fail, * so we should reapply #line after each #endif. - * Add extra offset here since we're setting #line + * Add extra offset here since we're setting #line * for the line after this one. */ snprintf(tmp, sizeof(tmp), "#line %u \"%s\"", unsigned(i + 2), basename); @@ -329,7 +329,7 @@ bool glslang_parse_meta(const vector &lines, glslang_meta *meta) return param.id == id; }); - /* Allow duplicate #pragma parameter, but only + /* Allow duplicate #pragma parameter, but only * if they are exactly the same. */ if (itr != end(meta->parameters)) { diff --git a/gfx/drivers_shader/glslang_util.h b/gfx/drivers_shader/glslang_util.h index 076773dece..120a9191a4 100644 --- a/gfx/drivers_shader/glslang_util.h +++ b/gfx/drivers_shader/glslang_util.h @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c index 491e9fec4b..578390fbd6 100644 --- a/gfx/drivers_shader/shader_gl_cg.c +++ b/gfx/drivers_shader/shader_gl_cg.c @@ -309,7 +309,7 @@ static void gl_cg_set_texture_info( static void gl_cg_set_params(void *dat, void *shader_data) { unsigned i; - video_shader_ctx_params_t *params = + video_shader_ctx_params_t *params = (video_shader_ctx_params_t*)dat; unsigned width = params->width; unsigned height = params->height; diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp index 97fca27faf..9dff3c500b 100644 --- a/gfx/drivers_shader/shader_vulkan.cpp +++ b/gfx/drivers_shader/shader_vulkan.cpp @@ -1,7 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2016 - Hans-Kristian Arntzen * Copyright (C) 2011-2017 - Daniel De Matteis - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -749,7 +749,7 @@ bool vulkan_filter_chain::init_history() return true; } - /* We don't need to store array element #0, + /* We don't need to store array element #0, * since it's aliased with the actual original. */ required_images--; original_history.reserve(required_images); @@ -763,7 +763,7 @@ bool vulkan_filter_chain::init_history() RARCH_LOG("[Vulkan filter chain]: Using history of %u frames.\n", required_images); - /* On first frame, we need to clear the textures to + /* On first frame, we need to clear the textures to * a known state, but we need * a command buffer for that, so just defer to first frame. */ @@ -914,8 +914,8 @@ bool vulkan_filter_chain::init() { auto &pass = passes[i]; RARCH_LOG("[slang]: Building pass #%u (%s)\n", i, - pass->get_name().empty() ? - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE) : + pass->get_name().empty() ? + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE) : pass->get_name().c_str()); source = pass->set_pass_info(max_input_size, @@ -962,7 +962,7 @@ void vulkan_filter_chain::build_offscreen_passes(VkCommandBuffer cmd, unsigned i; DeferredDisposer disposer(deferred_calls[current_sync_index]); - const Texture original = { + const Texture original = { input_texture, passes.front()->get_source_filter(), passes.front()->get_mip_filter(), @@ -1042,7 +1042,7 @@ void vulkan_filter_chain::update_history(DeferredDisposer &disposer, VkCommandBu void vulkan_filter_chain::end_frame(VkCommandBuffer cmd) { /* If we need to keep old frames, copy it after fragment is complete. - * TODO: We can improve pipelining by figuring out which + * TODO: We can improve pipelining by figuring out which * pass is the last that reads from * the history and dispatch the copy earlier. */ if (!original_history.empty()) @@ -1064,7 +1064,7 @@ void vulkan_filter_chain::build_viewport_pass( Texture source; DeferredDisposer disposer(deferred_calls[current_sync_index]); - const Texture original = { + const Texture original = { input_texture, passes.front()->get_source_filter(), passes.front()->get_mip_filter(), @@ -1347,7 +1347,7 @@ bool Pass::init_pipeline_layout() } } - VkDescriptorSetLayoutCreateInfo set_layout_info = { + VkDescriptorSetLayoutCreateInfo set_layout_info = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO }; set_layout_info.bindingCount = bindings.size(); set_layout_info.pBindings = bindings.data(); @@ -1356,7 +1356,7 @@ bool Pass::init_pipeline_layout() &set_layout_info, NULL, &set_layout) != VK_SUCCESS) return false; - VkPipelineLayoutCreateInfo layout_info = { + VkPipelineLayoutCreateInfo layout_info = { VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO }; layout_info.setLayoutCount = 1; layout_info.pSetLayouts = &set_layout; @@ -1384,7 +1384,7 @@ bool Pass::init_pipeline_layout() &layout_info, NULL, &pipeline_layout) != VK_SUCCESS) return false; - VkDescriptorPoolCreateInfo pool_info = { + VkDescriptorPoolCreateInfo pool_info = { VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO }; pool_info.maxSets = num_sync_indices; pool_info.poolSizeCount = desc_counts.size(); @@ -1392,7 +1392,7 @@ bool Pass::init_pipeline_layout() if (vkCreateDescriptorPool(device, &pool_info, nullptr, &pool) != VK_SUCCESS) return false; - VkDescriptorSetAllocateInfo alloc_info = { + VkDescriptorSetAllocateInfo alloc_info = { VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO }; alloc_info.descriptorPool = pool; alloc_info.descriptorSetCount = 1; @@ -1412,7 +1412,7 @@ bool Pass::init_pipeline() return false; /* Input assembly */ - VkPipelineInputAssemblyStateCreateInfo input_assembly = { + VkPipelineInputAssemblyStateCreateInfo input_assembly = { VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO }; input_assembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; @@ -1433,7 +1433,7 @@ bool Pass::init_pipeline() binding.stride = 4 * sizeof(float); binding.inputRate = VK_VERTEX_INPUT_RATE_VERTEX; - VkPipelineVertexInputStateCreateInfo vertex_input = { + VkPipelineVertexInputStateCreateInfo vertex_input = { VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO }; vertex_input.vertexBindingDescriptionCount = 1; vertex_input.pVertexBindingDescriptions = &binding; @@ -1441,7 +1441,7 @@ bool Pass::init_pipeline() vertex_input.pVertexAttributeDescriptions = attributes; /* Raster state */ - VkPipelineRasterizationStateCreateInfo raster = { + VkPipelineRasterizationStateCreateInfo raster = { VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO }; raster.polygonMode = VK_POLYGON_MODE_FILL; raster.cullMode = VK_CULL_MODE_NONE; @@ -1453,7 +1453,7 @@ bool Pass::init_pipeline() /* Blend state */ VkPipelineColorBlendAttachmentState blend_attachment = {0}; - VkPipelineColorBlendStateCreateInfo blend = { + VkPipelineColorBlendStateCreateInfo blend = { VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO }; blend_attachment.blendEnable = false; blend_attachment.colorWriteMask = 0xf; @@ -1461,13 +1461,13 @@ bool Pass::init_pipeline() blend.pAttachments = &blend_attachment; /* Viewport state */ - VkPipelineViewportStateCreateInfo viewport = { + VkPipelineViewportStateCreateInfo viewport = { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO }; viewport.viewportCount = 1; viewport.scissorCount = 1; /* Depth-stencil state */ - VkPipelineDepthStencilStateCreateInfo depth_stencil = { + VkPipelineDepthStencilStateCreateInfo depth_stencil = { VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO }; depth_stencil.depthTestEnable = false; depth_stencil.depthWriteEnable = false; @@ -1477,14 +1477,14 @@ bool Pass::init_pipeline() depth_stencil.maxDepthBounds = 1.0f; /* Multisample state */ - VkPipelineMultisampleStateCreateInfo multisample = { + VkPipelineMultisampleStateCreateInfo multisample = { VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO }; multisample.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; /* Dynamic state */ - VkPipelineDynamicStateCreateInfo dynamic = { + VkPipelineDynamicStateCreateInfo dynamic = { VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO }; - static const VkDynamicState dynamics[] = { + static const VkDynamicState dynamics[] = { VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR }; dynamic.pDynamicStates = dynamics; dynamic.dynamicStateCount = sizeof(dynamics) / sizeof(dynamics[0]); @@ -1495,7 +1495,7 @@ bool Pass::init_pipeline() { VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO }, }; - VkShaderModuleCreateInfo module_info = { + VkShaderModuleCreateInfo module_info = { VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO }; module_info.codeSize = vertex_shader.size() * sizeof(uint32_t); module_info.pCode = vertex_shader.data(); @@ -1509,7 +1509,7 @@ bool Pass::init_pipeline() shader_stages[1].pName = "main"; vkCreateShaderModule(device, &module_info, NULL, &shader_stages[1].module); - VkGraphicsPipelineCreateInfo pipe = { + VkGraphicsPipelineCreateInfo pipe = { VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO }; pipe.stageCount = 2; pipe.pStages = shader_stages; @@ -1521,7 +1521,7 @@ bool Pass::init_pipeline() pipe.pViewportState = &viewport; pipe.pDepthStencilState = &depth_stencil; pipe.pDynamicState = &dynamic; - pipe.renderPass = final_pass ? swapchain_render_pass : + pipe.renderPass = final_pass ? swapchain_render_pass : framebuffer->get_render_pass(); pipe.layout = pipeline_layout; @@ -1543,7 +1543,7 @@ CommonResources::CommonResources(VkDevice device, : device(device) { /* The final pass uses an MVP designed for [0, 1] range VBO. - * For in-between passes, we just go with identity matrices, + * For in-between passes, we just go with identity matrices, * so keep it simple. */ const float vbo_data[] = { @@ -2002,9 +2002,9 @@ void Pass::build_commands( reflection.ubo_size); } - /* The final pass is always executed inside - * another render pass since the frontend will - * want to overlay various things on top for + /* The final pass is always executed inside + * another render pass since the frontend will + * want to overlay various things on top for * the passes that end up on-screen. */ if (!final_pass) { @@ -2018,7 +2018,7 @@ void Pass::build_commands( VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT); - VkRenderPassBeginInfo rp_info = { + VkRenderPassBeginInfo rp_info = { VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO }; rp_info.renderPass = framebuffer->get_render_pass(); rp_info.framebuffer = framebuffer->get_framebuffer(); @@ -2071,7 +2071,7 @@ void Pass::build_commands( }; const VkRect2D sci = { { 0, 0 }, - { + { current_framebuffer_size.width, current_framebuffer_size.height }, @@ -2202,7 +2202,7 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd) for (i = 1; i < levels; i++) { - /* For subsequent passes, we have to transition + /* For subsequent passes, we have to transition * from DST_OPTIMAL to SRC_OPTIMAL, * but only do so one mip-level at a time. */ if (i > 1) @@ -2248,13 +2248,13 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd) 1, &blit_region, VK_FILTER_LINEAR); } - /* We are now done, and we have all mip-levels except + /* We are now done, and we have all mip-levels except * the last in TRANSFER_SRC_OPTIMAL, - * and the last one still on TRANSFER_DST_OPTIMAL, + * and the last one still on TRANSFER_DST_OPTIMAL, * so do a final barrier which - * moves everything to SHADER_READ_ONLY_OPTIMAL in + * moves everything to SHADER_READ_ONLY_OPTIMAL in * one go along with the execution barrier to next pass. - * Read-to-read memory barrier, so only need execution + * Read-to-read memory barrier, so only need execution * barrier for first transition. */ barriers[0].srcAccessMask = VK_ACCESS_TRANSFER_READ_BIT; @@ -2280,9 +2280,9 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd) 0, nullptr, 2, barriers); - /* Next pass will wait for ALL_GRAPHICS_BIT, and since + /* Next pass will wait for ALL_GRAPHICS_BIT, and since * we have dstStage as FRAGMENT_SHADER, - * the dependency chain will ensure we don't start + * the dependency chain will ensure we don't start * next pass until the mipchain is complete. */ } @@ -2331,7 +2331,7 @@ void Framebuffer::init(DeferredDisposer *disposer) info.arrayLayers = 1; info.samples = VK_SAMPLE_COUNT_1_BIT; info.tiling = VK_IMAGE_TILING_OPTIMAL; - info.usage = VK_IMAGE_USAGE_SAMPLED_BIT | + info.usage = VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; @@ -2353,7 +2353,7 @@ void Framebuffer::init(DeferredDisposer *disposer) /* Can reuse already allocated memory. */ if (memory.size < mem_reqs.size || memory.type != alloc.memoryTypeIndex) { - /* Memory might still be in use since we don't want + /* Memory might still be in use since we don't want * to totally stall * the world for framebuffer recreation. */ if (memory.memory != VK_NULL_HANDLE && disposer) @@ -2371,7 +2371,7 @@ void Framebuffer::init(DeferredDisposer *disposer) vkBindImageMemory(device, image, memory.memory, 0); - VkImageViewCreateInfo view_info = { + VkImageViewCreateInfo view_info = { VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO }; view_info.viewType = VK_IMAGE_VIEW_TYPE_2D; view_info.format = format; @@ -2395,9 +2395,9 @@ void Framebuffer::init(DeferredDisposer *disposer) void Framebuffer::init_render_pass() { - VkRenderPassCreateInfo rp_info = { + VkRenderPassCreateInfo rp_info = { VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO }; - VkAttachmentReference color_ref = { 0, + VkAttachmentReference color_ref = { 0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL }; /* We will always write to the entire framebuffer, @@ -2428,7 +2428,7 @@ void Framebuffer::init_render_pass() void Framebuffer::init_framebuffer() { - VkFramebufferCreateInfo info = { + VkFramebufferCreateInfo info = { VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO }; info.renderPass = render_pass; info.attachmentCount = 1; @@ -2857,7 +2857,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset( pass_info.scale_type_y = VULKAN_FILTER_CHAIN_SCALE_ORIGINAL; pass_info.scale_x = 0.0f; pass_info.scale_y = 0.0f; - pass_info.rt_format = VK_FORMAT_UNDEFINED; + pass_info.rt_format = VK_FORMAT_UNDEFINED; pass_info.source_filter = VULKAN_FILTER_CHAIN_LINEAR; pass_info.mip_filter = VULKAN_FILTER_CHAIN_LINEAR; pass_info.address = VULKAN_FILTER_CHAIN_ADDRESS_REPEAT; @@ -2886,7 +2886,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset( if (itr != shader->parameters + shader->num_parameters) { - /* Allow duplicate #pragma parameter, but + /* Allow duplicate #pragma parameter, but * only if they are exactly the same. */ if (meta_param.desc != itr->desc || meta_param.initial != itr->initial || @@ -2939,7 +2939,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset( else { pass_info.source_filter = - pass->filter == RARCH_FILTER_LINEAR ? VULKAN_FILTER_CHAIN_LINEAR : + pass->filter == RARCH_FILTER_LINEAR ? VULKAN_FILTER_CHAIN_LINEAR : VULKAN_FILTER_CHAIN_NEAREST; } pass_info.address = wrap_to_address(pass->wrap); @@ -2963,11 +2963,11 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset( if (!pass->fbo.valid) { - pass_info.scale_type_x = i + 1 == shader->passes - ? VULKAN_FILTER_CHAIN_SCALE_VIEWPORT + pass_info.scale_type_x = i + 1 == shader->passes + ? VULKAN_FILTER_CHAIN_SCALE_VIEWPORT : VULKAN_FILTER_CHAIN_SCALE_SOURCE; - pass_info.scale_type_y = i + 1 == shader->passes - ? VULKAN_FILTER_CHAIN_SCALE_VIEWPORT + pass_info.scale_type_y = i + 1 == shader->passes + ? VULKAN_FILTER_CHAIN_SCALE_VIEWPORT : VULKAN_FILTER_CHAIN_SCALE_SOURCE; pass_info.scale_x = 1.0f; pass_info.scale_y = 1.0f; diff --git a/gfx/drivers_shader/slang_preprocess.cpp b/gfx/drivers_shader/slang_preprocess.cpp index f59e62e618..45c5bcdf1d 100644 --- a/gfx/drivers_shader/slang_preprocess.cpp +++ b/gfx/drivers_shader/slang_preprocess.cpp @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -30,7 +30,7 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta, { unsigned old_num_parameters = shader->num_parameters; - /* Assumes num_parameters is + /* Assumes num_parameters is * initialized to something sane. */ for (auto ¶m : meta.parameters) { @@ -46,7 +46,7 @@ bool slang_preprocess_parse_parameters(glslang_meta& meta, if (itr != shader->parameters + shader->num_parameters) { dup = true; - /* Allow duplicate #pragma parameter, but only + /* Allow duplicate #pragma parameter, but only * if they are exactly the same. */ if (param.desc != itr->desc || param.initial != itr->initial || diff --git a/gfx/drivers_shader/slang_process.cpp b/gfx/drivers_shader/slang_process.cpp index 84a7c89c44..a09485162c 100644 --- a/gfx/drivers_shader/slang_process.cpp +++ b/gfx/drivers_shader/slang_process.cpp @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -135,25 +135,25 @@ static bool slang_process_reflection( if (!set_unique_map( texture_semantic_map, name, - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT, i })) return false; if (!set_unique_map( texture_semantic_uniform_map, name + "Size", - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT, i })) return false; if (!set_unique_map( texture_semantic_map, name + "Feedback", - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK, i })) return false; if (!set_unique_map( texture_semantic_uniform_map, name + "FeedbackSize", - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK, i })) return false; } @@ -162,14 +162,14 @@ static bool slang_process_reflection( { if (!set_unique_map( texture_semantic_map, shader_info->lut[i].id, - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_USER, i })) return false; if (!set_unique_map( texture_semantic_uniform_map, string(shader_info->lut[i].id) + "Size", - slang_texture_semantic_map{ + slang_texture_semantic_map{ SLANG_TEXTURE_SEMANTIC_USER, i })) return false; } @@ -212,7 +212,7 @@ static bool slang_process_reflection( if (src.push_constant || src.uniform) { uniform_sem_t uniform = { map->uniforms[semantic], - src.num_components + src.num_components * (unsigned)sizeof(float) }; string uniform_id = get_semantic_name( sl_reflection, (slang_semantic)semantic, 0); @@ -238,7 +238,7 @@ static bool slang_process_reflection( if (src.push_constant || src.uniform) { - uniform_sem_t uniform = { + uniform_sem_t uniform = { &shader_info->parameters[i].current, sizeof(float) }; string uniform_id = get_semantic_name( @@ -262,10 +262,10 @@ static bool slang_process_reflection( { unsigned index; - for (index = 0; index < + for (index = 0; index < sl_reflection.semantic_textures[semantic].size(); index++) { - slang_texture_semantic_meta& src = + slang_texture_semantic_meta& src = sl_reflection.semantic_textures[semantic][index]; if (src.stage_mask) @@ -304,7 +304,7 @@ static bool slang_process_reflection( if (src.push_constant || src.uniform) { uniform_sem_t uniform = { - (void*)((uintptr_t)map->textures[semantic].size + (void*)((uintptr_t)map->textures[semantic].size + index * map->textures[semantic].size_stride), 4 * sizeof(float) }; diff --git a/gfx/drivers_shader/slang_reflection.cpp b/gfx/drivers_shader/slang_reflection.cpp index 79c90d8345..e9ef89ce23 100644 --- a/gfx/drivers_shader/slang_reflection.cpp +++ b/gfx/drivers_shader/slang_reflection.cpp @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -565,7 +565,7 @@ bool slang_reflect(const Compiler &vertex_compiler, const Compiler &fragment_com slang_texture_semantic index = slang_name_to_texture_semantic(*reflection->texture_semantic_map, texture.name, &array_index); - + if (index == SLANG_INVALID_TEXTURE_SEMANTIC) { RARCH_ERR("[slang]: Non-semantic textures not supported yet.\n"); diff --git a/gfx/drivers_shader/slang_reflection.h b/gfx/drivers_shader/slang_reflection.h index 014d5b5caa..98aa7c3206 100644 --- a/gfx/drivers_shader/slang_reflection.h +++ b/gfx/drivers_shader/slang_reflection.h @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2017 - Hans-Kristian Arntzen - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -67,7 +67,7 @@ enum slang_semantic /* vec4, viewport size of final pass */ SLANG_SEMANTIC_FINAL_VIEWPORT = 2, /* uint, frame count with modulo */ - SLANG_SEMANTIC_FRAME_COUNT = 3, + SLANG_SEMANTIC_FRAME_COUNT = 3, SLANG_NUM_BASE_SEMANTICS, /* float, user defined parameter, arrayed */ diff --git a/gfx/drivers_shader/slang_reflection.hpp b/gfx/drivers_shader/slang_reflection.hpp index c424899317..dc5817574c 100644 --- a/gfx/drivers_shader/slang_reflection.hpp +++ b/gfx/drivers_shader/slang_reflection.hpp @@ -1,86 +1,86 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2019 - Hans-Kristian Arntzen - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef SLANG_REFLECTION_HPP_ -#define SLANG_REFLECTION_HPP_ - -#include -#include -#include -#include - -struct slang_texture_semantic_meta -{ - size_t ubo_offset = 0; - size_t push_constant_offset = 0; - unsigned binding = 0; - uint32_t stage_mask = 0; - - bool texture = false; - bool uniform = false; - bool push_constant = false; -}; - -struct slang_semantic_meta -{ - size_t ubo_offset = 0; - size_t push_constant_offset = 0; - unsigned num_components = 0; - bool uniform = false; - bool push_constant = false; -}; - -struct slang_texture_semantic_map -{ - slang_texture_semantic semantic; - unsigned index; -}; - -struct slang_semantic_map -{ - slang_semantic semantic; - unsigned index; -}; - -struct slang_reflection -{ - slang_reflection(); - - size_t ubo_size = 0; - size_t push_constant_size = 0; - - unsigned ubo_binding = 0; - uint32_t ubo_stage_mask = 0; - uint32_t push_constant_stage_mask = 0; - - std::vector semantic_textures[SLANG_NUM_TEXTURE_SEMANTICS]; - slang_semantic_meta semantics[SLANG_NUM_SEMANTICS]; - std::vector semantic_float_parameters; - - const std::unordered_map *texture_semantic_map = nullptr; - const std::unordered_map *texture_semantic_uniform_map = nullptr; - const std::unordered_map *semantic_map = nullptr; - unsigned pass_number = 0; -}; - -bool slang_reflect_spirv(const std::vector &vertex, - const std::vector &fragment, - slang_reflection *reflection); - -bool slang_reflect(const spirv_cross::Compiler &vertex_compiler, const spirv_cross::Compiler &fragment_compiler, - const spirv_cross::ShaderResources &vertex, const spirv_cross::ShaderResources &fragment, - slang_reflection *reflection); - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2019 - Hans-Kristian Arntzen + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef SLANG_REFLECTION_HPP_ +#define SLANG_REFLECTION_HPP_ + +#include +#include +#include +#include + +struct slang_texture_semantic_meta +{ + size_t ubo_offset = 0; + size_t push_constant_offset = 0; + unsigned binding = 0; + uint32_t stage_mask = 0; + + bool texture = false; + bool uniform = false; + bool push_constant = false; +}; + +struct slang_semantic_meta +{ + size_t ubo_offset = 0; + size_t push_constant_offset = 0; + unsigned num_components = 0; + bool uniform = false; + bool push_constant = false; +}; + +struct slang_texture_semantic_map +{ + slang_texture_semantic semantic; + unsigned index; +}; + +struct slang_semantic_map +{ + slang_semantic semantic; + unsigned index; +}; + +struct slang_reflection +{ + slang_reflection(); + + size_t ubo_size = 0; + size_t push_constant_size = 0; + + unsigned ubo_binding = 0; + uint32_t ubo_stage_mask = 0; + uint32_t push_constant_stage_mask = 0; + + std::vector semantic_textures[SLANG_NUM_TEXTURE_SEMANTICS]; + slang_semantic_meta semantics[SLANG_NUM_SEMANTICS]; + std::vector semantic_float_parameters; + + const std::unordered_map *texture_semantic_map = nullptr; + const std::unordered_map *texture_semantic_uniform_map = nullptr; + const std::unordered_map *semantic_map = nullptr; + unsigned pass_number = 0; +}; + +bool slang_reflect_spirv(const std::vector &vertex, + const std::vector &fragment, + slang_reflection *reflection); + +bool slang_reflect(const spirv_cross::Compiler &vertex_compiler, const spirv_cross::Compiler &fragment_compiler, + const spirv_cross::ShaderResources &vertex, const spirv_cross::ShaderResources &fragment, + slang_reflection *reflection); + +#endif diff --git a/gfx/font_driver.c b/gfx/font_driver.c index ccdb45b92c..de4cf2f5b1 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -554,7 +554,7 @@ static bool ctr_font_init_first( } #endif -#ifdef HAVE_LIBNX +#ifdef HAVE_LIBNX static const font_renderer_t *switch_font_backends[] = { &switch_font, NULL @@ -963,7 +963,7 @@ void font_driver_render_msg( const char *msg, const struct font_params *params) { - font_data_t *font = (font_data_t*)(font_data + font_data_t *font = (font_data_t*)(font_data ? font_data : video_font_driver); if (msg && *msg && font && font->renderer && font->renderer->render_msg) diff --git a/gfx/include/d3d8/d3d8caps.h b/gfx/include/d3d8/d3d8caps.h index fe31c2d33b..c2f7edcd16 100644 --- a/gfx/include/d3d8/d3d8caps.h +++ b/gfx/include/d3d8/d3d8caps.h @@ -1,326 +1,326 @@ -/*==========================================================================; - * - * Copyright (C) Microsoft Corporation. All Rights Reserved. - * - * File: d3d8caps.h - * Content: Direct3D capabilities include file - * - ***************************************************************************/ - -#ifndef _D3D8CAPS_H -#define _D3D8CAPS_H - -#ifndef DIRECT3D_VERSION -#define DIRECT3D_VERSION 0x0800 -#endif /* DIRECT3D_VERSION */ - -/* include this file content only if compiling for DX8 interfaces */ -#if(DIRECT3D_VERSION >= 0x0800) - -#if defined(_X86_) || defined(_IA64_) -#pragma pack(4) -#endif - -typedef struct _D3DCAPS8 -{ - /* Device Info */ - D3DDEVTYPE DeviceType; - UINT AdapterOrdinal; - - /* Caps from DX7 Draw */ - DWORD Caps; - DWORD Caps2; - DWORD Caps3; - DWORD PresentationIntervals; - - /* Cursor Caps */ - DWORD CursorCaps; - - /* 3D Device Caps */ - DWORD DevCaps; - - DWORD PrimitiveMiscCaps; - DWORD RasterCaps; - DWORD ZCmpCaps; - DWORD SrcBlendCaps; - DWORD DestBlendCaps; - DWORD AlphaCmpCaps; - DWORD ShadeCaps; - DWORD TextureCaps; - DWORD TextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DTexture8's */ - DWORD CubeTextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DCubeTexture8's */ - DWORD VolumeTextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DVolumeTexture8's */ - DWORD TextureAddressCaps; /* D3DPTADDRESSCAPS for IDirect3DTexture8's */ - DWORD VolumeTextureAddressCaps; /* D3DPTADDRESSCAPS for IDirect3DVolumeTexture8's */ - - DWORD LineCaps; /* D3DLINECAPS */ - - DWORD MaxTextureWidth, MaxTextureHeight; - DWORD MaxVolumeExtent; - - DWORD MaxTextureRepeat; - DWORD MaxTextureAspectRatio; - DWORD MaxAnisotropy; - float MaxVertexW; - - float GuardBandLeft; - float GuardBandTop; - float GuardBandRight; - float GuardBandBottom; - - float ExtentsAdjust; - DWORD StencilCaps; - - DWORD FVFCaps; - DWORD TextureOpCaps; - DWORD MaxTextureBlendStages; - DWORD MaxSimultaneousTextures; - - DWORD VertexProcessingCaps; - DWORD MaxActiveLights; - DWORD MaxUserClipPlanes; - DWORD MaxVertexBlendMatrices; - DWORD MaxVertexBlendMatrixIndex; - - float MaxPointSize; - - DWORD MaxPrimitiveCount; /* max number of primitives per DrawPrimitive call */ - DWORD MaxVertexIndex; - DWORD MaxStreams; - DWORD MaxStreamStride; /* max stride for SetStreamSource */ - - DWORD VertexShaderVersion; - DWORD MaxVertexShaderConst; /* number of vertex shader constant registers */ - - DWORD PixelShaderVersion; - float MaxPixelShaderValue; /* max value of pixel shader arithmetic component */ - -} D3DCAPS8; - -/* BIT DEFINES FOR D3DCAPS8 DWORD MEMBERS */ - -/* Caps */ -#define D3DCAPS_READ_SCANLINE 0x00020000L - -/* Caps2 */ -#define D3DCAPS2_NO2DDURING3DSCENE 0x00000002L -#define D3DCAPS2_FULLSCREENGAMMA 0x00020000L -#define D3DCAPS2_CANRENDERWINDOWED 0x00080000L -#define D3DCAPS2_CANCALIBRATEGAMMA 0x00100000L -#define D3DCAPS2_RESERVED 0x02000000L -#define D3DCAPS2_CANMANAGERESOURCE 0x10000000L -#define D3DCAPS2_DYNAMICTEXTURES 0x20000000L - -/* Caps3 */ -#define D3DCAPS3_RESERVED 0x8000001fL - -/* Indicates that the device can respect the ALPHABLENDENABLE render state - * when fullscreen while using the FLIP or DISCARD swap effect. - * COPY and COPYVSYNC swap effects work whether or not this flag is set. - */ -#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L - -/* PresentationIntervals */ -#define D3DPRESENT_INTERVAL_DEFAULT 0x00000000L -#define D3DPRESENT_INTERVAL_ONE 0x00000001L -#define D3DPRESENT_INTERVAL_TWO 0x00000002L -#define D3DPRESENT_INTERVAL_THREE 0x00000004L -#define D3DPRESENT_INTERVAL_FOUR 0x00000008L -#define D3DPRESENT_INTERVAL_IMMEDIATE 0x80000000L - -/* CursorCaps */ - -/* Driver supports HW color cursor in at least hi-res modes(height >=400) */ -#define D3DCURSORCAPS_COLOR 0x00000001L -/* Driver supports HW cursor also in low-res modes(height < 400) */ -#define D3DCURSORCAPS_LOWRES 0x00000002L - -/* DevCaps */ -#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010L /* Device can use execute buffers from system memory */ -#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020L /* Device can use execute buffers from video memory */ -#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040L /* Device can use TL buffers from system memory */ -#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080L /* Device can use TL buffers from video memory */ -#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100L /* Device can texture from system memory */ -#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200L /* Device can texture from device memory */ -#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400L /* Device can draw TLVERTEX primitives */ -#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800L /* Device can render without waiting for flip to complete */ -#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000L /* Device can texture from nonlocal video memory */ -#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000L /* Device can support DrawPrimitives2 */ -#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000L /* Device is texturing from separate memory pools */ -#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000L /* Device can support Extended DrawPrimitives2 i.e. DX7 compliant driver*/ -#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000L /* Device can support transformation and lighting in hardware and DRAWPRIMITIVES2EX must be also */ -#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000L /* Device supports a Tex Blt from system memory to non-local vidmem */ -#define D3DDEVCAPS_HWRASTERIZATION 0x00080000L /* Device has HW acceleration for rasterization */ -#define D3DDEVCAPS_PUREDEVICE 0x00100000L /* Device supports D3DCREATE_PUREDEVICE */ -#define D3DDEVCAPS_QUINTICRTPATCHES 0x00200000L /* Device supports quintic Beziers and BSplines */ -#define D3DDEVCAPS_RTPATCHES 0x00400000L /* Device supports Rect and Tri patches */ -#define D3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000L /* Indicates that RT Patches may be drawn efficiently using handle 0 */ -#define D3DDEVCAPS_NPATCHES 0x01000000L /* Device supports N-Patches */ - -/* PrimitiveMiscCaps */ -#define D3DPMISCCAPS_MASKZ 0x00000002L -#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004L -#define D3DPMISCCAPS_CULLNONE 0x00000010L -#define D3DPMISCCAPS_CULLCW 0x00000020L -#define D3DPMISCCAPS_CULLCCW 0x00000040L -#define D3DPMISCCAPS_COLORWRITEENABLE 0x00000080L -#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100L /* Device correctly clips scaled points to clip planes */ -#define D3DPMISCCAPS_CLIPTLVERTS 0x00000200L /* device will clip post-transformed vertex primitives */ -#define D3DPMISCCAPS_TSSARGTEMP 0x00000400L /* device supports D3DTA_TEMP for temporary register */ -#define D3DPMISCCAPS_BLENDOP 0x00000800L /* device supports D3DRS_BLENDOP */ -#define D3DPMISCCAPS_NULLREFERENCE 0x00001000L /* Reference Device that doesnt render */ - -/* LineCaps */ -#define D3DLINECAPS_TEXTURE 0x00000001L -#define D3DLINECAPS_ZTEST 0x00000002L -#define D3DLINECAPS_BLEND 0x00000004L -#define D3DLINECAPS_ALPHACMP 0x00000008L -#define D3DLINECAPS_FOG 0x00000010L - -/* RasterCaps */ -#define D3DPRASTERCAPS_DITHER 0x00000001L -#define D3DPRASTERCAPS_PAT 0x00000008L -#define D3DPRASTERCAPS_ZTEST 0x00000010L -#define D3DPRASTERCAPS_FOGVERTEX 0x00000080L -#define D3DPRASTERCAPS_FOGTABLE 0x00000100L -#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000L -#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000L -#define D3DPRASTERCAPS_ZBIAS 0x00004000L -#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000L -#define D3DPRASTERCAPS_FOGRANGE 0x00010000L -#define D3DPRASTERCAPS_ANISOTROPY 0x00020000L -#define D3DPRASTERCAPS_WBUFFER 0x00040000L -#define D3DPRASTERCAPS_WFOG 0x00100000L -#define D3DPRASTERCAPS_ZFOG 0x00200000L -#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000L /* Device iterates colors perspective correct */ -#define D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE 0x00800000L - -/* ZCmpCaps, AlphaCmpCaps */ -#define D3DPCMPCAPS_NEVER 0x00000001L -#define D3DPCMPCAPS_LESS 0x00000002L -#define D3DPCMPCAPS_EQUAL 0x00000004L -#define D3DPCMPCAPS_LESSEQUAL 0x00000008L -#define D3DPCMPCAPS_GREATER 0x00000010L -#define D3DPCMPCAPS_NOTEQUAL 0x00000020L -#define D3DPCMPCAPS_GREATEREQUAL 0x00000040L -#define D3DPCMPCAPS_ALWAYS 0x00000080L - -/* SourceBlendCaps, DestBlendCaps */ -#define D3DPBLENDCAPS_ZERO 0x00000001L -#define D3DPBLENDCAPS_ONE 0x00000002L -#define D3DPBLENDCAPS_SRCCOLOR 0x00000004L -#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008L -#define D3DPBLENDCAPS_SRCALPHA 0x00000010L -#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020L -#define D3DPBLENDCAPS_DESTALPHA 0x00000040L -#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080L -#define D3DPBLENDCAPS_DESTCOLOR 0x00000100L -#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200L -#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400L -#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800L -#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000L - -/* ShadeCaps */ -#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008L -#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200L -#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000L -#define D3DPSHADECAPS_FOGGOURAUD 0x00080000L - -/* TextureCaps */ -#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001L /* Perspective-correct texturing is supported */ -#define D3DPTEXTURECAPS_POW2 0x00000002L /* Power-of-2 texture dimensions are required - applies to non-Cube/Volume textures only. */ -#define D3DPTEXTURECAPS_ALPHA 0x00000004L /* Alpha in texture pixels is supported */ -#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020L /* Only square textures are supported */ -#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040L /* Texture indices are not scaled by the texture size prior to interpolation */ -#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080L /* Device can draw alpha from texture palettes */ -/* Device can use non-POW2 textures if: - * 1) D3DTEXTURE_ADDRESS is set to CLAMP for this texture's stage - * 2) D3DRS_WRAP(N) is zero for this texture's coordinates - * 3) mip mapping is not enabled (use magnification filter only) - */ -#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L -#define D3DPTEXTURECAPS_PROJECTED 0x00000400L /* Device can do D3DTTFF_PROJECTED */ -#define D3DPTEXTURECAPS_CUBEMAP 0x00000800L /* Device can do cubemap textures */ -#define D3DPTEXTURECAPS_VOLUMEMAP 0x00002000L /* Device can do volume textures */ -#define D3DPTEXTURECAPS_MIPMAP 0x00004000L /* Device can do mipmapped textures */ -#define D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000L /* Device can do mipmapped volume textures */ -#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000L /* Device can do mipmapped cube maps */ -#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000L /* Device requires that cubemaps be power-of-2 dimension */ -#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000L /* Device requires that volume maps be power-of-2 dimension */ - -/* TextureFilterCaps */ -#define D3DPTFILTERCAPS_MINFPOINT 0x00000100L /* Min Filter */ -#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200L -#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400L -#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000L /* Mip Filter */ -#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000L -#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000L /* Mag Filter */ -#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000L -#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000L -#define D3DPTFILTERCAPS_MAGFAFLATCUBIC 0x08000000L -#define D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC 0x10000000L - -/* TextureAddressCaps */ -#define D3DPTADDRESSCAPS_WRAP 0x00000001L -#define D3DPTADDRESSCAPS_MIRROR 0x00000002L -#define D3DPTADDRESSCAPS_CLAMP 0x00000004L -#define D3DPTADDRESSCAPS_BORDER 0x00000008L -#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010L -#define D3DPTADDRESSCAPS_MIRRORONCE 0x00000020L - -/* StencilCaps */ -#define D3DSTENCILCAPS_KEEP 0x00000001L -#define D3DSTENCILCAPS_ZERO 0x00000002L -#define D3DSTENCILCAPS_REPLACE 0x00000004L -#define D3DSTENCILCAPS_INCRSAT 0x00000008L -#define D3DSTENCILCAPS_DECRSAT 0x00000010L -#define D3DSTENCILCAPS_INVERT 0x00000020L -#define D3DSTENCILCAPS_INCR 0x00000040L -#define D3DSTENCILCAPS_DECR 0x00000080L - -/* TextureOpCaps */ -#define D3DTEXOPCAPS_DISABLE 0x00000001L -#define D3DTEXOPCAPS_SELECTARG1 0x00000002L -#define D3DTEXOPCAPS_SELECTARG2 0x00000004L -#define D3DTEXOPCAPS_MODULATE 0x00000008L -#define D3DTEXOPCAPS_MODULATE2X 0x00000010L -#define D3DTEXOPCAPS_MODULATE4X 0x00000020L -#define D3DTEXOPCAPS_ADD 0x00000040L -#define D3DTEXOPCAPS_ADDSIGNED 0x00000080L -#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100L -#define D3DTEXOPCAPS_SUBTRACT 0x00000200L -#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400L -#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800L -#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000L -#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000L -#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000L -#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000L -#define D3DTEXOPCAPS_PREMODULATE 0x00010000L -#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000L -#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000L -#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000L -#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000L -#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000L -#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000L -#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000L -#define D3DTEXOPCAPS_MULTIPLYADD 0x01000000L -#define D3DTEXOPCAPS_LERP 0x02000000L - -/* FVFCaps */ -#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000ffffL /* mask for texture coordinate count field */ -#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000L /* Device prefers that vertex elements not be stripped */ -#define D3DFVFCAPS_PSIZE 0x00100000L /* Device can receive point size */ - -/* VertexProcessingCaps */ -#define D3DVTXPCAPS_TEXGEN 0x00000001L /* device can do texgen */ -#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002L /* device can do DX7-level colormaterialsource ops */ -#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008L /* device can do directional lights */ -#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010L /* device can do positional lights (includes point and spot) */ -#define D3DVTXPCAPS_LOCALVIEWER 0x00000020L /* device can do local viewer */ -#define D3DVTXPCAPS_TWEENING 0x00000040L /* device can do vertex tweening */ -#define D3DVTXPCAPS_NO_VSDT_UBYTE4 0x00000080L /* device does not support D3DVSDT_UBYTE4 */ - -#pragma pack() - -#endif /* (DIRECT3D_VERSION >= 0x0800) */ -#endif /* _D3D8CAPS_H_ */ +/*==========================================================================; + * + * Copyright (C) Microsoft Corporation. All Rights Reserved. + * + * File: d3d8caps.h + * Content: Direct3D capabilities include file + * + ***************************************************************************/ + +#ifndef _D3D8CAPS_H +#define _D3D8CAPS_H + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0800 +#endif /* DIRECT3D_VERSION */ + +/* include this file content only if compiling for DX8 interfaces */ +#if(DIRECT3D_VERSION >= 0x0800) + +#if defined(_X86_) || defined(_IA64_) +#pragma pack(4) +#endif + +typedef struct _D3DCAPS8 +{ + /* Device Info */ + D3DDEVTYPE DeviceType; + UINT AdapterOrdinal; + + /* Caps from DX7 Draw */ + DWORD Caps; + DWORD Caps2; + DWORD Caps3; + DWORD PresentationIntervals; + + /* Cursor Caps */ + DWORD CursorCaps; + + /* 3D Device Caps */ + DWORD DevCaps; + + DWORD PrimitiveMiscCaps; + DWORD RasterCaps; + DWORD ZCmpCaps; + DWORD SrcBlendCaps; + DWORD DestBlendCaps; + DWORD AlphaCmpCaps; + DWORD ShadeCaps; + DWORD TextureCaps; + DWORD TextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DTexture8's */ + DWORD CubeTextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DCubeTexture8's */ + DWORD VolumeTextureFilterCaps; /* D3DPTFILTERCAPS for IDirect3DVolumeTexture8's */ + DWORD TextureAddressCaps; /* D3DPTADDRESSCAPS for IDirect3DTexture8's */ + DWORD VolumeTextureAddressCaps; /* D3DPTADDRESSCAPS for IDirect3DVolumeTexture8's */ + + DWORD LineCaps; /* D3DLINECAPS */ + + DWORD MaxTextureWidth, MaxTextureHeight; + DWORD MaxVolumeExtent; + + DWORD MaxTextureRepeat; + DWORD MaxTextureAspectRatio; + DWORD MaxAnisotropy; + float MaxVertexW; + + float GuardBandLeft; + float GuardBandTop; + float GuardBandRight; + float GuardBandBottom; + + float ExtentsAdjust; + DWORD StencilCaps; + + DWORD FVFCaps; + DWORD TextureOpCaps; + DWORD MaxTextureBlendStages; + DWORD MaxSimultaneousTextures; + + DWORD VertexProcessingCaps; + DWORD MaxActiveLights; + DWORD MaxUserClipPlanes; + DWORD MaxVertexBlendMatrices; + DWORD MaxVertexBlendMatrixIndex; + + float MaxPointSize; + + DWORD MaxPrimitiveCount; /* max number of primitives per DrawPrimitive call */ + DWORD MaxVertexIndex; + DWORD MaxStreams; + DWORD MaxStreamStride; /* max stride for SetStreamSource */ + + DWORD VertexShaderVersion; + DWORD MaxVertexShaderConst; /* number of vertex shader constant registers */ + + DWORD PixelShaderVersion; + float MaxPixelShaderValue; /* max value of pixel shader arithmetic component */ + +} D3DCAPS8; + +/* BIT DEFINES FOR D3DCAPS8 DWORD MEMBERS */ + +/* Caps */ +#define D3DCAPS_READ_SCANLINE 0x00020000L + +/* Caps2 */ +#define D3DCAPS2_NO2DDURING3DSCENE 0x00000002L +#define D3DCAPS2_FULLSCREENGAMMA 0x00020000L +#define D3DCAPS2_CANRENDERWINDOWED 0x00080000L +#define D3DCAPS2_CANCALIBRATEGAMMA 0x00100000L +#define D3DCAPS2_RESERVED 0x02000000L +#define D3DCAPS2_CANMANAGERESOURCE 0x10000000L +#define D3DCAPS2_DYNAMICTEXTURES 0x20000000L + +/* Caps3 */ +#define D3DCAPS3_RESERVED 0x8000001fL + +/* Indicates that the device can respect the ALPHABLENDENABLE render state + * when fullscreen while using the FLIP or DISCARD swap effect. + * COPY and COPYVSYNC swap effects work whether or not this flag is set. + */ +#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020L + +/* PresentationIntervals */ +#define D3DPRESENT_INTERVAL_DEFAULT 0x00000000L +#define D3DPRESENT_INTERVAL_ONE 0x00000001L +#define D3DPRESENT_INTERVAL_TWO 0x00000002L +#define D3DPRESENT_INTERVAL_THREE 0x00000004L +#define D3DPRESENT_INTERVAL_FOUR 0x00000008L +#define D3DPRESENT_INTERVAL_IMMEDIATE 0x80000000L + +/* CursorCaps */ + +/* Driver supports HW color cursor in at least hi-res modes(height >=400) */ +#define D3DCURSORCAPS_COLOR 0x00000001L +/* Driver supports HW cursor also in low-res modes(height < 400) */ +#define D3DCURSORCAPS_LOWRES 0x00000002L + +/* DevCaps */ +#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010L /* Device can use execute buffers from system memory */ +#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020L /* Device can use execute buffers from video memory */ +#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040L /* Device can use TL buffers from system memory */ +#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080L /* Device can use TL buffers from video memory */ +#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100L /* Device can texture from system memory */ +#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200L /* Device can texture from device memory */ +#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400L /* Device can draw TLVERTEX primitives */ +#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800L /* Device can render without waiting for flip to complete */ +#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000L /* Device can texture from nonlocal video memory */ +#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000L /* Device can support DrawPrimitives2 */ +#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000L /* Device is texturing from separate memory pools */ +#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000L /* Device can support Extended DrawPrimitives2 i.e. DX7 compliant driver*/ +#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000L /* Device can support transformation and lighting in hardware and DRAWPRIMITIVES2EX must be also */ +#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000L /* Device supports a Tex Blt from system memory to non-local vidmem */ +#define D3DDEVCAPS_HWRASTERIZATION 0x00080000L /* Device has HW acceleration for rasterization */ +#define D3DDEVCAPS_PUREDEVICE 0x00100000L /* Device supports D3DCREATE_PUREDEVICE */ +#define D3DDEVCAPS_QUINTICRTPATCHES 0x00200000L /* Device supports quintic Beziers and BSplines */ +#define D3DDEVCAPS_RTPATCHES 0x00400000L /* Device supports Rect and Tri patches */ +#define D3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000L /* Indicates that RT Patches may be drawn efficiently using handle 0 */ +#define D3DDEVCAPS_NPATCHES 0x01000000L /* Device supports N-Patches */ + +/* PrimitiveMiscCaps */ +#define D3DPMISCCAPS_MASKZ 0x00000002L +#define D3DPMISCCAPS_LINEPATTERNREP 0x00000004L +#define D3DPMISCCAPS_CULLNONE 0x00000010L +#define D3DPMISCCAPS_CULLCW 0x00000020L +#define D3DPMISCCAPS_CULLCCW 0x00000040L +#define D3DPMISCCAPS_COLORWRITEENABLE 0x00000080L +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100L /* Device correctly clips scaled points to clip planes */ +#define D3DPMISCCAPS_CLIPTLVERTS 0x00000200L /* device will clip post-transformed vertex primitives */ +#define D3DPMISCCAPS_TSSARGTEMP 0x00000400L /* device supports D3DTA_TEMP for temporary register */ +#define D3DPMISCCAPS_BLENDOP 0x00000800L /* device supports D3DRS_BLENDOP */ +#define D3DPMISCCAPS_NULLREFERENCE 0x00001000L /* Reference Device that doesnt render */ + +/* LineCaps */ +#define D3DLINECAPS_TEXTURE 0x00000001L +#define D3DLINECAPS_ZTEST 0x00000002L +#define D3DLINECAPS_BLEND 0x00000004L +#define D3DLINECAPS_ALPHACMP 0x00000008L +#define D3DLINECAPS_FOG 0x00000010L + +/* RasterCaps */ +#define D3DPRASTERCAPS_DITHER 0x00000001L +#define D3DPRASTERCAPS_PAT 0x00000008L +#define D3DPRASTERCAPS_ZTEST 0x00000010L +#define D3DPRASTERCAPS_FOGVERTEX 0x00000080L +#define D3DPRASTERCAPS_FOGTABLE 0x00000100L +#define D3DPRASTERCAPS_ANTIALIASEDGES 0x00001000L +#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000L +#define D3DPRASTERCAPS_ZBIAS 0x00004000L +#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000L +#define D3DPRASTERCAPS_FOGRANGE 0x00010000L +#define D3DPRASTERCAPS_ANISOTROPY 0x00020000L +#define D3DPRASTERCAPS_WBUFFER 0x00040000L +#define D3DPRASTERCAPS_WFOG 0x00100000L +#define D3DPRASTERCAPS_ZFOG 0x00200000L +#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000L /* Device iterates colors perspective correct */ +#define D3DPRASTERCAPS_STRETCHBLTMULTISAMPLE 0x00800000L + +/* ZCmpCaps, AlphaCmpCaps */ +#define D3DPCMPCAPS_NEVER 0x00000001L +#define D3DPCMPCAPS_LESS 0x00000002L +#define D3DPCMPCAPS_EQUAL 0x00000004L +#define D3DPCMPCAPS_LESSEQUAL 0x00000008L +#define D3DPCMPCAPS_GREATER 0x00000010L +#define D3DPCMPCAPS_NOTEQUAL 0x00000020L +#define D3DPCMPCAPS_GREATEREQUAL 0x00000040L +#define D3DPCMPCAPS_ALWAYS 0x00000080L + +/* SourceBlendCaps, DestBlendCaps */ +#define D3DPBLENDCAPS_ZERO 0x00000001L +#define D3DPBLENDCAPS_ONE 0x00000002L +#define D3DPBLENDCAPS_SRCCOLOR 0x00000004L +#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008L +#define D3DPBLENDCAPS_SRCALPHA 0x00000010L +#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020L +#define D3DPBLENDCAPS_DESTALPHA 0x00000040L +#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080L +#define D3DPBLENDCAPS_DESTCOLOR 0x00000100L +#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200L +#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400L +#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800L +#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000L + +/* ShadeCaps */ +#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008L +#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200L +#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000L +#define D3DPSHADECAPS_FOGGOURAUD 0x00080000L + +/* TextureCaps */ +#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001L /* Perspective-correct texturing is supported */ +#define D3DPTEXTURECAPS_POW2 0x00000002L /* Power-of-2 texture dimensions are required - applies to non-Cube/Volume textures only. */ +#define D3DPTEXTURECAPS_ALPHA 0x00000004L /* Alpha in texture pixels is supported */ +#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020L /* Only square textures are supported */ +#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040L /* Texture indices are not scaled by the texture size prior to interpolation */ +#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080L /* Device can draw alpha from texture palettes */ +/* Device can use non-POW2 textures if: + * 1) D3DTEXTURE_ADDRESS is set to CLAMP for this texture's stage + * 2) D3DRS_WRAP(N) is zero for this texture's coordinates + * 3) mip mapping is not enabled (use magnification filter only) + */ +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100L +#define D3DPTEXTURECAPS_PROJECTED 0x00000400L /* Device can do D3DTTFF_PROJECTED */ +#define D3DPTEXTURECAPS_CUBEMAP 0x00000800L /* Device can do cubemap textures */ +#define D3DPTEXTURECAPS_VOLUMEMAP 0x00002000L /* Device can do volume textures */ +#define D3DPTEXTURECAPS_MIPMAP 0x00004000L /* Device can do mipmapped textures */ +#define D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000L /* Device can do mipmapped volume textures */ +#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000L /* Device can do mipmapped cube maps */ +#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000L /* Device requires that cubemaps be power-of-2 dimension */ +#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000L /* Device requires that volume maps be power-of-2 dimension */ + +/* TextureFilterCaps */ +#define D3DPTFILTERCAPS_MINFPOINT 0x00000100L /* Min Filter */ +#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200L +#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400L +#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000L /* Mip Filter */ +#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000L +#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000L /* Mag Filter */ +#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000L +#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000L +#define D3DPTFILTERCAPS_MAGFAFLATCUBIC 0x08000000L +#define D3DPTFILTERCAPS_MAGFGAUSSIANCUBIC 0x10000000L + +/* TextureAddressCaps */ +#define D3DPTADDRESSCAPS_WRAP 0x00000001L +#define D3DPTADDRESSCAPS_MIRROR 0x00000002L +#define D3DPTADDRESSCAPS_CLAMP 0x00000004L +#define D3DPTADDRESSCAPS_BORDER 0x00000008L +#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010L +#define D3DPTADDRESSCAPS_MIRRORONCE 0x00000020L + +/* StencilCaps */ +#define D3DSTENCILCAPS_KEEP 0x00000001L +#define D3DSTENCILCAPS_ZERO 0x00000002L +#define D3DSTENCILCAPS_REPLACE 0x00000004L +#define D3DSTENCILCAPS_INCRSAT 0x00000008L +#define D3DSTENCILCAPS_DECRSAT 0x00000010L +#define D3DSTENCILCAPS_INVERT 0x00000020L +#define D3DSTENCILCAPS_INCR 0x00000040L +#define D3DSTENCILCAPS_DECR 0x00000080L + +/* TextureOpCaps */ +#define D3DTEXOPCAPS_DISABLE 0x00000001L +#define D3DTEXOPCAPS_SELECTARG1 0x00000002L +#define D3DTEXOPCAPS_SELECTARG2 0x00000004L +#define D3DTEXOPCAPS_MODULATE 0x00000008L +#define D3DTEXOPCAPS_MODULATE2X 0x00000010L +#define D3DTEXOPCAPS_MODULATE4X 0x00000020L +#define D3DTEXOPCAPS_ADD 0x00000040L +#define D3DTEXOPCAPS_ADDSIGNED 0x00000080L +#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100L +#define D3DTEXOPCAPS_SUBTRACT 0x00000200L +#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400L +#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800L +#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000L +#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000L +#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000L +#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000L +#define D3DTEXOPCAPS_PREMODULATE 0x00010000L +#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000L +#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000L +#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000L +#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000L +#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000L +#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000L +#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000L +#define D3DTEXOPCAPS_MULTIPLYADD 0x01000000L +#define D3DTEXOPCAPS_LERP 0x02000000L + +/* FVFCaps */ +#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000ffffL /* mask for texture coordinate count field */ +#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000L /* Device prefers that vertex elements not be stripped */ +#define D3DFVFCAPS_PSIZE 0x00100000L /* Device can receive point size */ + +/* VertexProcessingCaps */ +#define D3DVTXPCAPS_TEXGEN 0x00000001L /* device can do texgen */ +#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002L /* device can do DX7-level colormaterialsource ops */ +#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008L /* device can do directional lights */ +#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010L /* device can do positional lights (includes point and spot) */ +#define D3DVTXPCAPS_LOCALVIEWER 0x00000020L /* device can do local viewer */ +#define D3DVTXPCAPS_TWEENING 0x00000040L /* device can do vertex tweening */ +#define D3DVTXPCAPS_NO_VSDT_UBYTE4 0x00000080L /* device does not support D3DVSDT_UBYTE4 */ + +#pragma pack() + +#endif /* (DIRECT3D_VERSION >= 0x0800) */ +#endif /* _D3D8CAPS_H_ */ diff --git a/gfx/include/d3d8/d3d8types.h b/gfx/include/d3d8/d3d8types.h index 9ed1221341..a37bd74465 100644 --- a/gfx/include/d3d8/d3d8types.h +++ b/gfx/include/d3d8/d3d8types.h @@ -1,1654 +1,1639 @@ -/*==========================================================================; - * - * Copyright (C) Microsoft Corporation. All Rights Reserved. - * - * File: d3d8types.h - * Content: Direct3D capabilities include file - * - ***************************************************************************/ - -#ifndef _D3D8TYPES_H_ -#define _D3D8TYPES_H_ - -#ifndef DIRECT3D_VERSION -#define DIRECT3D_VERSION 0x0800 -#endif /* DIRECT3D_VERSION */ - -/* include this file content only if compiling for DX8 interfaces */ -#if(DIRECT3D_VERSION >= 0x0800) - -#include - -#if _MSC_VER >= 1200 -#pragma warning(push) -#endif -#pragma warning(disable:4201) /* anonymous unions warning */ -#if defined(_X86_) || defined(_IA64_) -#pragma pack(4) -#endif - -/* D3DCOLOR is equivalent to D3DFMT_A8R8G8B8 */ -#ifndef D3DCOLOR_DEFINED -typedef DWORD D3DCOLOR; -#define D3DCOLOR_DEFINED -#endif - -/* maps unsigned 8 bits/channel to D3DCOLOR */ -#define D3DCOLOR_ARGB(a,r,g,b) \ - ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) -#define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) -#define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b) - -/* maps floating point channels (0.f to 1.f range) to D3DCOLOR */ -#define D3DCOLOR_COLORVALUE(r,g,b,a) \ - D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) - - -#ifndef D3DVECTOR_DEFINED -typedef struct _D3DVECTOR { - float x; - float y; - float z; -} D3DVECTOR; -#define D3DVECTOR_DEFINED -#endif - -#ifndef D3DCOLORVALUE_DEFINED -typedef struct _D3DCOLORVALUE { - float r; - float g; - float b; - float a; -} D3DCOLORVALUE; -#define D3DCOLORVALUE_DEFINED -#endif - -#ifndef D3DRECT_DEFINED -typedef struct _D3DRECT { - LONG x1; - LONG y1; - LONG x2; - LONG y2; -} D3DRECT; -#define D3DRECT_DEFINED -#endif - -#ifndef D3DMATRIX_DEFINED -typedef struct _D3DMATRIX { - union { - struct { - float _11, _12, _13, _14; - float _21, _22, _23, _24; - float _31, _32, _33, _34; - float _41, _42, _43, _44; - - }; - float m[4][4]; - }; -} D3DMATRIX; -#define D3DMATRIX_DEFINED -#endif - -typedef struct _D3DVIEWPORT8 { - DWORD X; - DWORD Y; /* Viewport Top left */ - DWORD Width; - DWORD Height; /* Viewport Dimensions */ - float MinZ; /* Min/max of clip Volume */ - float MaxZ; -} D3DVIEWPORT8; - -/* - * Values for clip fields. - */ - -/* Max number of user clipping planes, supported in D3D. */ -#define D3DMAXUSERCLIPPLANES 32 - -/* These bits could be ORed together to use with D3DRS_CLIPPLANEENABLE */ -#define D3DCLIPPLANE0 (1 << 0) -#define D3DCLIPPLANE1 (1 << 1) -#define D3DCLIPPLANE2 (1 << 2) -#define D3DCLIPPLANE3 (1 << 3) -#define D3DCLIPPLANE4 (1 << 4) -#define D3DCLIPPLANE5 (1 << 5) - -/* The following bits are used in the ClipUnion and ClipIntersection - * members of the D3DCLIPSTATUS8 - */ - -#define D3DCS_LEFT 0x00000001L -#define D3DCS_RIGHT 0x00000002L -#define D3DCS_TOP 0x00000004L -#define D3DCS_BOTTOM 0x00000008L -#define D3DCS_FRONT 0x00000010L -#define D3DCS_BACK 0x00000020L -#define D3DCS_PLANE0 0x00000040L -#define D3DCS_PLANE1 0x00000080L -#define D3DCS_PLANE2 0x00000100L -#define D3DCS_PLANE3 0x00000200L -#define D3DCS_PLANE4 0x00000400L -#define D3DCS_PLANE5 0x00000800L - -#define D3DCS_ALL (D3DCS_LEFT | \ - D3DCS_RIGHT | \ - D3DCS_TOP | \ - D3DCS_BOTTOM | \ - D3DCS_FRONT | \ - D3DCS_BACK | \ - D3DCS_PLANE0 | \ - D3DCS_PLANE1 | \ - D3DCS_PLANE2 | \ - D3DCS_PLANE3 | \ - D3DCS_PLANE4 | \ - D3DCS_PLANE5) - -typedef struct _D3DCLIPSTATUS8 { - DWORD ClipUnion; - DWORD ClipIntersection; -} D3DCLIPSTATUS8; - -typedef struct _D3DMATERIAL8 { - D3DCOLORVALUE Diffuse; /* Diffuse color RGBA */ - D3DCOLORVALUE Ambient; /* Ambient color RGB */ - D3DCOLORVALUE Specular; /* Specular 'shininess' */ - D3DCOLORVALUE Emissive; /* Emissive color RGB */ - float Power; /* Sharpness if specular highlight */ -} D3DMATERIAL8; - -typedef enum _D3DLIGHTTYPE { - D3DLIGHT_POINT = 1, - D3DLIGHT_SPOT = 2, - D3DLIGHT_DIRECTIONAL = 3, - D3DLIGHT_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DLIGHTTYPE; - -typedef struct _D3DLIGHT8 { - D3DLIGHTTYPE Type; /* Type of light source */ - D3DCOLORVALUE Diffuse; /* Diffuse color of light */ - D3DCOLORVALUE Specular; /* Specular color of light */ - D3DCOLORVALUE Ambient; /* Ambient color of light */ - D3DVECTOR Position; /* Position in world space */ - D3DVECTOR Direction; /* Direction in world space */ - float Range; /* Cutoff range */ - float Falloff; /* Falloff */ - float Attenuation0; /* Constant attenuation */ - float Attenuation1; /* Linear attenuation */ - float Attenuation2; /* Quadratic attenuation */ - float Theta; /* Inner angle of spotlight cone */ - float Phi; /* Outer angle of spotlight cone */ -} D3DLIGHT8; - -/* - * Options for clearing - */ -#define D3DCLEAR_TARGET 0x00000001l /* Clear target surface */ -#define D3DCLEAR_ZBUFFER 0x00000002l /* Clear target z buffer */ -#define D3DCLEAR_STENCIL 0x00000004l /* Clear stencil planes */ - -/* - * The following defines the rendering states - */ - -typedef enum _D3DSHADEMODE { - D3DSHADE_FLAT = 1, - D3DSHADE_GOURAUD = 2, - D3DSHADE_PHONG = 3, - D3DSHADE_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DSHADEMODE; - -typedef enum _D3DFILLMODE { - D3DFILL_POINT = 1, - D3DFILL_WIREFRAME = 2, - D3DFILL_SOLID = 3, - D3DFILL_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DFILLMODE; - -typedef struct _D3DLINEPATTERN { - WORD wRepeatFactor; - WORD wLinePattern; -} D3DLINEPATTERN; - -typedef enum _D3DBLEND { - D3DBLEND_ZERO = 1, - D3DBLEND_ONE = 2, - D3DBLEND_SRCCOLOR = 3, - D3DBLEND_INVSRCCOLOR = 4, - D3DBLEND_SRCALPHA = 5, - D3DBLEND_INVSRCALPHA = 6, - D3DBLEND_DESTALPHA = 7, - D3DBLEND_INVDESTALPHA = 8, - D3DBLEND_DESTCOLOR = 9, - D3DBLEND_INVDESTCOLOR = 10, - D3DBLEND_SRCALPHASAT = 11, - D3DBLEND_BOTHSRCALPHA = 12, - D3DBLEND_BOTHINVSRCALPHA = 13, - D3DBLEND_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DBLEND; - -typedef enum _D3DBLENDOP { - D3DBLENDOP_ADD = 1, - D3DBLENDOP_SUBTRACT = 2, - D3DBLENDOP_REVSUBTRACT = 3, - D3DBLENDOP_MIN = 4, - D3DBLENDOP_MAX = 5, - D3DBLENDOP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DBLENDOP; - -typedef enum _D3DTEXTUREADDRESS { - D3DTADDRESS_WRAP = 1, - D3DTADDRESS_MIRROR = 2, - D3DTADDRESS_CLAMP = 3, - D3DTADDRESS_BORDER = 4, - D3DTADDRESS_MIRRORONCE = 5, - D3DTADDRESS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DTEXTUREADDRESS; - -typedef enum _D3DCULL { - D3DCULL_NONE = 1, - D3DCULL_CW = 2, - D3DCULL_CCW = 3, - D3DCULL_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DCULL; - -typedef enum _D3DCMPFUNC { - D3DCMP_NEVER = 1, - D3DCMP_LESS = 2, - D3DCMP_EQUAL = 3, - D3DCMP_LESSEQUAL = 4, - D3DCMP_GREATER = 5, - D3DCMP_NOTEQUAL = 6, - D3DCMP_GREATEREQUAL = 7, - D3DCMP_ALWAYS = 8, - D3DCMP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DCMPFUNC; - -typedef enum _D3DSTENCILOP { - D3DSTENCILOP_KEEP = 1, - D3DSTENCILOP_ZERO = 2, - D3DSTENCILOP_REPLACE = 3, - D3DSTENCILOP_INCRSAT = 4, - D3DSTENCILOP_DECRSAT = 5, - D3DSTENCILOP_INVERT = 6, - D3DSTENCILOP_INCR = 7, - D3DSTENCILOP_DECR = 8, - D3DSTENCILOP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DSTENCILOP; - -typedef enum _D3DFOGMODE { - D3DFOG_NONE = 0, - D3DFOG_EXP = 1, - D3DFOG_EXP2 = 2, - D3DFOG_LINEAR = 3, - D3DFOG_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DFOGMODE; - -typedef enum _D3DZBUFFERTYPE { - D3DZB_FALSE = 0, - D3DZB_TRUE = 1, /* Z buffering */ - D3DZB_USEW = 2, /* W buffering */ - D3DZB_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DZBUFFERTYPE; - -/* Primitives supported by draw-primitive API */ -typedef enum _D3DPRIMITIVETYPE { - D3DPT_POINTLIST = 1, - D3DPT_LINELIST = 2, - D3DPT_LINESTRIP = 3, - D3DPT_TRIANGLELIST = 4, - D3DPT_TRIANGLESTRIP = 5, - D3DPT_TRIANGLEFAN = 6, - D3DPT_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DPRIMITIVETYPE; - -typedef enum _D3DTRANSFORMSTATETYPE { - D3DTS_VIEW = 2, - D3DTS_PROJECTION = 3, - D3DTS_TEXTURE0 = 16, - D3DTS_TEXTURE1 = 17, - D3DTS_TEXTURE2 = 18, - D3DTS_TEXTURE3 = 19, - D3DTS_TEXTURE4 = 20, - D3DTS_TEXTURE5 = 21, - D3DTS_TEXTURE6 = 22, - D3DTS_TEXTURE7 = 23, - D3DTS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DTRANSFORMSTATETYPE; - -#define D3DTS_WORLDMATRIX(index) (D3DTRANSFORMSTATETYPE)(index + 256) -#define D3DTS_WORLD D3DTS_WORLDMATRIX(0) -#define D3DTS_WORLD1 D3DTS_WORLDMATRIX(1) -#define D3DTS_WORLD2 D3DTS_WORLDMATRIX(2) -#define D3DTS_WORLD3 D3DTS_WORLDMATRIX(3) - -typedef enum _D3DRENDERSTATETYPE { - D3DRS_ZENABLE = 7, /* D3DZBUFFERTYPE (or TRUE/FALSE for legacy) */ - D3DRS_FILLMODE = 8, /* D3DFILLMODE */ - D3DRS_SHADEMODE = 9, /* D3DSHADEMODE */ - D3DRS_LINEPATTERN = 10, /* D3DLINEPATTERN */ - D3DRS_ZWRITEENABLE = 14, /* TRUE to enable z writes */ - D3DRS_ALPHATESTENABLE = 15, /* TRUE to enable alpha tests */ - D3DRS_LASTPIXEL = 16, /* TRUE for last-pixel on lines */ - D3DRS_SRCBLEND = 19, /* D3DBLEND */ - D3DRS_DESTBLEND = 20, /* D3DBLEND */ - D3DRS_CULLMODE = 22, /* D3DCULL */ - D3DRS_ZFUNC = 23, /* D3DCMPFUNC */ - D3DRS_ALPHAREF = 24, /* D3DFIXED */ - D3DRS_ALPHAFUNC = 25, /* D3DCMPFUNC */ - D3DRS_DITHERENABLE = 26, /* TRUE to enable dithering */ - D3DRS_ALPHABLENDENABLE = 27, /* TRUE to enable alpha blending */ - D3DRS_FOGENABLE = 28, /* TRUE to enable fog blending */ - D3DRS_SPECULARENABLE = 29, /* TRUE to enable specular */ - D3DRS_ZVISIBLE = 30, /* TRUE to enable z checking */ - D3DRS_FOGCOLOR = 34, /* D3DCOLOR */ - D3DRS_FOGTABLEMODE = 35, /* D3DFOGMODE */ - D3DRS_FOGSTART = 36, /* Fog start (for both vertex and pixel fog) */ - D3DRS_FOGEND = 37, /* Fog end */ - D3DRS_FOGDENSITY = 38, /* Fog density */ - D3DRS_EDGEANTIALIAS = 40, /* TRUE to enable edge antialiasing */ - D3DRS_ZBIAS = 47, /* LONG Z bias */ - D3DRS_RANGEFOGENABLE = 48, /* Enables range-based fog */ - D3DRS_STENCILENABLE = 52, /* BOOL enable/disable stenciling */ - D3DRS_STENCILFAIL = 53, /* D3DSTENCILOP to do if stencil test fails */ - D3DRS_STENCILZFAIL = 54, /* D3DSTENCILOP to do if stencil test passes and Z test fails */ - D3DRS_STENCILPASS = 55, /* D3DSTENCILOP to do if both stencil and Z tests pass */ - D3DRS_STENCILFUNC = 56, /* D3DCMPFUNC fn. Stencil Test passes if ((ref & mask) stencilfn (stencil & mask)) is true */ - D3DRS_STENCILREF = 57, /* Reference value used in stencil test */ - D3DRS_STENCILMASK = 58, /* Mask value used in stencil test */ - D3DRS_STENCILWRITEMASK = 59, /* Write mask applied to values written to stencil buffer */ - D3DRS_TEXTUREFACTOR = 60, /* D3DCOLOR used for multi-texture blend */ - D3DRS_WRAP0 = 128, /* wrap for 1st texture coord. set */ - D3DRS_WRAP1 = 129, /* wrap for 2nd texture coord. set */ - D3DRS_WRAP2 = 130, /* wrap for 3rd texture coord. set */ - D3DRS_WRAP3 = 131, /* wrap for 4th texture coord. set */ - D3DRS_WRAP4 = 132, /* wrap for 5th texture coord. set */ - D3DRS_WRAP5 = 133, /* wrap for 6th texture coord. set */ - D3DRS_WRAP6 = 134, /* wrap for 7th texture coord. set */ - D3DRS_WRAP7 = 135, /* wrap for 8th texture coord. set */ - D3DRS_CLIPPING = 136, - D3DRS_LIGHTING = 137, - D3DRS_AMBIENT = 139, - D3DRS_FOGVERTEXMODE = 140, - D3DRS_COLORVERTEX = 141, - D3DRS_LOCALVIEWER = 142, - D3DRS_NORMALIZENORMALS = 143, - D3DRS_DIFFUSEMATERIALSOURCE = 145, - D3DRS_SPECULARMATERIALSOURCE = 146, - D3DRS_AMBIENTMATERIALSOURCE = 147, - D3DRS_EMISSIVEMATERIALSOURCE = 148, - D3DRS_VERTEXBLEND = 151, - D3DRS_CLIPPLANEENABLE = 152, - D3DRS_SOFTWAREVERTEXPROCESSING = 153, - D3DRS_POINTSIZE = 154, /* float point size */ - D3DRS_POINTSIZE_MIN = 155, /* float point size min threshold */ - D3DRS_POINTSPRITEENABLE = 156, /* BOOL point texture coord control */ - D3DRS_POINTSCALEENABLE = 157, /* BOOL point size scale enable */ - D3DRS_POINTSCALE_A = 158, /* float point attenuation A value */ - D3DRS_POINTSCALE_B = 159, /* float point attenuation B value */ - D3DRS_POINTSCALE_C = 160, /* float point attenuation C value */ - D3DRS_MULTISAMPLEANTIALIAS = 161, /* BOOL - set to do FSAA with multisample buffer */ - D3DRS_MULTISAMPLEMASK = 162, /* DWORD - per-sample enable/disable */ - D3DRS_PATCHEDGESTYLE = 163, /* Sets whether patch edges will use float style tessellation */ - D3DRS_PATCHSEGMENTS = 164, /* Number of segments per edge when drawing patches */ - D3DRS_DEBUGMONITORTOKEN = 165, /* DEBUG ONLY - token to debug monitor */ - D3DRS_POINTSIZE_MAX = 166, /* float point size max threshold */ - D3DRS_INDEXEDVERTEXBLENDENABLE = 167, - D3DRS_COLORWRITEENABLE = 168, /* per-channel write enable */ - D3DRS_TWEENFACTOR = 170, /* float tween factor */ - D3DRS_BLENDOP = 171, /* D3DBLENDOP setting */ - D3DRS_POSITIONORDER = 172, /* NPatch position interpolation order. D3DORDER_LINEAR or D3DORDER_CUBIC (default) */ - D3DRS_NORMALORDER = 173, /* NPatch normal interpolation order. D3DORDER_LINEAR (default) or D3DORDER_QUADRATIC */ - - D3DRS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DRENDERSTATETYPE; - -/* Values for material source */ -typedef enum _D3DMATERIALCOLORSOURCE -{ - D3DMCS_MATERIAL = 0, /* Color from material is used */ - D3DMCS_COLOR1 = 1, /* Diffuse vertex color is used */ - D3DMCS_COLOR2 = 2, /* Specular vertex color is used */ - D3DMCS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DMATERIALCOLORSOURCE; - -/* Bias to apply to the texture coordinate set to apply a wrap to. */ -#define D3DRENDERSTATE_WRAPBIAS 128UL - -/* Flags to construct the WRAP render states */ -#define D3DWRAP_U 0x00000001L -#define D3DWRAP_V 0x00000002L -#define D3DWRAP_W 0x00000004L - -/* Flags to construct the WRAP render states for 1D thru 4D texture coordinates */ -#define D3DWRAPCOORD_0 0x00000001L /* same as D3DWRAP_U */ -#define D3DWRAPCOORD_1 0x00000002L /* same as D3DWRAP_V */ -#define D3DWRAPCOORD_2 0x00000004L /* same as D3DWRAP_W */ -#define D3DWRAPCOORD_3 0x00000008L - -/* Flags to construct D3DRS_COLORWRITEENABLE */ -#define D3DCOLORWRITEENABLE_RED (1L<<0) -#define D3DCOLORWRITEENABLE_GREEN (1L<<1) -#define D3DCOLORWRITEENABLE_BLUE (1L<<2) -#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) - -/* - * State enumerants for per-stage texture processing. - */ -typedef enum _D3DTEXTURESTAGESTATETYPE -{ - D3DTSS_COLOROP = 1, /* D3DTEXTUREOP - per-stage blending controls for color channels */ - D3DTSS_COLORARG1 = 2, /* D3DTA_* (texture arg) */ - D3DTSS_COLORARG2 = 3, /* D3DTA_* (texture arg) */ - D3DTSS_ALPHAOP = 4, /* D3DTEXTUREOP - per-stage blending controls for alpha channel */ - D3DTSS_ALPHAARG1 = 5, /* D3DTA_* (texture arg) */ - D3DTSS_ALPHAARG2 = 6, /* D3DTA_* (texture arg) */ - D3DTSS_BUMPENVMAT00 = 7, /* float (bump mapping matrix) */ - D3DTSS_BUMPENVMAT01 = 8, /* float (bump mapping matrix) */ - D3DTSS_BUMPENVMAT10 = 9, /* float (bump mapping matrix) */ - D3DTSS_BUMPENVMAT11 = 10, /* float (bump mapping matrix) */ - D3DTSS_TEXCOORDINDEX = 11, /* identifies which set of texture coordinates index this texture */ - D3DTSS_ADDRESSU = 13, /* D3DTEXTUREADDRESS for U coordinate */ - D3DTSS_ADDRESSV = 14, /* D3DTEXTUREADDRESS for V coordinate */ - D3DTSS_BORDERCOLOR = 15, /* D3DCOLOR */ - D3DTSS_MAGFILTER = 16, /* D3DTEXTUREFILTER filter to use for magnification */ - D3DTSS_MINFILTER = 17, /* D3DTEXTUREFILTER filter to use for minification */ - D3DTSS_MIPFILTER = 18, /* D3DTEXTUREFILTER filter to use between mipmaps during minification */ - D3DTSS_MIPMAPLODBIAS = 19, /* float Mipmap LOD bias */ - D3DTSS_MAXMIPLEVEL = 20, /* DWORD 0..(n-1) LOD index of largest map to use (0 == largest) */ - D3DTSS_MAXANISOTROPY = 21, /* DWORD maximum anisotropy */ - D3DTSS_BUMPENVLSCALE = 22, /* float scale for bump map luminance */ - D3DTSS_BUMPENVLOFFSET = 23, /* float offset for bump map luminance */ - D3DTSS_TEXTURETRANSFORMFLAGS = 24, /* D3DTEXTURETRANSFORMFLAGS controls texture transform */ - D3DTSS_ADDRESSW = 25, /* D3DTEXTUREADDRESS for W coordinate */ - D3DTSS_COLORARG0 = 26, /* D3DTA_* third arg for triadic ops */ - D3DTSS_ALPHAARG0 = 27, /* D3DTA_* third arg for triadic ops */ - D3DTSS_RESULTARG = 28, /* D3DTA_* arg for result (CURRENT or TEMP) */ - D3DTSS_FORCE_DWORD = 0x7fffffff, /* force 32-bit size enum */ -} D3DTEXTURESTAGESTATETYPE; - -/* Values, used with D3DTSS_TEXCOORDINDEX, to specify that the vertex data(position - * and normal in the camera space) should be taken as texture coordinates - * Low 16 bits are used to specify texture coordinate index, to take the WRAP mode from - */ -#define D3DTSS_TCI_PASSTHRU 0x00000000 -#define D3DTSS_TCI_CAMERASPACENORMAL 0x00010000 -#define D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000 -#define D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000 - -/* - * Enumerations for COLOROP and ALPHAOP texture blending operations set in - * texture processing stage controls in D3DTSS. - */ -typedef enum _D3DTEXTUREOP -{ - /* Control */ - D3DTOP_DISABLE = 1, /* disables stage */ - D3DTOP_SELECTARG1 = 2, /* the default */ - D3DTOP_SELECTARG2 = 3, - - /* Modulate */ - D3DTOP_MODULATE = 4, /* multiply args together */ - D3DTOP_MODULATE2X = 5, /* multiply and 1 bit */ - D3DTOP_MODULATE4X = 6, /* multiply and 2 bits */ - - /* Add */ - D3DTOP_ADD = 7, /* add arguments together */ - D3DTOP_ADDSIGNED = 8, /* add with -0.5 bias */ - D3DTOP_ADDSIGNED2X = 9, /* as above but left 1 bit */ - D3DTOP_SUBTRACT = 10, /* Arg1 - Arg2, with no saturation */ - D3DTOP_ADDSMOOTH = 11, /* add 2 args, subtract product */ - /* Arg1 + Arg2 - Arg1*Arg2 */ - /* = Arg1 + (1-Arg1)*Arg2 */ - - /* Linear alpha blend: Arg1*(Alpha) + Arg2*(1-Alpha) */ - D3DTOP_BLENDDIFFUSEALPHA = 12, /* iterated alpha */ - D3DTOP_BLENDTEXTUREALPHA = 13, /* texture alpha */ - D3DTOP_BLENDFACTORALPHA = 14, /* alpha from D3DRS_TEXTUREFACTOR */ - - /* Linear alpha blend with pre-multiplied arg1 input: Arg1 + Arg2*(1-Alpha) */ - D3DTOP_BLENDTEXTUREALPHAPM = 15, /* texture alpha */ - D3DTOP_BLENDCURRENTALPHA = 16, /* by alpha of current color */ - - /* Specular mapping */ - D3DTOP_PREMODULATE = 17, /* modulate with next texture before use */ - D3DTOP_MODULATEALPHA_ADDCOLOR = 18, /* Arg1.RGB + Arg1.A*Arg2.RGB */ - /* COLOROP only */ - D3DTOP_MODULATECOLOR_ADDALPHA = 19, /* Arg1.RGB*Arg2.RGB + Arg1.A */ - /* COLOROP only */ - D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20, /* (1-Arg1.A)*Arg2.RGB + Arg1.RGB */ - /* COLOROP only */ - D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21, /* (1-Arg1.RGB)*Arg2.RGB + Arg1.A */ - /* COLOROP only */ - - /* Bump mapping */ - D3DTOP_BUMPENVMAP = 22, /* per pixel env map perturbation */ - D3DTOP_BUMPENVMAPLUMINANCE = 23, /* with luminance channel */ - - /* This can do either diffuse or specular bump mapping with correct input. - * Performs the function (Arg1.R*Arg2.R + Arg1.G*Arg2.G + Arg1.B*Arg2.B) - * where each component has been scaled and offset to make it signed. - * The result is replicated into all four (including alpha) channels. - * This is a valid COLOROP only. - */ - D3DTOP_DOTPRODUCT3 = 24, - - /* Triadic ops */ - D3DTOP_MULTIPLYADD = 25, /* Arg0 + Arg1*Arg2 */ - D3DTOP_LERP = 26, /* (Arg0)*Arg1 + (1-Arg0)*Arg2 */ - - D3DTOP_FORCE_DWORD = 0x7fffffff -} D3DTEXTUREOP; - -/* - * Values for COLORARG0,1,2, ALPHAARG0,1,2, and RESULTARG texture blending - * operations set in texture processing stage controls in D3DRENDERSTATE. - */ -#define D3DTA_SELECTMASK 0x0000000f /* mask for arg selector */ -#define D3DTA_DIFFUSE 0x00000000 /* select diffuse color (read only) */ -#define D3DTA_CURRENT 0x00000001 /* select stage destination register (read/write) */ -#define D3DTA_TEXTURE 0x00000002 /* select texture color (read only) */ -#define D3DTA_TFACTOR 0x00000003 /* select D3DRS_TEXTUREFACTOR (read only) */ -#define D3DTA_SPECULAR 0x00000004 /* select specular color (read only) */ -#define D3DTA_TEMP 0x00000005 /* select temporary register color (read/write) */ -#define D3DTA_COMPLEMENT 0x00000010 /* take 1.0 - x (read modifier) */ -#define D3DTA_ALPHAREPLICATE 0x00000020 /* replicate alpha to color components (read modifier) */ - -/* Values for D3DTSS_***FILTER texture stage states */ -typedef enum _D3DTEXTUREFILTERTYPE -{ - D3DTEXF_NONE = 0, /* filtering disabled (valid for mip filter only) */ - D3DTEXF_POINT = 1, /* nearest */ - D3DTEXF_LINEAR = 2, /* linear interpolation */ - D3DTEXF_ANISOTROPIC = 3, /* anisotropic */ - D3DTEXF_FLATCUBIC = 4, /* cubic */ - D3DTEXF_GAUSSIANCUBIC = 5, /* different cubic kernel */ - D3DTEXF_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DTEXTUREFILTERTYPE; - -/* Bits for Flags in ProcessVertices call */ - -#define D3DPV_DONOTCOPYDATA (1 << 0) - -/*------------------------------------------------------------------- */ - -/* Flexible vertex format bits */ -#define D3DFVF_RESERVED0 0x001 -#define D3DFVF_POSITION_MASK 0x00E -#define D3DFVF_XYZ 0x002 -#define D3DFVF_XYZRHW 0x004 -#define D3DFVF_XYZB1 0x006 -#define D3DFVF_XYZB2 0x008 -#define D3DFVF_XYZB3 0x00a -#define D3DFVF_XYZB4 0x00c -#define D3DFVF_XYZB5 0x00e - -#define D3DFVF_NORMAL 0x010 -#define D3DFVF_PSIZE 0x020 -#define D3DFVF_DIFFUSE 0x040 -#define D3DFVF_SPECULAR 0x080 - -#define D3DFVF_TEXCOUNT_MASK 0xf00 -#define D3DFVF_TEXCOUNT_SHIFT 8 -#define D3DFVF_TEX0 0x000 -#define D3DFVF_TEX1 0x100 -#define D3DFVF_TEX2 0x200 -#define D3DFVF_TEX3 0x300 -#define D3DFVF_TEX4 0x400 -#define D3DFVF_TEX5 0x500 -#define D3DFVF_TEX6 0x600 -#define D3DFVF_TEX7 0x700 -#define D3DFVF_TEX8 0x800 - -#define D3DFVF_LASTBETA_UBYTE4 0x1000 - -#define D3DFVF_RESERVED2 0xE000 /* 4 reserved bits */ - -/*--------------------------------------------------------------------- - * Vertex Shaders - */ - -/* - -Vertex Shader Declaration - -The declaration portion of a vertex shader defines the static external -interface of the shader. The information in the declaration includes: - -- Assignments of vertex shader input registers to data streams. These -assignments bind a specific vertex register to a single component within a -vertex stream. A vertex stream element is identified by a byte offset -within the stream and a type. The type specifies the arithmetic data type -plus the dimensionality (1, 2, 3, or 4 values). Stream data which is -less than 4 values are always expanded out to 4 values with zero or more -0.F values and one 1.F value. - -- Assignment of vertex shader input registers to implicit data from the -primitive tessellator. This controls the loading of vertex data which is -not loaded from a stream, but rather is generated during primitive -tessellation prior to the vertex shader. - -- Loading data into the constant memory at the time a shader is set as the -current shader. Each token specifies values for one or more contiguous 4 -DWORD constant registers. This allows the shader to update an arbitrary -subset of the constant memory, overwriting the device state (which -contains the current values of the constant memory). Note that these -values can be subsequently overwritten (between DrawPrimitive calls) -during the time a shader is bound to a device via the -SetVertexShaderConstant method. - - -Declaration arrays are single-dimensional arrays of DWORDs composed of -multiple tokens each of which is one or more DWORDs. The single-DWORD -token value 0xFFFFFFFF is a special token used to indicate the end of the -declaration array. The single DWORD token value 0x00000000 is a NOP token -with is ignored during the declaration parsing. Note that 0x00000000 is a -valid value for DWORDs following the first DWORD for multiple word tokens. - -[31:29] TokenType - 0x0 - NOP (requires all DWORD bits to be zero) - 0x1 - stream selector - 0x2 - stream data definition (map to vertex input memory) - 0x3 - vertex input memory from tessellator - 0x4 - constant memory from shader - 0x5 - extension - 0x6 - reserved - 0x7 - end-of-array (requires all DWORD bits to be 1) - -NOP Token (single DWORD token) - [31:29] 0x0 - [28:00] 0x0 - -Stream Selector (single DWORD token) - [31:29] 0x1 - [28] indicates whether this is a tessellator stream - [27:04] 0x0 - [03:00] stream selector (0..15) - -Stream Data Definition (single DWORD token) - Vertex Input Register Load - [31:29] 0x2 - [28] 0x0 - [27:20] 0x0 - [19:16] type (dimensionality and data type) - [15:04] 0x0 - [03:00] vertex register address (0..15) - Data Skip (no register load) - [31:29] 0x2 - [28] 0x1 - [27:20] 0x0 - [19:16] count of DWORDS to skip over (0..15) - [15:00] 0x0 - Vertex Input Memory from Tessellator Data (single DWORD token) - [31:29] 0x3 - [28] indicates whether data is normals or u/v - [27:24] 0x0 - [23:20] vertex register address (0..15) - [19:16] type (dimensionality) - [15:04] 0x0 - [03:00] vertex register address (0..15) - -Constant Memory from Shader (multiple DWORD token) - [31:29] 0x4 - [28:25] count of 4*DWORD constants to load (0..15) - [24:07] 0x0 - [06:00] constant memory address (0..95) - -Extension Token (single or multiple DWORD token) - [31:29] 0x5 - [28:24] count of additional DWORDs in token (0..31) - [23:00] extension-specific information - -End-of-array token (single DWORD token) - [31:29] 0x7 - [28:00] 0x1fffffff - -The stream selector token must be immediately followed by a contiguous set of stream data definition tokens. This token sequence fully defines that stream, including the set of elements within the stream, the order in which the elements appear, the type of each element, and the vertex register into which to load an element. -Streams are allowed to include data which is not loaded into a vertex register, thus allowing data which is not used for this shader to exist in the vertex stream. This skipped data is defined only by a count of DWORDs to skip over, since the type information is irrelevant. -The token sequence: -Stream Select: stream=0 -Stream Data Definition (Load): type=FLOAT3; register=3 -Stream Data Definition (Load): type=FLOAT3; register=4 -Stream Data Definition (Skip): count=2 -Stream Data Definition (Load): type=FLOAT2; register=7 - -defines stream zero to consist of 4 elements, 3 of which are loaded into registers and the fourth skipped over. Register 3 is loaded with the first three DWORDs in each vertex interpreted as FLOAT data. Register 4 is loaded with the 4th, 5th, and 6th DWORDs interpreted as FLOAT data. The next two DWORDs (7th and 8th) are skipped over and not loaded into any vertex input register. Register 7 is loaded with the 9th and 10th DWORDS interpreted as FLOAT data. -Placing of tokens other than NOPs between the Stream Selector and Stream Data Definition tokens is disallowed. - -*/ - -typedef enum _D3DVSD_TOKENTYPE -{ - D3DVSD_TOKEN_NOP = 0, /* NOP or extension */ - D3DVSD_TOKEN_STREAM, /* stream selector */ - D3DVSD_TOKEN_STREAMDATA, /* stream data definition (map to vertex input memory) */ - D3DVSD_TOKEN_TESSELLATOR, /* vertex input memory from tessellator */ - D3DVSD_TOKEN_CONSTMEM, /* constant memory from shader */ - D3DVSD_TOKEN_EXT, /* extension */ - D3DVSD_TOKEN_END = 7, /* end-of-array (requires all DWORD bits to be 1) */ - D3DVSD_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DVSD_TOKENTYPE; - -#define D3DVSD_TOKENTYPESHIFT 29 -#define D3DVSD_TOKENTYPEMASK (7 << D3DVSD_TOKENTYPESHIFT) - -#define D3DVSD_STREAMNUMBERSHIFT 0 -#define D3DVSD_STREAMNUMBERMASK (0xF << D3DVSD_STREAMNUMBERSHIFT) - -#define D3DVSD_DATALOADTYPESHIFT 28 -#define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) - -#define D3DVSD_DATATYPESHIFT 16 -#define D3DVSD_DATATYPEMASK (0xF << D3DVSD_DATATYPESHIFT) - -#define D3DVSD_SKIPCOUNTSHIFT 16 -#define D3DVSD_SKIPCOUNTMASK (0xF << D3DVSD_SKIPCOUNTSHIFT) - -#define D3DVSD_VERTEXREGSHIFT 0 -#define D3DVSD_VERTEXREGMASK (0x1F << D3DVSD_VERTEXREGSHIFT) - -#define D3DVSD_VERTEXREGINSHIFT 20 -#define D3DVSD_VERTEXREGINMASK (0xF << D3DVSD_VERTEXREGINSHIFT) - -#define D3DVSD_CONSTCOUNTSHIFT 25 -#define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) - -#define D3DVSD_CONSTADDRESSSHIFT 0 -#define D3DVSD_CONSTADDRESSMASK (0x7F << D3DVSD_CONSTADDRESSSHIFT) - -#define D3DVSD_CONSTRSSHIFT 16 -#define D3DVSD_CONSTRSMASK (0x1FFF << D3DVSD_CONSTRSSHIFT) - -#define D3DVSD_EXTCOUNTSHIFT 24 -#define D3DVSD_EXTCOUNTMASK (0x1F << D3DVSD_EXTCOUNTSHIFT) - -#define D3DVSD_EXTINFOSHIFT 0 -#define D3DVSD_EXTINFOMASK (0xFFFFFF << D3DVSD_EXTINFOSHIFT) - -#define D3DVSD_MAKETOKENTYPE(tokenType) ((tokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK) - -/* macros for generation of CreateVertexShader Declaration token array */ - -/* Set current stream - * _StreamNumber [0..(MaxStreams-1)] stream to get data from - */ -#define D3DVSD_STREAM( _StreamNumber ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAM) | (_StreamNumber)) - -/* Set tessellator stream - */ -#define D3DVSD_STREAMTESSSHIFT 28 -#define D3DVSD_STREAMTESSMASK (1 << D3DVSD_STREAMTESSSHIFT) -#define D3DVSD_STREAM_TESS( ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAM) | (D3DVSD_STREAMTESSMASK)) - -/* bind single vertex register to vertex element from vertex stream - * - * _VertexRegister [0..15] address of the vertex register - * _Type [D3DVSDT_*] dimensionality and arithmetic data type - */ - -#define D3DVSD_REG( _VertexRegister, _Type ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAMDATA) | \ - ((_Type) << D3DVSD_DATATYPESHIFT) | (_VertexRegister)) - -/* Skip _DWORDCount DWORDs in vertex - */ -#define D3DVSD_SKIP( _DWORDCount ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAMDATA) | 0x10000000 | \ - ((_DWORDCount) << D3DVSD_SKIPCOUNTSHIFT)) - -/* load data into vertex shader constant memory - * - * _ConstantAddress [0..95] - address of constant array to begin filling data - * _Count [0..15] - number of constant vectors to load (4 DWORDs each) - * followed by 4*_Count DWORDS of data - */ -#define D3DVSD_CONST( _ConstantAddress, _Count ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_CONSTMEM) | \ - ((_Count) << D3DVSD_CONSTCOUNTSHIFT) | (_ConstantAddress)) - -/* enable tessellator generated normals - * - * _VertexRegisterIn [0..15] address of vertex register whose input stream - * will be used in normal computation - * _VertexRegisterOut [0..15] address of vertex register to output the normal to - */ -#define D3DVSD_TESSNORMAL( _VertexRegisterIn, _VertexRegisterOut ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) | \ - ((_VertexRegisterIn) << D3DVSD_VERTEXREGINSHIFT) | \ - ((0x02) << D3DVSD_DATATYPESHIFT) | (_VertexRegisterOut)) - -/* enable tessellator generated surface parameters - * - * _VertexRegister [0..15] address of vertex register to output parameters - */ -#define D3DVSD_TESSUV( _VertexRegister ) \ - (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) | 0x10000000 | \ - ((0x01) << D3DVSD_DATATYPESHIFT) | (_VertexRegister)) - -/* Generates END token - */ -#define D3DVSD_END() 0xFFFFFFFF - -/* Generates NOP token */ -#define D3DVSD_NOP() 0x00000000 - -/* bit declarations for _Type fields */ -#define D3DVSDT_FLOAT1 0x00 /* 1D float expanded to (value, 0., 0., 1.) */ -#define D3DVSDT_FLOAT2 0x01 /* 2D float expanded to (value, value, 0., 1.) */ -#define D3DVSDT_FLOAT3 0x02 /* 3D float expanded to (value, value, value, 1.) */ -#define D3DVSDT_FLOAT4 0x03 /* 4D float */ -#define D3DVSDT_D3DCOLOR 0x04 /* 4D packed unsigned bytes mapped to 0. to 1. range - * Input is in D3DCOLOR format (ARGB) expanded to (R, G, B, A) */ -#define D3DVSDT_UBYTE4 0x05 /* 4D unsigned byte */ -#define D3DVSDT_SHORT2 0x06 /* 2D signed short expanded to (value, value, 0., 1.) */ -#define D3DVSDT_SHORT4 0x07 /* 4D signed short */ - -/* assignments of vertex input registers for fixed function vertex shader */ -#define D3DVSDE_POSITION 0 -#define D3DVSDE_BLENDWEIGHT 1 -#define D3DVSDE_BLENDINDICES 2 -#define D3DVSDE_NORMAL 3 -#define D3DVSDE_PSIZE 4 -#define D3DVSDE_DIFFUSE 5 -#define D3DVSDE_SPECULAR 6 -#define D3DVSDE_TEXCOORD0 7 -#define D3DVSDE_TEXCOORD1 8 -#define D3DVSDE_TEXCOORD2 9 -#define D3DVSDE_TEXCOORD3 10 -#define D3DVSDE_TEXCOORD4 11 -#define D3DVSDE_TEXCOORD5 12 -#define D3DVSDE_TEXCOORD6 13 -#define D3DVSDE_TEXCOORD7 14 -#define D3DVSDE_POSITION2 15 -#define D3DVSDE_NORMAL2 16 - -/* Maximum supported number of texture coordinate sets */ -#define D3DDP_MAXTEXCOORD 8 - - -/* Instruction Token Bit Definitions */ -#define D3DSI_OPCODE_MASK 0x0000FFFF - -typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE -{ - D3DSIO_NOP = 0, /* PS/VS */ - D3DSIO_MOV , /* PS/VS */ - D3DSIO_ADD , /* PS/VS */ - D3DSIO_SUB , /* PS */ - D3DSIO_MAD , /* PS/VS */ - D3DSIO_MUL , /* PS/VS */ - D3DSIO_RCP , /* VS */ - D3DSIO_RSQ , /* VS */ - D3DSIO_DP3 , /* PS/VS */ - D3DSIO_DP4 , /* PS/VS */ - D3DSIO_MIN , /* VS */ - D3DSIO_MAX , /* VS */ - D3DSIO_SLT , /* VS */ - D3DSIO_SGE , /* VS */ - D3DSIO_EXP , /* VS */ - D3DSIO_LOG , /* VS */ - D3DSIO_LIT , /* VS */ - D3DSIO_DST , /* VS */ - D3DSIO_LRP , /* PS */ - D3DSIO_FRC , /* VS */ - D3DSIO_M4x4 , /* VS */ - D3DSIO_M4x3 , /* VS */ - D3DSIO_M3x4 , /* VS */ - D3DSIO_M3x3 , /* VS */ - D3DSIO_M3x2 , /* VS */ - - D3DSIO_TEXCOORD = 64, /* PS */ - D3DSIO_TEXKILL , /* PS */ - D3DSIO_TEX , /* PS */ - D3DSIO_TEXBEM , /* PS */ - D3DSIO_TEXBEML , /* PS */ - D3DSIO_TEXREG2AR , /* PS */ - D3DSIO_TEXREG2GB , /* PS */ - D3DSIO_TEXM3x2PAD , /* PS */ - D3DSIO_TEXM3x2TEX , /* PS */ - D3DSIO_TEXM3x3PAD , /* PS */ - D3DSIO_TEXM3x3TEX , /* PS */ - D3DSIO_TEXM3x3DIFF , /* PS */ - D3DSIO_TEXM3x3SPEC , /* PS */ - D3DSIO_TEXM3x3VSPEC , /* PS */ - D3DSIO_EXPP , /* VS */ - D3DSIO_LOGP , /* VS */ - D3DSIO_CND , /* PS */ - D3DSIO_DEF , /* PS */ - D3DSIO_TEXREG2RGB , /* PS */ - D3DSIO_TEXDP3TEX , /* PS */ - D3DSIO_TEXM3x2DEPTH , /* PS */ - D3DSIO_TEXDP3 , /* PS */ - D3DSIO_TEXM3x3 , /* PS */ - D3DSIO_TEXDEPTH , /* PS */ - D3DSIO_CMP , /* PS */ - D3DSIO_BEM , /* PS */ - - D3DSIO_PHASE = 0xFFFD, - D3DSIO_COMMENT = 0xFFFE, - D3DSIO_END = 0xFFFF, - - D3DSIO_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ -} D3DSHADER_INSTRUCTION_OPCODE_TYPE; - -/* Co-Issue Instruction Modifier - if set then this instruction is to be - * issued in parallel with the previous instruction(s) for which this bit - * is not set. */ -#define D3DSI_COISSUE 0x40000000 - -/* Parameter Token Bit Definitions */ -#define D3DSP_REGNUM_MASK 0x00001FFF - -/* destination parameter write mask */ -#define D3DSP_WRITEMASK_0 0x00010000 /* Component 0 (X;Red) */ -#define D3DSP_WRITEMASK_1 0x00020000 /* Component 1 (Y;Green) */ -#define D3DSP_WRITEMASK_2 0x00040000 /* Component 2 (Z;Blue) */ -#define D3DSP_WRITEMASK_3 0x00080000 /* Component 3 (W;Alpha) */ -#define D3DSP_WRITEMASK_ALL 0x000F0000 /* All Components */ - -/* destination parameter modifiers */ -#define D3DSP_DSTMOD_SHIFT 20 -#define D3DSP_DSTMOD_MASK 0x00F00000 - -typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE -{ - D3DSPDM_NONE = 0<>8)&0xFF) -#define D3DSHADER_VERSION_MINOR(_Version) (((_Version)>>0)&0xFF) - -/* destination/source parameter register type */ -#define D3DSI_COMMENTSIZE_SHIFT 16 -#define D3DSI_COMMENTSIZE_MASK 0x7FFF0000 -#define D3DSHADER_COMMENT(_DWordSize) \ - ((((_DWordSize)<= 1200 -#pragma warning(pop) -#else -#pragma warning(default:4201) -#endif - -#endif /* (DIRECT3D_VERSION >= 0x0800) */ -#endif /* _D3D8TYPES(P)_H_ */ +/*==========================================================================; + * + * Copyright (C) Microsoft Corporation. All Rights Reserved. + * + * File: d3d8types.h + * Content: Direct3D capabilities include file + * + ***************************************************************************/ + +#ifndef _D3D8TYPES_H_ +#define _D3D8TYPES_H_ + +#ifndef DIRECT3D_VERSION +#define DIRECT3D_VERSION 0x0800 +#endif /* DIRECT3D_VERSION */ + +/* include this file content only if compiling for DX8 interfaces */ +#if(DIRECT3D_VERSION >= 0x0800) + +#include + +#if _MSC_VER >= 1200 +#pragma warning(push) +#endif +#pragma warning(disable:4201) /* anonymous unions warning */ +#if defined(_X86_) || defined(_IA64_) +#pragma pack(4) +#endif + +/* D3DCOLOR is equivalent to D3DFMT_A8R8G8B8 */ +#ifndef D3DCOLOR_DEFINED +typedef DWORD D3DCOLOR; +#define D3DCOLOR_DEFINED +#endif + +/* maps unsigned 8 bits/channel to D3DCOLOR */ +#define D3DCOLOR_ARGB(a,r,g,b) \ + ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) +#define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b) + +/* maps floating point channels (0.f to 1.f range) to D3DCOLOR */ +#define D3DCOLOR_COLORVALUE(r,g,b,a) \ + D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) + +#ifndef D3DVECTOR_DEFINED +typedef struct _D3DVECTOR { + float x; + float y; + float z; +} D3DVECTOR; +#define D3DVECTOR_DEFINED +#endif + +#ifndef D3DCOLORVALUE_DEFINED +typedef struct _D3DCOLORVALUE { + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +#ifndef D3DRECT_DEFINED +typedef struct _D3DRECT { + LONG x1; + LONG y1; + LONG x2; + LONG y2; +} D3DRECT; +#define D3DRECT_DEFINED +#endif + +#ifndef D3DMATRIX_DEFINED +typedef struct _D3DMATRIX { + union { + struct { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + + }; + float m[4][4]; + }; +} D3DMATRIX; +#define D3DMATRIX_DEFINED +#endif + +typedef struct _D3DVIEWPORT8 { + DWORD X; + DWORD Y; /* Viewport Top left */ + DWORD Width; + DWORD Height; /* Viewport Dimensions */ + float MinZ; /* Min/max of clip Volume */ + float MaxZ; +} D3DVIEWPORT8; + +/* + * Values for clip fields. + */ + +/* Max number of user clipping planes, supported in D3D. */ +#define D3DMAXUSERCLIPPLANES 32 + +/* These bits could be ORed together to use with D3DRS_CLIPPLANEENABLE */ +#define D3DCLIPPLANE0 (1 << 0) +#define D3DCLIPPLANE1 (1 << 1) +#define D3DCLIPPLANE2 (1 << 2) +#define D3DCLIPPLANE3 (1 << 3) +#define D3DCLIPPLANE4 (1 << 4) +#define D3DCLIPPLANE5 (1 << 5) + +/* The following bits are used in the ClipUnion and ClipIntersection + * members of the D3DCLIPSTATUS8 + */ + +#define D3DCS_LEFT 0x00000001L +#define D3DCS_RIGHT 0x00000002L +#define D3DCS_TOP 0x00000004L +#define D3DCS_BOTTOM 0x00000008L +#define D3DCS_FRONT 0x00000010L +#define D3DCS_BACK 0x00000020L +#define D3DCS_PLANE0 0x00000040L +#define D3DCS_PLANE1 0x00000080L +#define D3DCS_PLANE2 0x00000100L +#define D3DCS_PLANE3 0x00000200L +#define D3DCS_PLANE4 0x00000400L +#define D3DCS_PLANE5 0x00000800L + +#define D3DCS_ALL (D3DCS_LEFT | \ + D3DCS_RIGHT | \ + D3DCS_TOP | \ + D3DCS_BOTTOM | \ + D3DCS_FRONT | \ + D3DCS_BACK | \ + D3DCS_PLANE0 | \ + D3DCS_PLANE1 | \ + D3DCS_PLANE2 | \ + D3DCS_PLANE3 | \ + D3DCS_PLANE4 | \ + D3DCS_PLANE5) + +typedef struct _D3DCLIPSTATUS8 { + DWORD ClipUnion; + DWORD ClipIntersection; +} D3DCLIPSTATUS8; + +typedef struct _D3DMATERIAL8 { + D3DCOLORVALUE Diffuse; /* Diffuse color RGBA */ + D3DCOLORVALUE Ambient; /* Ambient color RGB */ + D3DCOLORVALUE Specular; /* Specular 'shininess' */ + D3DCOLORVALUE Emissive; /* Emissive color RGB */ + float Power; /* Sharpness if specular highlight */ +} D3DMATERIAL8; + +typedef enum _D3DLIGHTTYPE { + D3DLIGHT_POINT = 1, + D3DLIGHT_SPOT = 2, + D3DLIGHT_DIRECTIONAL = 3, + D3DLIGHT_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DLIGHTTYPE; + +typedef struct _D3DLIGHT8 { + D3DLIGHTTYPE Type; /* Type of light source */ + D3DCOLORVALUE Diffuse; /* Diffuse color of light */ + D3DCOLORVALUE Specular; /* Specular color of light */ + D3DCOLORVALUE Ambient; /* Ambient color of light */ + D3DVECTOR Position; /* Position in world space */ + D3DVECTOR Direction; /* Direction in world space */ + float Range; /* Cutoff range */ + float Falloff; /* Falloff */ + float Attenuation0; /* Constant attenuation */ + float Attenuation1; /* Linear attenuation */ + float Attenuation2; /* Quadratic attenuation */ + float Theta; /* Inner angle of spotlight cone */ + float Phi; /* Outer angle of spotlight cone */ +} D3DLIGHT8; + +/* + * Options for clearing + */ +#define D3DCLEAR_TARGET 0x00000001l /* Clear target surface */ +#define D3DCLEAR_ZBUFFER 0x00000002l /* Clear target z buffer */ +#define D3DCLEAR_STENCIL 0x00000004l /* Clear stencil planes */ + +/* + * The following defines the rendering states + */ + +typedef enum _D3DSHADEMODE { + D3DSHADE_FLAT = 1, + D3DSHADE_GOURAUD = 2, + D3DSHADE_PHONG = 3, + D3DSHADE_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DSHADEMODE; + +typedef enum _D3DFILLMODE { + D3DFILL_POINT = 1, + D3DFILL_WIREFRAME = 2, + D3DFILL_SOLID = 3, + D3DFILL_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DFILLMODE; + +typedef struct _D3DLINEPATTERN { + WORD wRepeatFactor; + WORD wLinePattern; +} D3DLINEPATTERN; + +typedef enum _D3DBLEND { + D3DBLEND_ZERO = 1, + D3DBLEND_ONE = 2, + D3DBLEND_SRCCOLOR = 3, + D3DBLEND_INVSRCCOLOR = 4, + D3DBLEND_SRCALPHA = 5, + D3DBLEND_INVSRCALPHA = 6, + D3DBLEND_DESTALPHA = 7, + D3DBLEND_INVDESTALPHA = 8, + D3DBLEND_DESTCOLOR = 9, + D3DBLEND_INVDESTCOLOR = 10, + D3DBLEND_SRCALPHASAT = 11, + D3DBLEND_BOTHSRCALPHA = 12, + D3DBLEND_BOTHINVSRCALPHA = 13, + D3DBLEND_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DBLEND; + +typedef enum _D3DBLENDOP { + D3DBLENDOP_ADD = 1, + D3DBLENDOP_SUBTRACT = 2, + D3DBLENDOP_REVSUBTRACT = 3, + D3DBLENDOP_MIN = 4, + D3DBLENDOP_MAX = 5, + D3DBLENDOP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DBLENDOP; + +typedef enum _D3DTEXTUREADDRESS { + D3DTADDRESS_WRAP = 1, + D3DTADDRESS_MIRROR = 2, + D3DTADDRESS_CLAMP = 3, + D3DTADDRESS_BORDER = 4, + D3DTADDRESS_MIRRORONCE = 5, + D3DTADDRESS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DTEXTUREADDRESS; + +typedef enum _D3DCULL { + D3DCULL_NONE = 1, + D3DCULL_CW = 2, + D3DCULL_CCW = 3, + D3DCULL_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DCULL; + +typedef enum _D3DCMPFUNC { + D3DCMP_NEVER = 1, + D3DCMP_LESS = 2, + D3DCMP_EQUAL = 3, + D3DCMP_LESSEQUAL = 4, + D3DCMP_GREATER = 5, + D3DCMP_NOTEQUAL = 6, + D3DCMP_GREATEREQUAL = 7, + D3DCMP_ALWAYS = 8, + D3DCMP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DCMPFUNC; + +typedef enum _D3DSTENCILOP { + D3DSTENCILOP_KEEP = 1, + D3DSTENCILOP_ZERO = 2, + D3DSTENCILOP_REPLACE = 3, + D3DSTENCILOP_INCRSAT = 4, + D3DSTENCILOP_DECRSAT = 5, + D3DSTENCILOP_INVERT = 6, + D3DSTENCILOP_INCR = 7, + D3DSTENCILOP_DECR = 8, + D3DSTENCILOP_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DSTENCILOP; + +typedef enum _D3DFOGMODE { + D3DFOG_NONE = 0, + D3DFOG_EXP = 1, + D3DFOG_EXP2 = 2, + D3DFOG_LINEAR = 3, + D3DFOG_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DFOGMODE; + +typedef enum _D3DZBUFFERTYPE { + D3DZB_FALSE = 0, + D3DZB_TRUE = 1, /* Z buffering */ + D3DZB_USEW = 2, /* W buffering */ + D3DZB_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DZBUFFERTYPE; + +/* Primitives supported by draw-primitive API */ +typedef enum _D3DPRIMITIVETYPE { + D3DPT_POINTLIST = 1, + D3DPT_LINELIST = 2, + D3DPT_LINESTRIP = 3, + D3DPT_TRIANGLELIST = 4, + D3DPT_TRIANGLESTRIP = 5, + D3DPT_TRIANGLEFAN = 6, + D3DPT_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DPRIMITIVETYPE; + +typedef enum _D3DTRANSFORMSTATETYPE { + D3DTS_VIEW = 2, + D3DTS_PROJECTION = 3, + D3DTS_TEXTURE0 = 16, + D3DTS_TEXTURE1 = 17, + D3DTS_TEXTURE2 = 18, + D3DTS_TEXTURE3 = 19, + D3DTS_TEXTURE4 = 20, + D3DTS_TEXTURE5 = 21, + D3DTS_TEXTURE6 = 22, + D3DTS_TEXTURE7 = 23, + D3DTS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DTRANSFORMSTATETYPE; + +#define D3DTS_WORLDMATRIX(index) (D3DTRANSFORMSTATETYPE)(index + 256) +#define D3DTS_WORLD D3DTS_WORLDMATRIX(0) +#define D3DTS_WORLD1 D3DTS_WORLDMATRIX(1) +#define D3DTS_WORLD2 D3DTS_WORLDMATRIX(2) +#define D3DTS_WORLD3 D3DTS_WORLDMATRIX(3) + +typedef enum _D3DRENDERSTATETYPE { + D3DRS_ZENABLE = 7, /* D3DZBUFFERTYPE (or TRUE/FALSE for legacy) */ + D3DRS_FILLMODE = 8, /* D3DFILLMODE */ + D3DRS_SHADEMODE = 9, /* D3DSHADEMODE */ + D3DRS_LINEPATTERN = 10, /* D3DLINEPATTERN */ + D3DRS_ZWRITEENABLE = 14, /* TRUE to enable z writes */ + D3DRS_ALPHATESTENABLE = 15, /* TRUE to enable alpha tests */ + D3DRS_LASTPIXEL = 16, /* TRUE for last-pixel on lines */ + D3DRS_SRCBLEND = 19, /* D3DBLEND */ + D3DRS_DESTBLEND = 20, /* D3DBLEND */ + D3DRS_CULLMODE = 22, /* D3DCULL */ + D3DRS_ZFUNC = 23, /* D3DCMPFUNC */ + D3DRS_ALPHAREF = 24, /* D3DFIXED */ + D3DRS_ALPHAFUNC = 25, /* D3DCMPFUNC */ + D3DRS_DITHERENABLE = 26, /* TRUE to enable dithering */ + D3DRS_ALPHABLENDENABLE = 27, /* TRUE to enable alpha blending */ + D3DRS_FOGENABLE = 28, /* TRUE to enable fog blending */ + D3DRS_SPECULARENABLE = 29, /* TRUE to enable specular */ + D3DRS_ZVISIBLE = 30, /* TRUE to enable z checking */ + D3DRS_FOGCOLOR = 34, /* D3DCOLOR */ + D3DRS_FOGTABLEMODE = 35, /* D3DFOGMODE */ + D3DRS_FOGSTART = 36, /* Fog start (for both vertex and pixel fog) */ + D3DRS_FOGEND = 37, /* Fog end */ + D3DRS_FOGDENSITY = 38, /* Fog density */ + D3DRS_EDGEANTIALIAS = 40, /* TRUE to enable edge antialiasing */ + D3DRS_ZBIAS = 47, /* LONG Z bias */ + D3DRS_RANGEFOGENABLE = 48, /* Enables range-based fog */ + D3DRS_STENCILENABLE = 52, /* BOOL enable/disable stenciling */ + D3DRS_STENCILFAIL = 53, /* D3DSTENCILOP to do if stencil test fails */ + D3DRS_STENCILZFAIL = 54, /* D3DSTENCILOP to do if stencil test passes and Z test fails */ + D3DRS_STENCILPASS = 55, /* D3DSTENCILOP to do if both stencil and Z tests pass */ + D3DRS_STENCILFUNC = 56, /* D3DCMPFUNC fn. Stencil Test passes if ((ref & mask) stencilfn (stencil & mask)) is true */ + D3DRS_STENCILREF = 57, /* Reference value used in stencil test */ + D3DRS_STENCILMASK = 58, /* Mask value used in stencil test */ + D3DRS_STENCILWRITEMASK = 59, /* Write mask applied to values written to stencil buffer */ + D3DRS_TEXTUREFACTOR = 60, /* D3DCOLOR used for multi-texture blend */ + D3DRS_WRAP0 = 128, /* wrap for 1st texture coord. set */ + D3DRS_WRAP1 = 129, /* wrap for 2nd texture coord. set */ + D3DRS_WRAP2 = 130, /* wrap for 3rd texture coord. set */ + D3DRS_WRAP3 = 131, /* wrap for 4th texture coord. set */ + D3DRS_WRAP4 = 132, /* wrap for 5th texture coord. set */ + D3DRS_WRAP5 = 133, /* wrap for 6th texture coord. set */ + D3DRS_WRAP6 = 134, /* wrap for 7th texture coord. set */ + D3DRS_WRAP7 = 135, /* wrap for 8th texture coord. set */ + D3DRS_CLIPPING = 136, + D3DRS_LIGHTING = 137, + D3DRS_AMBIENT = 139, + D3DRS_FOGVERTEXMODE = 140, + D3DRS_COLORVERTEX = 141, + D3DRS_LOCALVIEWER = 142, + D3DRS_NORMALIZENORMALS = 143, + D3DRS_DIFFUSEMATERIALSOURCE = 145, + D3DRS_SPECULARMATERIALSOURCE = 146, + D3DRS_AMBIENTMATERIALSOURCE = 147, + D3DRS_EMISSIVEMATERIALSOURCE = 148, + D3DRS_VERTEXBLEND = 151, + D3DRS_CLIPPLANEENABLE = 152, + D3DRS_SOFTWAREVERTEXPROCESSING = 153, + D3DRS_POINTSIZE = 154, /* float point size */ + D3DRS_POINTSIZE_MIN = 155, /* float point size min threshold */ + D3DRS_POINTSPRITEENABLE = 156, /* BOOL point texture coord control */ + D3DRS_POINTSCALEENABLE = 157, /* BOOL point size scale enable */ + D3DRS_POINTSCALE_A = 158, /* float point attenuation A value */ + D3DRS_POINTSCALE_B = 159, /* float point attenuation B value */ + D3DRS_POINTSCALE_C = 160, /* float point attenuation C value */ + D3DRS_MULTISAMPLEANTIALIAS = 161, /* BOOL - set to do FSAA with multisample buffer */ + D3DRS_MULTISAMPLEMASK = 162, /* DWORD - per-sample enable/disable */ + D3DRS_PATCHEDGESTYLE = 163, /* Sets whether patch edges will use float style tessellation */ + D3DRS_PATCHSEGMENTS = 164, /* Number of segments per edge when drawing patches */ + D3DRS_DEBUGMONITORTOKEN = 165, /* DEBUG ONLY - token to debug monitor */ + D3DRS_POINTSIZE_MAX = 166, /* float point size max threshold */ + D3DRS_INDEXEDVERTEXBLENDENABLE = 167, + D3DRS_COLORWRITEENABLE = 168, /* per-channel write enable */ + D3DRS_TWEENFACTOR = 170, /* float tween factor */ + D3DRS_BLENDOP = 171, /* D3DBLENDOP setting */ + D3DRS_POSITIONORDER = 172, /* NPatch position interpolation order. D3DORDER_LINEAR or D3DORDER_CUBIC (default) */ + D3DRS_NORMALORDER = 173, /* NPatch normal interpolation order. D3DORDER_LINEAR (default) or D3DORDER_QUADRATIC */ + + D3DRS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DRENDERSTATETYPE; + +/* Values for material source */ +typedef enum _D3DMATERIALCOLORSOURCE +{ + D3DMCS_MATERIAL = 0, /* Color from material is used */ + D3DMCS_COLOR1 = 1, /* Diffuse vertex color is used */ + D3DMCS_COLOR2 = 2, /* Specular vertex color is used */ + D3DMCS_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DMATERIALCOLORSOURCE; + +/* Bias to apply to the texture coordinate set to apply a wrap to. */ +#define D3DRENDERSTATE_WRAPBIAS 128UL + +/* Flags to construct the WRAP render states */ +#define D3DWRAP_U 0x00000001L +#define D3DWRAP_V 0x00000002L +#define D3DWRAP_W 0x00000004L + +/* Flags to construct the WRAP render states for 1D thru 4D texture coordinates */ +#define D3DWRAPCOORD_0 0x00000001L /* same as D3DWRAP_U */ +#define D3DWRAPCOORD_1 0x00000002L /* same as D3DWRAP_V */ +#define D3DWRAPCOORD_2 0x00000004L /* same as D3DWRAP_W */ +#define D3DWRAPCOORD_3 0x00000008L + +/* Flags to construct D3DRS_COLORWRITEENABLE */ +#define D3DCOLORWRITEENABLE_RED (1L<<0) +#define D3DCOLORWRITEENABLE_GREEN (1L<<1) +#define D3DCOLORWRITEENABLE_BLUE (1L<<2) +#define D3DCOLORWRITEENABLE_ALPHA (1L<<3) + +/* + * State enumerants for per-stage texture processing. + */ +typedef enum _D3DTEXTURESTAGESTATETYPE +{ + D3DTSS_COLOROP = 1, /* D3DTEXTUREOP - per-stage blending controls for color channels */ + D3DTSS_COLORARG1 = 2, /* D3DTA_* (texture arg) */ + D3DTSS_COLORARG2 = 3, /* D3DTA_* (texture arg) */ + D3DTSS_ALPHAOP = 4, /* D3DTEXTUREOP - per-stage blending controls for alpha channel */ + D3DTSS_ALPHAARG1 = 5, /* D3DTA_* (texture arg) */ + D3DTSS_ALPHAARG2 = 6, /* D3DTA_* (texture arg) */ + D3DTSS_BUMPENVMAT00 = 7, /* float (bump mapping matrix) */ + D3DTSS_BUMPENVMAT01 = 8, /* float (bump mapping matrix) */ + D3DTSS_BUMPENVMAT10 = 9, /* float (bump mapping matrix) */ + D3DTSS_BUMPENVMAT11 = 10, /* float (bump mapping matrix) */ + D3DTSS_TEXCOORDINDEX = 11, /* identifies which set of texture coordinates index this texture */ + D3DTSS_ADDRESSU = 13, /* D3DTEXTUREADDRESS for U coordinate */ + D3DTSS_ADDRESSV = 14, /* D3DTEXTUREADDRESS for V coordinate */ + D3DTSS_BORDERCOLOR = 15, /* D3DCOLOR */ + D3DTSS_MAGFILTER = 16, /* D3DTEXTUREFILTER filter to use for magnification */ + D3DTSS_MINFILTER = 17, /* D3DTEXTUREFILTER filter to use for minification */ + D3DTSS_MIPFILTER = 18, /* D3DTEXTUREFILTER filter to use between mipmaps during minification */ + D3DTSS_MIPMAPLODBIAS = 19, /* float Mipmap LOD bias */ + D3DTSS_MAXMIPLEVEL = 20, /* DWORD 0..(n-1) LOD index of largest map to use (0 == largest) */ + D3DTSS_MAXANISOTROPY = 21, /* DWORD maximum anisotropy */ + D3DTSS_BUMPENVLSCALE = 22, /* float scale for bump map luminance */ + D3DTSS_BUMPENVLOFFSET = 23, /* float offset for bump map luminance */ + D3DTSS_TEXTURETRANSFORMFLAGS = 24, /* D3DTEXTURETRANSFORMFLAGS controls texture transform */ + D3DTSS_ADDRESSW = 25, /* D3DTEXTUREADDRESS for W coordinate */ + D3DTSS_COLORARG0 = 26, /* D3DTA_* third arg for triadic ops */ + D3DTSS_ALPHAARG0 = 27, /* D3DTA_* third arg for triadic ops */ + D3DTSS_RESULTARG = 28, /* D3DTA_* arg for result (CURRENT or TEMP) */ + D3DTSS_FORCE_DWORD = 0x7fffffff, /* force 32-bit size enum */ +} D3DTEXTURESTAGESTATETYPE; + +/* Values, used with D3DTSS_TEXCOORDINDEX, to specify that the vertex data(position + * and normal in the camera space) should be taken as texture coordinates + * Low 16 bits are used to specify texture coordinate index, to take the WRAP mode from + */ +#define D3DTSS_TCI_PASSTHRU 0x00000000 +#define D3DTSS_TCI_CAMERASPACENORMAL 0x00010000 +#define D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000 +#define D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000 + +/* + * Enumerations for COLOROP and ALPHAOP texture blending operations set in + * texture processing stage controls in D3DTSS. + */ +typedef enum _D3DTEXTUREOP +{ + /* Control */ + D3DTOP_DISABLE = 1, /* disables stage */ + D3DTOP_SELECTARG1 = 2, /* the default */ + D3DTOP_SELECTARG2 = 3, + + /* Modulate */ + D3DTOP_MODULATE = 4, /* multiply args together */ + D3DTOP_MODULATE2X = 5, /* multiply and 1 bit */ + D3DTOP_MODULATE4X = 6, /* multiply and 2 bits */ + + /* Add */ + D3DTOP_ADD = 7, /* add arguments together */ + D3DTOP_ADDSIGNED = 8, /* add with -0.5 bias */ + D3DTOP_ADDSIGNED2X = 9, /* as above but left 1 bit */ + D3DTOP_SUBTRACT = 10, /* Arg1 - Arg2, with no saturation */ + D3DTOP_ADDSMOOTH = 11, /* add 2 args, subtract product */ + /* Arg1 + Arg2 - Arg1*Arg2 */ + /* = Arg1 + (1-Arg1)*Arg2 */ + + /* Linear alpha blend: Arg1*(Alpha) + Arg2*(1-Alpha) */ + D3DTOP_BLENDDIFFUSEALPHA = 12, /* iterated alpha */ + D3DTOP_BLENDTEXTUREALPHA = 13, /* texture alpha */ + D3DTOP_BLENDFACTORALPHA = 14, /* alpha from D3DRS_TEXTUREFACTOR */ + + /* Linear alpha blend with pre-multiplied arg1 input: Arg1 + Arg2*(1-Alpha) */ + D3DTOP_BLENDTEXTUREALPHAPM = 15, /* texture alpha */ + D3DTOP_BLENDCURRENTALPHA = 16, /* by alpha of current color */ + + /* Specular mapping */ + D3DTOP_PREMODULATE = 17, /* modulate with next texture before use */ + D3DTOP_MODULATEALPHA_ADDCOLOR = 18, /* Arg1.RGB + Arg1.A*Arg2.RGB */ + /* COLOROP only */ + D3DTOP_MODULATECOLOR_ADDALPHA = 19, /* Arg1.RGB*Arg2.RGB + Arg1.A */ + /* COLOROP only */ + D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20, /* (1-Arg1.A)*Arg2.RGB + Arg1.RGB */ + /* COLOROP only */ + D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21, /* (1-Arg1.RGB)*Arg2.RGB + Arg1.A */ + /* COLOROP only */ + + /* Bump mapping */ + D3DTOP_BUMPENVMAP = 22, /* per pixel env map perturbation */ + D3DTOP_BUMPENVMAPLUMINANCE = 23, /* with luminance channel */ + + /* This can do either diffuse or specular bump mapping with correct input. + * Performs the function (Arg1.R*Arg2.R + Arg1.G*Arg2.G + Arg1.B*Arg2.B) + * where each component has been scaled and offset to make it signed. + * The result is replicated into all four (including alpha) channels. + * This is a valid COLOROP only. + */ + D3DTOP_DOTPRODUCT3 = 24, + + /* Triadic ops */ + D3DTOP_MULTIPLYADD = 25, /* Arg0 + Arg1*Arg2 */ + D3DTOP_LERP = 26, /* (Arg0)*Arg1 + (1-Arg0)*Arg2 */ + + D3DTOP_FORCE_DWORD = 0x7fffffff +} D3DTEXTUREOP; + +/* + * Values for COLORARG0,1,2, ALPHAARG0,1,2, and RESULTARG texture blending + * operations set in texture processing stage controls in D3DRENDERSTATE. + */ +#define D3DTA_SELECTMASK 0x0000000f /* mask for arg selector */ +#define D3DTA_DIFFUSE 0x00000000 /* select diffuse color (read only) */ +#define D3DTA_CURRENT 0x00000001 /* select stage destination register (read/write) */ +#define D3DTA_TEXTURE 0x00000002 /* select texture color (read only) */ +#define D3DTA_TFACTOR 0x00000003 /* select D3DRS_TEXTUREFACTOR (read only) */ +#define D3DTA_SPECULAR 0x00000004 /* select specular color (read only) */ +#define D3DTA_TEMP 0x00000005 /* select temporary register color (read/write) */ +#define D3DTA_COMPLEMENT 0x00000010 /* take 1.0 - x (read modifier) */ +#define D3DTA_ALPHAREPLICATE 0x00000020 /* replicate alpha to color components (read modifier) */ + +/* Values for D3DTSS_***FILTER texture stage states */ +typedef enum _D3DTEXTUREFILTERTYPE +{ + D3DTEXF_NONE = 0, /* filtering disabled (valid for mip filter only) */ + D3DTEXF_POINT = 1, /* nearest */ + D3DTEXF_LINEAR = 2, /* linear interpolation */ + D3DTEXF_ANISOTROPIC = 3, /* anisotropic */ + D3DTEXF_FLATCUBIC = 4, /* cubic */ + D3DTEXF_GAUSSIANCUBIC = 5, /* different cubic kernel */ + D3DTEXF_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DTEXTUREFILTERTYPE; + +/* Bits for Flags in ProcessVertices call */ + +#define D3DPV_DONOTCOPYDATA (1 << 0) + +/*------------------------------------------------------------------- */ + +/* Flexible vertex format bits */ +#define D3DFVF_RESERVED0 0x001 +#define D3DFVF_POSITION_MASK 0x00E +#define D3DFVF_XYZ 0x002 +#define D3DFVF_XYZRHW 0x004 +#define D3DFVF_XYZB1 0x006 +#define D3DFVF_XYZB2 0x008 +#define D3DFVF_XYZB3 0x00a +#define D3DFVF_XYZB4 0x00c +#define D3DFVF_XYZB5 0x00e + +#define D3DFVF_NORMAL 0x010 +#define D3DFVF_PSIZE 0x020 +#define D3DFVF_DIFFUSE 0x040 +#define D3DFVF_SPECULAR 0x080 + +#define D3DFVF_TEXCOUNT_MASK 0xf00 +#define D3DFVF_TEXCOUNT_SHIFT 8 +#define D3DFVF_TEX0 0x000 +#define D3DFVF_TEX1 0x100 +#define D3DFVF_TEX2 0x200 +#define D3DFVF_TEX3 0x300 +#define D3DFVF_TEX4 0x400 +#define D3DFVF_TEX5 0x500 +#define D3DFVF_TEX6 0x600 +#define D3DFVF_TEX7 0x700 +#define D3DFVF_TEX8 0x800 + +#define D3DFVF_LASTBETA_UBYTE4 0x1000 + +#define D3DFVF_RESERVED2 0xE000 /* 4 reserved bits */ + +/*--------------------------------------------------------------------- + * Vertex Shaders + */ + +/* + +Vertex Shader Declaration + +The declaration portion of a vertex shader defines the static external +interface of the shader. The information in the declaration includes: + +- Assignments of vertex shader input registers to data streams. These +assignments bind a specific vertex register to a single component within a +vertex stream. A vertex stream element is identified by a byte offset +within the stream and a type. The type specifies the arithmetic data type +plus the dimensionality (1, 2, 3, or 4 values). Stream data which is +less than 4 values are always expanded out to 4 values with zero or more +0.F values and one 1.F value. + +- Assignment of vertex shader input registers to implicit data from the +primitive tessellator. This controls the loading of vertex data which is +not loaded from a stream, but rather is generated during primitive +tessellation prior to the vertex shader. + +- Loading data into the constant memory at the time a shader is set as the +current shader. Each token specifies values for one or more contiguous 4 +DWORD constant registers. This allows the shader to update an arbitrary +subset of the constant memory, overwriting the device state (which +contains the current values of the constant memory). Note that these +values can be subsequently overwritten (between DrawPrimitive calls) +during the time a shader is bound to a device via the +SetVertexShaderConstant method. + +Declaration arrays are single-dimensional arrays of DWORDs composed of +multiple tokens each of which is one or more DWORDs. The single-DWORD +token value 0xFFFFFFFF is a special token used to indicate the end of the +declaration array. The single DWORD token value 0x00000000 is a NOP token +with is ignored during the declaration parsing. Note that 0x00000000 is a +valid value for DWORDs following the first DWORD for multiple word tokens. + +[31:29] TokenType + 0x0 - NOP (requires all DWORD bits to be zero) + 0x1 - stream selector + 0x2 - stream data definition (map to vertex input memory) + 0x3 - vertex input memory from tessellator + 0x4 - constant memory from shader + 0x5 - extension + 0x6 - reserved + 0x7 - end-of-array (requires all DWORD bits to be 1) + +NOP Token (single DWORD token) + [31:29] 0x0 + [28:00] 0x0 + +Stream Selector (single DWORD token) + [31:29] 0x1 + [28] indicates whether this is a tessellator stream + [27:04] 0x0 + [03:00] stream selector (0..15) + +Stream Data Definition (single DWORD token) + Vertex Input Register Load + [31:29] 0x2 + [28] 0x0 + [27:20] 0x0 + [19:16] type (dimensionality and data type) + [15:04] 0x0 + [03:00] vertex register address (0..15) + Data Skip (no register load) + [31:29] 0x2 + [28] 0x1 + [27:20] 0x0 + [19:16] count of DWORDS to skip over (0..15) + [15:00] 0x0 + Vertex Input Memory from Tessellator Data (single DWORD token) + [31:29] 0x3 + [28] indicates whether data is normals or u/v + [27:24] 0x0 + [23:20] vertex register address (0..15) + [19:16] type (dimensionality) + [15:04] 0x0 + [03:00] vertex register address (0..15) + +Constant Memory from Shader (multiple DWORD token) + [31:29] 0x4 + [28:25] count of 4*DWORD constants to load (0..15) + [24:07] 0x0 + [06:00] constant memory address (0..95) + +Extension Token (single or multiple DWORD token) + [31:29] 0x5 + [28:24] count of additional DWORDs in token (0..31) + [23:00] extension-specific information + +End-of-array token (single DWORD token) + [31:29] 0x7 + [28:00] 0x1fffffff + +The stream selector token must be immediately followed by a contiguous set of stream data definition tokens. This token sequence fully defines that stream, including the set of elements within the stream, the order in which the elements appear, the type of each element, and the vertex register into which to load an element. +Streams are allowed to include data which is not loaded into a vertex register, thus allowing data which is not used for this shader to exist in the vertex stream. This skipped data is defined only by a count of DWORDs to skip over, since the type information is irrelevant. +The token sequence: +Stream Select: stream=0 +Stream Data Definition (Load): type=FLOAT3; register=3 +Stream Data Definition (Load): type=FLOAT3; register=4 +Stream Data Definition (Skip): count=2 +Stream Data Definition (Load): type=FLOAT2; register=7 + +defines stream zero to consist of 4 elements, 3 of which are loaded into registers and the fourth skipped over. Register 3 is loaded with the first three DWORDs in each vertex interpreted as FLOAT data. Register 4 is loaded with the 4th, 5th, and 6th DWORDs interpreted as FLOAT data. The next two DWORDs (7th and 8th) are skipped over and not loaded into any vertex input register. Register 7 is loaded with the 9th and 10th DWORDS interpreted as FLOAT data. +Placing of tokens other than NOPs between the Stream Selector and Stream Data Definition tokens is disallowed. + +*/ + +typedef enum _D3DVSD_TOKENTYPE +{ + D3DVSD_TOKEN_NOP = 0, /* NOP or extension */ + D3DVSD_TOKEN_STREAM, /* stream selector */ + D3DVSD_TOKEN_STREAMDATA, /* stream data definition (map to vertex input memory) */ + D3DVSD_TOKEN_TESSELLATOR, /* vertex input memory from tessellator */ + D3DVSD_TOKEN_CONSTMEM, /* constant memory from shader */ + D3DVSD_TOKEN_EXT, /* extension */ + D3DVSD_TOKEN_END = 7, /* end-of-array (requires all DWORD bits to be 1) */ + D3DVSD_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DVSD_TOKENTYPE; + +#define D3DVSD_TOKENTYPESHIFT 29 +#define D3DVSD_TOKENTYPEMASK (7 << D3DVSD_TOKENTYPESHIFT) + +#define D3DVSD_STREAMNUMBERSHIFT 0 +#define D3DVSD_STREAMNUMBERMASK (0xF << D3DVSD_STREAMNUMBERSHIFT) + +#define D3DVSD_DATALOADTYPESHIFT 28 +#define D3DVSD_DATALOADTYPEMASK (0x1 << D3DVSD_DATALOADTYPESHIFT) + +#define D3DVSD_DATATYPESHIFT 16 +#define D3DVSD_DATATYPEMASK (0xF << D3DVSD_DATATYPESHIFT) + +#define D3DVSD_SKIPCOUNTSHIFT 16 +#define D3DVSD_SKIPCOUNTMASK (0xF << D3DVSD_SKIPCOUNTSHIFT) + +#define D3DVSD_VERTEXREGSHIFT 0 +#define D3DVSD_VERTEXREGMASK (0x1F << D3DVSD_VERTEXREGSHIFT) + +#define D3DVSD_VERTEXREGINSHIFT 20 +#define D3DVSD_VERTEXREGINMASK (0xF << D3DVSD_VERTEXREGINSHIFT) + +#define D3DVSD_CONSTCOUNTSHIFT 25 +#define D3DVSD_CONSTCOUNTMASK (0xF << D3DVSD_CONSTCOUNTSHIFT) + +#define D3DVSD_CONSTADDRESSSHIFT 0 +#define D3DVSD_CONSTADDRESSMASK (0x7F << D3DVSD_CONSTADDRESSSHIFT) + +#define D3DVSD_CONSTRSSHIFT 16 +#define D3DVSD_CONSTRSMASK (0x1FFF << D3DVSD_CONSTRSSHIFT) + +#define D3DVSD_EXTCOUNTSHIFT 24 +#define D3DVSD_EXTCOUNTMASK (0x1F << D3DVSD_EXTCOUNTSHIFT) + +#define D3DVSD_EXTINFOSHIFT 0 +#define D3DVSD_EXTINFOMASK (0xFFFFFF << D3DVSD_EXTINFOSHIFT) + +#define D3DVSD_MAKETOKENTYPE(tokenType) ((tokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK) + +/* macros for generation of CreateVertexShader Declaration token array */ + +/* Set current stream + * _StreamNumber [0..(MaxStreams-1)] stream to get data from + */ +#define D3DVSD_STREAM( _StreamNumber ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAM) | (_StreamNumber)) + +/* Set tessellator stream + */ +#define D3DVSD_STREAMTESSSHIFT 28 +#define D3DVSD_STREAMTESSMASK (1 << D3DVSD_STREAMTESSSHIFT) +#define D3DVSD_STREAM_TESS( ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAM) | (D3DVSD_STREAMTESSMASK)) + +/* bind single vertex register to vertex element from vertex stream + * + * _VertexRegister [0..15] address of the vertex register + * _Type [D3DVSDT_*] dimensionality and arithmetic data type + */ + +#define D3DVSD_REG( _VertexRegister, _Type ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAMDATA) | \ + ((_Type) << D3DVSD_DATATYPESHIFT) | (_VertexRegister)) + +/* Skip _DWORDCount DWORDs in vertex + */ +#define D3DVSD_SKIP( _DWORDCount ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_STREAMDATA) | 0x10000000 | \ + ((_DWORDCount) << D3DVSD_SKIPCOUNTSHIFT)) + +/* load data into vertex shader constant memory + * + * _ConstantAddress [0..95] - address of constant array to begin filling data + * _Count [0..15] - number of constant vectors to load (4 DWORDs each) + * followed by 4*_Count DWORDS of data + */ +#define D3DVSD_CONST( _ConstantAddress, _Count ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_CONSTMEM) | \ + ((_Count) << D3DVSD_CONSTCOUNTSHIFT) | (_ConstantAddress)) + +/* enable tessellator generated normals + * + * _VertexRegisterIn [0..15] address of vertex register whose input stream + * will be used in normal computation + * _VertexRegisterOut [0..15] address of vertex register to output the normal to + */ +#define D3DVSD_TESSNORMAL( _VertexRegisterIn, _VertexRegisterOut ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) | \ + ((_VertexRegisterIn) << D3DVSD_VERTEXREGINSHIFT) | \ + ((0x02) << D3DVSD_DATATYPESHIFT) | (_VertexRegisterOut)) + +/* enable tessellator generated surface parameters + * + * _VertexRegister [0..15] address of vertex register to output parameters + */ +#define D3DVSD_TESSUV( _VertexRegister ) \ + (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_TESSELLATOR) | 0x10000000 | \ + ((0x01) << D3DVSD_DATATYPESHIFT) | (_VertexRegister)) + +/* Generates END token + */ +#define D3DVSD_END() 0xFFFFFFFF + +/* Generates NOP token */ +#define D3DVSD_NOP() 0x00000000 + +/* bit declarations for _Type fields */ +#define D3DVSDT_FLOAT1 0x00 /* 1D float expanded to (value, 0., 0., 1.) */ +#define D3DVSDT_FLOAT2 0x01 /* 2D float expanded to (value, value, 0., 1.) */ +#define D3DVSDT_FLOAT3 0x02 /* 3D float expanded to (value, value, value, 1.) */ +#define D3DVSDT_FLOAT4 0x03 /* 4D float */ +#define D3DVSDT_D3DCOLOR 0x04 /* 4D packed unsigned bytes mapped to 0. to 1. range + * Input is in D3DCOLOR format (ARGB) expanded to (R, G, B, A) */ +#define D3DVSDT_UBYTE4 0x05 /* 4D unsigned byte */ +#define D3DVSDT_SHORT2 0x06 /* 2D signed short expanded to (value, value, 0., 1.) */ +#define D3DVSDT_SHORT4 0x07 /* 4D signed short */ + +/* assignments of vertex input registers for fixed function vertex shader */ +#define D3DVSDE_POSITION 0 +#define D3DVSDE_BLENDWEIGHT 1 +#define D3DVSDE_BLENDINDICES 2 +#define D3DVSDE_NORMAL 3 +#define D3DVSDE_PSIZE 4 +#define D3DVSDE_DIFFUSE 5 +#define D3DVSDE_SPECULAR 6 +#define D3DVSDE_TEXCOORD0 7 +#define D3DVSDE_TEXCOORD1 8 +#define D3DVSDE_TEXCOORD2 9 +#define D3DVSDE_TEXCOORD3 10 +#define D3DVSDE_TEXCOORD4 11 +#define D3DVSDE_TEXCOORD5 12 +#define D3DVSDE_TEXCOORD6 13 +#define D3DVSDE_TEXCOORD7 14 +#define D3DVSDE_POSITION2 15 +#define D3DVSDE_NORMAL2 16 + +/* Maximum supported number of texture coordinate sets */ +#define D3DDP_MAXTEXCOORD 8 + +/* Instruction Token Bit Definitions */ +#define D3DSI_OPCODE_MASK 0x0000FFFF + +typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE +{ + D3DSIO_NOP = 0, /* PS/VS */ + D3DSIO_MOV , /* PS/VS */ + D3DSIO_ADD , /* PS/VS */ + D3DSIO_SUB , /* PS */ + D3DSIO_MAD , /* PS/VS */ + D3DSIO_MUL , /* PS/VS */ + D3DSIO_RCP , /* VS */ + D3DSIO_RSQ , /* VS */ + D3DSIO_DP3 , /* PS/VS */ + D3DSIO_DP4 , /* PS/VS */ + D3DSIO_MIN , /* VS */ + D3DSIO_MAX , /* VS */ + D3DSIO_SLT , /* VS */ + D3DSIO_SGE , /* VS */ + D3DSIO_EXP , /* VS */ + D3DSIO_LOG , /* VS */ + D3DSIO_LIT , /* VS */ + D3DSIO_DST , /* VS */ + D3DSIO_LRP , /* PS */ + D3DSIO_FRC , /* VS */ + D3DSIO_M4x4 , /* VS */ + D3DSIO_M4x3 , /* VS */ + D3DSIO_M3x4 , /* VS */ + D3DSIO_M3x3 , /* VS */ + D3DSIO_M3x2 , /* VS */ + + D3DSIO_TEXCOORD = 64, /* PS */ + D3DSIO_TEXKILL , /* PS */ + D3DSIO_TEX , /* PS */ + D3DSIO_TEXBEM , /* PS */ + D3DSIO_TEXBEML , /* PS */ + D3DSIO_TEXREG2AR , /* PS */ + D3DSIO_TEXREG2GB , /* PS */ + D3DSIO_TEXM3x2PAD , /* PS */ + D3DSIO_TEXM3x2TEX , /* PS */ + D3DSIO_TEXM3x3PAD , /* PS */ + D3DSIO_TEXM3x3TEX , /* PS */ + D3DSIO_TEXM3x3DIFF , /* PS */ + D3DSIO_TEXM3x3SPEC , /* PS */ + D3DSIO_TEXM3x3VSPEC , /* PS */ + D3DSIO_EXPP , /* VS */ + D3DSIO_LOGP , /* VS */ + D3DSIO_CND , /* PS */ + D3DSIO_DEF , /* PS */ + D3DSIO_TEXREG2RGB , /* PS */ + D3DSIO_TEXDP3TEX , /* PS */ + D3DSIO_TEXM3x2DEPTH , /* PS */ + D3DSIO_TEXDP3 , /* PS */ + D3DSIO_TEXM3x3 , /* PS */ + D3DSIO_TEXDEPTH , /* PS */ + D3DSIO_CMP , /* PS */ + D3DSIO_BEM , /* PS */ + + D3DSIO_PHASE = 0xFFFD, + D3DSIO_COMMENT = 0xFFFE, + D3DSIO_END = 0xFFFF, + + D3DSIO_FORCE_DWORD = 0x7fffffff /* force 32-bit size enum */ +} D3DSHADER_INSTRUCTION_OPCODE_TYPE; + +/* Co-Issue Instruction Modifier - if set then this instruction is to be + * issued in parallel with the previous instruction(s) for which this bit + * is not set. */ +#define D3DSI_COISSUE 0x40000000 + +/* Parameter Token Bit Definitions */ +#define D3DSP_REGNUM_MASK 0x00001FFF + +/* destination parameter write mask */ +#define D3DSP_WRITEMASK_0 0x00010000 /* Component 0 (X;Red) */ +#define D3DSP_WRITEMASK_1 0x00020000 /* Component 1 (Y;Green) */ +#define D3DSP_WRITEMASK_2 0x00040000 /* Component 2 (Z;Blue) */ +#define D3DSP_WRITEMASK_3 0x00080000 /* Component 3 (W;Alpha) */ +#define D3DSP_WRITEMASK_ALL 0x000F0000 /* All Components */ + +/* destination parameter modifiers */ +#define D3DSP_DSTMOD_SHIFT 20 +#define D3DSP_DSTMOD_MASK 0x00F00000 + +typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE +{ + D3DSPDM_NONE = 0<>8)&0xFF) +#define D3DSHADER_VERSION_MINOR(_Version) (((_Version)>>0)&0xFF) + +/* destination/source parameter register type */ +#define D3DSI_COMMENTSIZE_SHIFT 16 +#define D3DSI_COMMENTSIZE_MASK 0x7FFF0000 +#define D3DSHADER_COMMENT(_DWordSize) \ + ((((_DWordSize)<= 1200 +#pragma warning(pop) +#else +#pragma warning(default:4201) +#endif + +#endif /* (DIRECT3D_VERSION >= 0x0800) */ +#endif /* _D3D8TYPES(P)_H_ */ diff --git a/gfx/include/d3d8/d3dx8math.inl b/gfx/include/d3d8/d3dx8math.inl index ca94a797ba..cb8fe711ec 100644 --- a/gfx/include/d3d8/d3dx8math.inl +++ b/gfx/include/d3d8/d3dx8math.inl @@ -1,1736 +1,1690 @@ -/* - * - * Copyright (C) 1998 Microsoft Corporation. All Rights Reserved. - * - * File: d3dx8math.inl - * Content: D3DX math inline functions - * - */ - -#ifndef __D3DX8MATH_INL__ -#define __D3DX8MATH_INL__ - -/* - * - * Inline Class Methods - * - */ - -#ifdef __cplusplus - -/* - * 2D Vector - */ - -D3DXINLINE -D3DXVECTOR2::D3DXVECTOR2( CONST FLOAT *pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - x = pf[0]; - y = pf[1]; -} - -D3DXINLINE -D3DXVECTOR2::D3DXVECTOR2( FLOAT fx, FLOAT fy ) -{ - x = fx; - y = fy; -} - -/* casting */ -D3DXINLINE -D3DXVECTOR2::operator FLOAT* () -{ - return (FLOAT *) &x; -} - -D3DXINLINE -D3DXVECTOR2::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &x; -} - -/* assignment operators */ -D3DXINLINE D3DXVECTOR2& -D3DXVECTOR2::operator += ( CONST D3DXVECTOR2& v ) -{ - x += v.x; - y += v.y; - return *this; -} - -D3DXINLINE D3DXVECTOR2& -D3DXVECTOR2::operator -= ( CONST D3DXVECTOR2& v ) -{ - x -= v.x; - y -= v.y; - return *this; -} - -D3DXINLINE D3DXVECTOR2& -D3DXVECTOR2::operator *= ( FLOAT f ) -{ - x *= f; - y *= f; - return *this; -} - -D3DXINLINE D3DXVECTOR2& -D3DXVECTOR2::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - x *= fInv; - y *= fInv; - return *this; -} - -/* unary operators */ -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator - () const -{ - return D3DXVECTOR2(-x, -y); -} - -/* binary operators */ -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator + ( CONST D3DXVECTOR2& v ) const -{ - return D3DXVECTOR2(x + v.x, y + v.y); -} - -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator - ( CONST D3DXVECTOR2& v ) const -{ - return D3DXVECTOR2(x - v.x, y - v.y); -} - -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator * ( FLOAT f ) const -{ - return D3DXVECTOR2(x * f, y * f); -} - -D3DXINLINE D3DXVECTOR2 -D3DXVECTOR2::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXVECTOR2(x * fInv, y * fInv); -} - - -D3DXINLINE D3DXVECTOR2 -operator * ( FLOAT f, CONST D3DXVECTOR2& v ) -{ - return D3DXVECTOR2(f * v.x, f * v.y); -} - -D3DXINLINE BOOL -D3DXVECTOR2::operator == ( CONST D3DXVECTOR2& v ) const -{ - return x == v.x && y == v.y; -} - -D3DXINLINE BOOL -D3DXVECTOR2::operator != ( CONST D3DXVECTOR2& v ) const -{ - return x != v.x || y != v.y; -} - - - - -/* - * 3D Vector - */ -D3DXINLINE -D3DXVECTOR3::D3DXVECTOR3( CONST FLOAT *pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - x = pf[0]; - y = pf[1]; - z = pf[2]; -} - -D3DXINLINE -D3DXVECTOR3::D3DXVECTOR3( CONST D3DVECTOR& v ) -{ - x = v.x; - y = v.y; - z = v.z; -} - -D3DXINLINE -D3DXVECTOR3::D3DXVECTOR3( FLOAT fx, FLOAT fy, FLOAT fz ) -{ - x = fx; - y = fy; - z = fz; -} - - -/* casting */ -D3DXINLINE -D3DXVECTOR3::operator FLOAT* () -{ - return (FLOAT *) &x; -} - -D3DXINLINE -D3DXVECTOR3::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &x; -} - - -/* assignment operators */ -D3DXINLINE D3DXVECTOR3& -D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& v ) -{ - x += v.x; - y += v.y; - z += v.z; - return *this; -} - -D3DXINLINE D3DXVECTOR3& -D3DXVECTOR3::operator -= ( CONST D3DXVECTOR3& v ) -{ - x -= v.x; - y -= v.y; - z -= v.z; - return *this; -} - -D3DXINLINE D3DXVECTOR3& -D3DXVECTOR3::operator *= ( FLOAT f ) -{ - x *= f; - y *= f; - z *= f; - return *this; -} - -D3DXINLINE D3DXVECTOR3& -D3DXVECTOR3::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - x *= fInv; - y *= fInv; - z *= fInv; - return *this; -} - -/* unary operators */ -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator - () const -{ - return D3DXVECTOR3(-x, -y, -z); -} - -/* binary operators */ -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator + ( CONST D3DXVECTOR3& v ) const -{ - return D3DXVECTOR3(x + v.x, y + v.y, z + v.z); -} - -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator - ( CONST D3DXVECTOR3& v ) const -{ - return D3DXVECTOR3(x - v.x, y - v.y, z - v.z); -} - -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator * ( FLOAT f ) const -{ - return D3DXVECTOR3(x * f, y * f, z * f); -} - -D3DXINLINE D3DXVECTOR3 -D3DXVECTOR3::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXVECTOR3(x * fInv, y * fInv, z * fInv); -} - - -D3DXINLINE D3DXVECTOR3 -operator * ( FLOAT f, CONST struct D3DXVECTOR3& v ) -{ - return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); -} - - -D3DXINLINE BOOL -D3DXVECTOR3::operator == ( CONST D3DXVECTOR3& v ) const -{ - return x == v.x && y == v.y && z == v.z; -} - -D3DXINLINE BOOL -D3DXVECTOR3::operator != ( CONST D3DXVECTOR3& v ) const -{ - return x != v.x || y != v.y || z != v.z; -} - -/* - * 4D Vector - */ -D3DXINLINE -D3DXVECTOR4::D3DXVECTOR4( CONST FLOAT *pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - x = pf[0]; - y = pf[1]; - z = pf[2]; - w = pf[3]; -} - -D3DXINLINE -D3DXVECTOR4::D3DXVECTOR4( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) -{ - x = fx; - y = fy; - z = fz; - w = fw; -} - -/* casting */ -D3DXINLINE -D3DXVECTOR4::operator FLOAT* () -{ - return (FLOAT *) &x; -} - -D3DXINLINE -D3DXVECTOR4::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &x; -} - - -/* assignment operators */ -D3DXINLINE D3DXVECTOR4& -D3DXVECTOR4::operator += ( CONST D3DXVECTOR4& v ) -{ - x += v.x; - y += v.y; - z += v.z; - w += v.w; - return *this; -} - -D3DXINLINE D3DXVECTOR4& -D3DXVECTOR4::operator -= ( CONST D3DXVECTOR4& v ) -{ - x -= v.x; - y -= v.y; - z -= v.z; - w -= v.w; - return *this; -} - -D3DXINLINE D3DXVECTOR4& -D3DXVECTOR4::operator *= ( FLOAT f ) -{ - x *= f; - y *= f; - z *= f; - w *= f; - return *this; -} - -D3DXINLINE D3DXVECTOR4& -D3DXVECTOR4::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - x *= fInv; - y *= fInv; - z *= fInv; - w *= fInv; - return *this; -} - -/* unary operators */ -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator - () const -{ - return D3DXVECTOR4(-x, -y, -z, -w); -} - - -/* binary operators */ -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator + ( CONST D3DXVECTOR4& v ) const -{ - return D3DXVECTOR4(x + v.x, y + v.y, z + v.z, w + v.w); -} - -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator - ( CONST D3DXVECTOR4& v ) const -{ - return D3DXVECTOR4(x - v.x, y - v.y, z - v.z, w - v.w); -} - -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator * ( FLOAT f ) const -{ - return D3DXVECTOR4(x * f, y * f, z * f, w * f); -} - -D3DXINLINE D3DXVECTOR4 -D3DXVECTOR4::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXVECTOR4(x * fInv, y * fInv, z * fInv, w * fInv); -} - - -D3DXINLINE D3DXVECTOR4 -operator * ( FLOAT f, CONST D3DXVECTOR4& v ) -{ - return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w); -} - - -D3DXINLINE BOOL -D3DXVECTOR4::operator == ( CONST D3DXVECTOR4& v ) const -{ - return x == v.x && y == v.y && z == v.z && w == v.w; -} - -D3DXINLINE BOOL -D3DXVECTOR4::operator != ( CONST D3DXVECTOR4& v ) const -{ - return x != v.x || y != v.y || z != v.z || w != v.w; -} - - -/* - * Matrix - */ -D3DXINLINE -D3DXMATRIX::D3DXMATRIX( CONST FLOAT* pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - memcpy(&_11, pf, sizeof(D3DXMATRIX)); -} - -D3DXINLINE -D3DXMATRIX::D3DXMATRIX( CONST D3DMATRIX& mat ) -{ - memcpy(&_11, &mat, sizeof(D3DXMATRIX)); -} - -D3DXINLINE -D3DXMATRIX::D3DXMATRIX( FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, - FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, - FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, - FLOAT f41, FLOAT f42, FLOAT f43, FLOAT f44 ) -{ - _11 = f11; _12 = f12; _13 = f13; _14 = f14; - _21 = f21; _22 = f22; _23 = f23; _24 = f24; - _31 = f31; _32 = f32; _33 = f33; _34 = f34; - _41 = f41; _42 = f42; _43 = f43; _44 = f44; -} - -/* access grants */ -D3DXINLINE FLOAT& -D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) -{ - return m[iRow][iCol]; -} - -D3DXINLINE FLOAT -D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) const -{ - return m[iRow][iCol]; -} - - -/* casting operators */ -D3DXINLINE -D3DXMATRIX::operator FLOAT* () -{ - return (FLOAT *) &_11; -} - -D3DXINLINE -D3DXMATRIX::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &_11; -} - - -/* assignment operators */ -D3DXINLINE D3DXMATRIX& -D3DXMATRIX::operator *= ( CONST D3DXMATRIX& mat ) -{ - D3DXMatrixMultiply(this, this, &mat); - return *this; -} - -D3DXINLINE D3DXMATRIX& -D3DXMATRIX::operator += ( CONST D3DXMATRIX& mat ) -{ - _11 += mat._11; _12 += mat._12; _13 += mat._13; _14 += mat._14; - _21 += mat._21; _22 += mat._22; _23 += mat._23; _24 += mat._24; - _31 += mat._31; _32 += mat._32; _33 += mat._33; _34 += mat._34; - _41 += mat._41; _42 += mat._42; _43 += mat._43; _44 += mat._44; - return *this; -} - -D3DXINLINE D3DXMATRIX& -D3DXMATRIX::operator -= ( CONST D3DXMATRIX& mat ) -{ - _11 -= mat._11; _12 -= mat._12; _13 -= mat._13; _14 -= mat._14; - _21 -= mat._21; _22 -= mat._22; _23 -= mat._23; _24 -= mat._24; - _31 -= mat._31; _32 -= mat._32; _33 -= mat._33; _34 -= mat._34; - _41 -= mat._41; _42 -= mat._42; _43 -= mat._43; _44 -= mat._44; - return *this; -} - -D3DXINLINE D3DXMATRIX& -D3DXMATRIX::operator *= ( FLOAT f ) -{ - _11 *= f; _12 *= f; _13 *= f; _14 *= f; - _21 *= f; _22 *= f; _23 *= f; _24 *= f; - _31 *= f; _32 *= f; _33 *= f; _34 *= f; - _41 *= f; _42 *= f; _43 *= f; _44 *= f; - return *this; -} - -D3DXINLINE D3DXMATRIX& -D3DXMATRIX::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - _11 *= fInv; _12 *= fInv; _13 *= fInv; _14 *= fInv; - _21 *= fInv; _22 *= fInv; _23 *= fInv; _24 *= fInv; - _31 *= fInv; _32 *= fInv; _33 *= fInv; _34 *= fInv; - _41 *= fInv; _42 *= fInv; _43 *= fInv; _44 *= fInv; - return *this; -} - -/* unary operators */ -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator - () const -{ - return D3DXMATRIX(-_11, -_12, -_13, -_14, - -_21, -_22, -_23, -_24, - -_31, -_32, -_33, -_34, - -_41, -_42, -_43, -_44); -} - -/* binary operators */ -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator * ( CONST D3DXMATRIX& mat ) const -{ - D3DXMATRIX matT; - D3DXMatrixMultiply(&matT, this, &mat); - return matT; -} - -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator + ( CONST D3DXMATRIX& mat ) const -{ - return D3DXMATRIX(_11 + mat._11, _12 + mat._12, _13 + mat._13, _14 + mat._14, - _21 + mat._21, _22 + mat._22, _23 + mat._23, _24 + mat._24, - _31 + mat._31, _32 + mat._32, _33 + mat._33, _34 + mat._34, - _41 + mat._41, _42 + mat._42, _43 + mat._43, _44 + mat._44); -} - -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator - ( CONST D3DXMATRIX& mat ) const -{ - return D3DXMATRIX(_11 - mat._11, _12 - mat._12, _13 - mat._13, _14 - mat._14, - _21 - mat._21, _22 - mat._22, _23 - mat._23, _24 - mat._24, - _31 - mat._31, _32 - mat._32, _33 - mat._33, _34 - mat._34, - _41 - mat._41, _42 - mat._42, _43 - mat._43, _44 - mat._44); -} - -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator * ( FLOAT f ) const -{ - return D3DXMATRIX(_11 * f, _12 * f, _13 * f, _14 * f, - _21 * f, _22 * f, _23 * f, _24 * f, - _31 * f, _32 * f, _33 * f, _34 * f, - _41 * f, _42 * f, _43 * f, _44 * f); -} - -D3DXINLINE D3DXMATRIX -D3DXMATRIX::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXMATRIX(_11 * fInv, _12 * fInv, _13 * fInv, _14 * fInv, - _21 * fInv, _22 * fInv, _23 * fInv, _24 * fInv, - _31 * fInv, _32 * fInv, _33 * fInv, _34 * fInv, - _41 * fInv, _42 * fInv, _43 * fInv, _44 * fInv); -} - - -D3DXINLINE D3DXMATRIX -operator * ( FLOAT f, CONST D3DXMATRIX& mat ) -{ - return D3DXMATRIX(f * mat._11, f * mat._12, f * mat._13, f * mat._14, - f * mat._21, f * mat._22, f * mat._23, f * mat._24, - f * mat._31, f * mat._32, f * mat._33, f * mat._34, - f * mat._41, f * mat._42, f * mat._43, f * mat._44); -} - - -D3DXINLINE BOOL -D3DXMATRIX::operator == ( CONST D3DXMATRIX& mat ) const -{ - return 0 == memcmp(this, &mat, sizeof(D3DXMATRIX)); -} - -D3DXINLINE BOOL -D3DXMATRIX::operator != ( CONST D3DXMATRIX& mat ) const -{ - return 0 != memcmp(this, &mat, sizeof(D3DXMATRIX)); -} - - - -/* - * Quaternion - */ - -D3DXINLINE -D3DXQUATERNION::D3DXQUATERNION( CONST FLOAT* pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - x = pf[0]; - y = pf[1]; - z = pf[2]; - w = pf[3]; -} - -D3DXINLINE -D3DXQUATERNION::D3DXQUATERNION( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) -{ - x = fx; - y = fy; - z = fz; - w = fw; -} - - -/* casting */ -D3DXINLINE -D3DXQUATERNION::operator FLOAT* () -{ - return (FLOAT *) &x; -} - -D3DXINLINE -D3DXQUATERNION::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &x; -} - - -/* assignment operators */ -D3DXINLINE D3DXQUATERNION& -D3DXQUATERNION::operator += ( CONST D3DXQUATERNION& q ) -{ - x += q.x; - y += q.y; - z += q.z; - w += q.w; - return *this; -} - -D3DXINLINE D3DXQUATERNION& -D3DXQUATERNION::operator -= ( CONST D3DXQUATERNION& q ) -{ - x -= q.x; - y -= q.y; - z -= q.z; - w -= q.w; - return *this; -} - -D3DXINLINE D3DXQUATERNION& -D3DXQUATERNION::operator *= ( CONST D3DXQUATERNION& q ) -{ - D3DXQuaternionMultiply(this, this, &q); - return *this; -} - -D3DXINLINE D3DXQUATERNION& -D3DXQUATERNION::operator *= ( FLOAT f ) -{ - x *= f; - y *= f; - z *= f; - w *= f; - return *this; -} - -D3DXINLINE D3DXQUATERNION& -D3DXQUATERNION::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - x *= fInv; - y *= fInv; - z *= fInv; - w *= fInv; - return *this; -} - - -/* unary operators */ -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator - () const -{ - return D3DXQUATERNION(-x, -y, -z, -w); -} - - -/* binary operators */ -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator + ( CONST D3DXQUATERNION& q ) const -{ - return D3DXQUATERNION(x + q.x, y + q.y, z + q.z, w + q.w); -} - -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator - ( CONST D3DXQUATERNION& q ) const -{ - return D3DXQUATERNION(x - q.x, y - q.y, z - q.z, w - q.w); -} - -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator * ( CONST D3DXQUATERNION& q ) const -{ - D3DXQUATERNION qT; - D3DXQuaternionMultiply(&qT, this, &q); - return qT; -} - -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator * ( FLOAT f ) const -{ - return D3DXQUATERNION(x * f, y * f, z * f, w * f); -} - -D3DXINLINE D3DXQUATERNION -D3DXQUATERNION::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXQUATERNION(x * fInv, y * fInv, z * fInv, w * fInv); -} - - -D3DXINLINE D3DXQUATERNION -operator * (FLOAT f, CONST D3DXQUATERNION& q ) -{ - return D3DXQUATERNION(f * q.x, f * q.y, f * q.z, f * q.w); -} - - -D3DXINLINE BOOL -D3DXQUATERNION::operator == ( CONST D3DXQUATERNION& q ) const -{ - return x == q.x && y == q.y && z == q.z && w == q.w; -} - -D3DXINLINE BOOL -D3DXQUATERNION::operator != ( CONST D3DXQUATERNION& q ) const -{ - return x != q.x || y != q.y || z != q.z || w != q.w; -} - - - -/* - * Plane - */ - -D3DXINLINE -D3DXPLANE::D3DXPLANE( CONST FLOAT* pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - a = pf[0]; - b = pf[1]; - c = pf[2]; - d = pf[3]; -} - -D3DXINLINE -D3DXPLANE::D3DXPLANE( FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd ) -{ - a = fa; - b = fb; - c = fc; - d = fd; -} - -/* casting */ -D3DXINLINE -D3DXPLANE::operator FLOAT* () -{ - return (FLOAT *) &a; -} - -D3DXINLINE -D3DXPLANE::operator CONST FLOAT* () const -{ - return (CONST FLOAT *) &a; -} - - -/* unary operators */ -D3DXINLINE D3DXPLANE -D3DXPLANE::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXPLANE -D3DXPLANE::operator - () const -{ - return D3DXPLANE(-a, -b, -c, -d); -} - -/* binary operators */ -D3DXINLINE BOOL -D3DXPLANE::operator == ( CONST D3DXPLANE& p ) const -{ - return a == p.a && b == p.b && c == p.c && d == p.d; -} - -D3DXINLINE BOOL -D3DXPLANE::operator != ( CONST D3DXPLANE& p ) const -{ - return a != p.a || b != p.b || c != p.c || d != p.d; -} - -/* - * Color - */ - -D3DXINLINE -D3DXCOLOR::D3DXCOLOR( DWORD dw ) -{ - CONST FLOAT f = 1.0f / 255.0f; - r = f * (FLOAT) (unsigned char) (dw >> 16); - g = f * (FLOAT) (unsigned char) (dw >> 8); - b = f * (FLOAT) (unsigned char) (dw >> 0); - a = f * (FLOAT) (unsigned char) (dw >> 24); -} - -D3DXINLINE -D3DXCOLOR::D3DXCOLOR( CONST FLOAT* pf ) -{ -#ifdef D3DX_DEBUG - if(!pf) - return; -#endif - - r = pf[0]; - g = pf[1]; - b = pf[2]; - a = pf[3]; -} - -D3DXINLINE -D3DXCOLOR::D3DXCOLOR( CONST D3DCOLORVALUE& c ) -{ - r = c.r; - g = c.g; - b = c.b; - a = c.a; -} - -D3DXINLINE -D3DXCOLOR::D3DXCOLOR( FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa ) -{ - r = fr; - g = fg; - b = fb; - a = fa; -} - -/* casting */ -D3DXINLINE -D3DXCOLOR::operator DWORD () const -{ - DWORD dwR = r >= 1.0f ? 0xff : r <= 0.0f ? 0x00 : (DWORD) (r * 255.0f + 0.5f); - DWORD dwG = g >= 1.0f ? 0xff : g <= 0.0f ? 0x00 : (DWORD) (g * 255.0f + 0.5f); - DWORD dwB = b >= 1.0f ? 0xff : b <= 0.0f ? 0x00 : (DWORD) (b * 255.0f + 0.5f); - DWORD dwA = a >= 1.0f ? 0xff : a <= 0.0f ? 0x00 : (DWORD) (a * 255.0f + 0.5f); - - return (dwA << 24) | (dwR << 16) | (dwG << 8) | dwB; -} - - -D3DXINLINE -D3DXCOLOR::operator FLOAT * () -{ - return (FLOAT *) &r; -} - -D3DXINLINE -D3DXCOLOR::operator CONST FLOAT * () const -{ - return (CONST FLOAT *) &r; -} - - -D3DXINLINE -D3DXCOLOR::operator D3DCOLORVALUE * () -{ - return (D3DCOLORVALUE *) &r; -} - -D3DXINLINE -D3DXCOLOR::operator CONST D3DCOLORVALUE * () const -{ - return (CONST D3DCOLORVALUE *) &r; -} - - -D3DXINLINE -D3DXCOLOR::operator D3DCOLORVALUE& () -{ - return *((D3DCOLORVALUE *) &r); -} - -D3DXINLINE -D3DXCOLOR::operator CONST D3DCOLORVALUE& () const -{ - return *((CONST D3DCOLORVALUE *) &r); -} - -/* assignment operators */ -D3DXINLINE D3DXCOLOR& -D3DXCOLOR::operator += ( CONST D3DXCOLOR& c ) -{ - r += c.r; - g += c.g; - b += c.b; - a += c.a; - return *this; -} - -D3DXINLINE D3DXCOLOR& -D3DXCOLOR::operator -= ( CONST D3DXCOLOR& c ) -{ - r -= c.r; - g -= c.g; - b -= c.b; - a -= c.a; - return *this; -} - -D3DXINLINE D3DXCOLOR& -D3DXCOLOR::operator *= ( FLOAT f ) -{ - r *= f; - g *= f; - b *= f; - a *= f; - return *this; -} - -D3DXINLINE D3DXCOLOR& -D3DXCOLOR::operator /= ( FLOAT f ) -{ - FLOAT fInv = 1.0f / f; - r *= fInv; - g *= fInv; - b *= fInv; - a *= fInv; - return *this; -} - -/* unary operators */ -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator + () const -{ - return *this; -} - -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator - () const -{ - return D3DXCOLOR(-r, -g, -b, -a); -} - - -/* binary operators */ -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator + ( CONST D3DXCOLOR& c ) const -{ - return D3DXCOLOR(r + c.r, g + c.g, b + c.b, a + c.a); -} - -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator - ( CONST D3DXCOLOR& c ) const -{ - return D3DXCOLOR(r - c.r, g - c.g, b - c.b, a - c.a); -} - -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator * ( FLOAT f ) const -{ - return D3DXCOLOR(r * f, g * f, b * f, a * f); -} - -D3DXINLINE D3DXCOLOR -D3DXCOLOR::operator / ( FLOAT f ) const -{ - FLOAT fInv = 1.0f / f; - return D3DXCOLOR(r * fInv, g * fInv, b * fInv, a * fInv); -} - - -D3DXINLINE D3DXCOLOR -operator * (FLOAT f, CONST D3DXCOLOR& c ) -{ - return D3DXCOLOR(f * c.r, f * c.g, f * c.b, f * c.a); -} - - -D3DXINLINE BOOL -D3DXCOLOR::operator == ( CONST D3DXCOLOR& c ) const -{ - return r == c.r && g == c.g && b == c.b && a == c.a; -} - -D3DXINLINE BOOL -D3DXCOLOR::operator != ( CONST D3DXCOLOR& c ) const -{ - return r != c.r || g != c.g || b != c.b || a != c.a; -} - - -#endif /* __cplusplus */ - -/* - * - * Inline functions - * - */ - - -/* - * 2D Vector - */ - -D3DXINLINE FLOAT D3DXVec2Length - ( CONST D3DXVECTOR2 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - -#ifdef __cplusplus - return sqrtf(pV->x * pV->x + pV->y * pV->y); -#else - return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y); -#endif -} - -D3DXINLINE FLOAT D3DXVec2LengthSq - ( CONST D3DXVECTOR2 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - - return pV->x * pV->x + pV->y * pV->y; -} - -D3DXINLINE FLOAT D3DXVec2Dot - ( CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pV1 || !pV2) - return 0.0f; -#endif - - return pV1->x * pV2->x + pV1->y * pV2->y; -} - -D3DXINLINE FLOAT D3DXVec2CCW - ( CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pV1 || !pV2) - return 0.0f; -#endif - - return pV1->x * pV2->y - pV1->y * pV2->x; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Add - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + pV2->x; - pOut->y = pV1->y + pV2->y; - return pOut; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Subtract - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x - pV2->x; - pOut->y = pV1->y - pV2->y; - return pOut; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Minimize - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; - return pOut; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Maximize - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; - return pOut; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Scale - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, FLOAT s ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV) - return NULL; -#endif - - pOut->x = pV->x * s; - pOut->y = pV->y * s; - return pOut; -} - -D3DXINLINE D3DXVECTOR2* D3DXVec2Lerp - ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2, - FLOAT s ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + s * (pV2->x - pV1->x); - pOut->y = pV1->y + s * (pV2->y - pV1->y); - return pOut; -} - - -/* - * 3D Vector - */ - -D3DXINLINE FLOAT D3DXVec3Length - ( CONST D3DXVECTOR3 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - -#ifdef __cplusplus - return sqrtf(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z); -#else - return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z); -#endif -} - -D3DXINLINE FLOAT D3DXVec3LengthSq - ( CONST D3DXVECTOR3 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - - return pV->x * pV->x + pV->y * pV->y + pV->z * pV->z; -} - -D3DXINLINE FLOAT D3DXVec3Dot - ( CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pV1 || !pV2) - return 0.0f; -#endif - - return pV1->x * pV2->x + pV1->y * pV2->y + pV1->z * pV2->z; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Cross - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ - D3DXVECTOR3 v; - -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - v.x = pV1->y * pV2->z - pV1->z * pV2->y; - v.y = pV1->z * pV2->x - pV1->x * pV2->z; - v.z = pV1->x * pV2->y - pV1->y * pV2->x; - - *pOut = v; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Add - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + pV2->x; - pOut->y = pV1->y + pV2->y; - pOut->z = pV1->z + pV2->z; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Subtract - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x - pV2->x; - pOut->y = pV1->y - pV2->y; - pOut->z = pV1->z - pV2->z; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Minimize - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; - pOut->z = pV1->z < pV2->z ? pV1->z : pV2->z; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Maximize - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; - pOut->z = pV1->z > pV2->z ? pV1->z : pV2->z; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Scale - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, FLOAT s) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV) - return NULL; -#endif - - pOut->x = pV->x * s; - pOut->y = pV->y * s; - pOut->z = pV->z * s; - return pOut; -} - -D3DXINLINE D3DXVECTOR3* D3DXVec3Lerp - ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2, - FLOAT s ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + s * (pV2->x - pV1->x); - pOut->y = pV1->y + s * (pV2->y - pV1->y); - pOut->z = pV1->z + s * (pV2->z - pV1->z); - return pOut; -} - - -/* - * 4D Vector - */ - -D3DXINLINE FLOAT D3DXVec4Length - ( CONST D3DXVECTOR4 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - -#ifdef __cplusplus - return sqrtf(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w); -#else - return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w); -#endif -} - -D3DXINLINE FLOAT D3DXVec4LengthSq - ( CONST D3DXVECTOR4 *pV ) -{ -#ifdef D3DX_DEBUG - if(!pV) - return 0.0f; -#endif - - return pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w; -} - -D3DXINLINE FLOAT D3DXVec4Dot - ( CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2 ) -{ -#ifdef D3DX_DEBUG - if(!pV1 || !pV2) - return 0.0f; -#endif - - return pV1->x * pV2->x + pV1->y * pV2->y + pV1->z * pV2->z + pV1->w * pV2->w; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Add - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + pV2->x; - pOut->y = pV1->y + pV2->y; - pOut->z = pV1->z + pV2->z; - pOut->w = pV1->w + pV2->w; - return pOut; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Subtract - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x - pV2->x; - pOut->y = pV1->y - pV2->y; - pOut->z = pV1->z - pV2->z; - pOut->w = pV1->w - pV2->w; - return pOut; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Minimize - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; - pOut->z = pV1->z < pV2->z ? pV1->z : pV2->z; - pOut->w = pV1->w < pV2->w ? pV1->w : pV2->w; - return pOut; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Maximize - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; - pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; - pOut->z = pV1->z > pV2->z ? pV1->z : pV2->z; - pOut->w = pV1->w > pV2->w ? pV1->w : pV2->w; - return pOut; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Scale - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, FLOAT s) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV) - return NULL; -#endif - - pOut->x = pV->x * s; - pOut->y = pV->y * s; - pOut->z = pV->z * s; - pOut->w = pV->w * s; - return pOut; -} - -D3DXINLINE D3DXVECTOR4* D3DXVec4Lerp - ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2, - FLOAT s ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pV1 || !pV2) - return NULL; -#endif - - pOut->x = pV1->x + s * (pV2->x - pV1->x); - pOut->y = pV1->y + s * (pV2->y - pV1->y); - pOut->z = pV1->z + s * (pV2->z - pV1->z); - pOut->w = pV1->w + s * (pV2->w - pV1->w); - return pOut; -} - - -/* - * 4D Matrix - */ - -D3DXINLINE D3DXMATRIX* D3DXMatrixIdentity - ( D3DXMATRIX *pOut ) -{ -#ifdef D3DX_DEBUG - if(!pOut) - return NULL; -#endif - - pOut->m[0][1] = pOut->m[0][2] = pOut->m[0][3] = - pOut->m[1][0] = pOut->m[1][2] = pOut->m[1][3] = - pOut->m[2][0] = pOut->m[2][1] = pOut->m[2][3] = - pOut->m[3][0] = pOut->m[3][1] = pOut->m[3][2] = 0.0f; - - pOut->m[0][0] = pOut->m[1][1] = pOut->m[2][2] = pOut->m[3][3] = 1.0f; - return pOut; -} - - -D3DXINLINE BOOL D3DXMatrixIsIdentity - ( CONST D3DXMATRIX *pM ) -{ -#ifdef D3DX_DEBUG - if(!pM) - return FALSE; -#endif - - return pM->m[0][0] == 1.0f && pM->m[0][1] == 0.0f && pM->m[0][2] == 0.0f && pM->m[0][3] == 0.0f && - pM->m[1][0] == 0.0f && pM->m[1][1] == 1.0f && pM->m[1][2] == 0.0f && pM->m[1][3] == 0.0f && - pM->m[2][0] == 0.0f && pM->m[2][1] == 0.0f && pM->m[2][2] == 1.0f && pM->m[2][3] == 0.0f && - pM->m[3][0] == 0.0f && pM->m[3][1] == 0.0f && pM->m[3][2] == 0.0f && pM->m[3][3] == 1.0f; -} - - -/* - * Quaternion - */ - -D3DXINLINE FLOAT D3DXQuaternionLength - ( CONST D3DXQUATERNION *pQ ) -{ -#ifdef D3DX_DEBUG - if(!pQ) - return 0.0f; -#endif - -#ifdef __cplusplus - return sqrtf(pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w); -#else - return (FLOAT) sqrt(pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w); -#endif -} - -D3DXINLINE FLOAT D3DXQuaternionLengthSq - ( CONST D3DXQUATERNION *pQ ) -{ -#ifdef D3DX_DEBUG - if(!pQ) - return 0.0f; -#endif - - return pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w; -} - -D3DXINLINE FLOAT D3DXQuaternionDot - ( CONST D3DXQUATERNION *pQ1, CONST D3DXQUATERNION *pQ2 ) -{ -#ifdef D3DX_DEBUG - if(!pQ1 || !pQ2) - return 0.0f; -#endif - - return pQ1->x * pQ2->x + pQ1->y * pQ2->y + pQ1->z * pQ2->z + pQ1->w * pQ2->w; -} - - -D3DXINLINE D3DXQUATERNION* D3DXQuaternionIdentity - ( D3DXQUATERNION *pOut ) -{ -#ifdef D3DX_DEBUG - if(!pOut) - return NULL; -#endif - - pOut->x = pOut->y = pOut->z = 0.0f; - pOut->w = 1.0f; - return pOut; -} - -D3DXINLINE BOOL D3DXQuaternionIsIdentity - ( CONST D3DXQUATERNION *pQ ) -{ -#ifdef D3DX_DEBUG - if(!pQ) - return FALSE; -#endif - - return pQ->x == 0.0f && pQ->y == 0.0f && pQ->z == 0.0f && pQ->w == 1.0f; -} - - -D3DXINLINE D3DXQUATERNION* D3DXQuaternionConjugate - ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ ) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pQ) - return NULL; -#endif - - pOut->x = -pQ->x; - pOut->y = -pQ->y; - pOut->z = -pQ->z; - pOut->w = pQ->w; - return pOut; -} - - -/* - * Plane - */ - -D3DXINLINE FLOAT D3DXPlaneDot - ( CONST D3DXPLANE *pP, CONST D3DXVECTOR4 *pV) -{ -#ifdef D3DX_DEBUG - if(!pP || !pV) - return 0.0f; -#endif - - return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z + pP->d * pV->w; -} - -D3DXINLINE FLOAT D3DXPlaneDotCoord - ( CONST D3DXPLANE *pP, CONST D3DXVECTOR3 *pV) -{ -#ifdef D3DX_DEBUG - if(!pP || !pV) - return 0.0f; -#endif - - return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z + pP->d; -} - -D3DXINLINE FLOAT D3DXPlaneDotNormal - ( CONST D3DXPLANE *pP, CONST D3DXVECTOR3 *pV) -{ -#ifdef D3DX_DEBUG - if(!pP || !pV) - return 0.0f; -#endif - - return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z; -} - - -/* - * Color - */ - -D3DXINLINE D3DXCOLOR* D3DXColorNegative - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC) - return NULL; -#endif - - pOut->r = 1.0f - pC->r; - pOut->g = 1.0f - pC->g; - pOut->b = 1.0f - pC->b; - pOut->a = pC->a; - return pOut; -} - -D3DXINLINE D3DXCOLOR* D3DXColorAdd - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC1 || !pC2) - return NULL; -#endif - - pOut->r = pC1->r + pC2->r; - pOut->g = pC1->g + pC2->g; - pOut->b = pC1->b + pC2->b; - pOut->a = pC1->a + pC2->a; - return pOut; -} - -D3DXINLINE D3DXCOLOR* D3DXColorSubtract - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC1 || !pC2) - return NULL; -#endif - - pOut->r = pC1->r - pC2->r; - pOut->g = pC1->g - pC2->g; - pOut->b = pC1->b - pC2->b; - pOut->a = pC1->a - pC2->a; - return pOut; -} - -D3DXINLINE D3DXCOLOR* D3DXColorScale - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC, FLOAT s) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC) - return NULL; -#endif - - pOut->r = pC->r * s; - pOut->g = pC->g * s; - pOut->b = pC->b * s; - pOut->a = pC->a * s; - return pOut; -} - -D3DXINLINE D3DXCOLOR* D3DXColorModulate - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC1 || !pC2) - return NULL; -#endif - - pOut->r = pC1->r * pC2->r; - pOut->g = pC1->g * pC2->g; - pOut->b = pC1->b * pC2->b; - pOut->a = pC1->a * pC2->a; - return pOut; -} - -D3DXINLINE D3DXCOLOR* D3DXColorLerp - (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2, FLOAT s) -{ -#ifdef D3DX_DEBUG - if(!pOut || !pC1 || !pC2) - return NULL; -#endif - - pOut->r = pC1->r + s * (pC2->r - pC1->r); - pOut->g = pC1->g + s * (pC2->g - pC1->g); - pOut->b = pC1->b + s * (pC2->b - pC1->b); - pOut->a = pC1->a + s * (pC2->a - pC1->a); - return pOut; -} - - -#endif /* __D3DX8MATH_INL__ */ +/* + * + * Copyright (C) 1998 Microsoft Corporation. All Rights Reserved. + * + * File: d3dx8math.inl + * Content: D3DX math inline functions + * + */ + +#ifndef __D3DX8MATH_INL__ +#define __D3DX8MATH_INL__ + +/* + * + * Inline Class Methods + * + */ + +#ifdef __cplusplus + +/* + * 2D Vector + */ + +D3DXINLINE +D3DXVECTOR2::D3DXVECTOR2( CONST FLOAT *pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + x = pf[0]; + y = pf[1]; +} + +D3DXINLINE +D3DXVECTOR2::D3DXVECTOR2( FLOAT fx, FLOAT fy ) +{ + x = fx; + y = fy; +} + +/* casting */ +D3DXINLINE +D3DXVECTOR2::operator FLOAT* () +{ + return (FLOAT *) &x; +} + +D3DXINLINE +D3DXVECTOR2::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &x; +} + +/* assignment operators */ +D3DXINLINE D3DXVECTOR2& +D3DXVECTOR2::operator += ( CONST D3DXVECTOR2& v ) +{ + x += v.x; + y += v.y; + return *this; +} + +D3DXINLINE D3DXVECTOR2& +D3DXVECTOR2::operator -= ( CONST D3DXVECTOR2& v ) +{ + x -= v.x; + y -= v.y; + return *this; +} + +D3DXINLINE D3DXVECTOR2& +D3DXVECTOR2::operator *= ( FLOAT f ) +{ + x *= f; + y *= f; + return *this; +} + +D3DXINLINE D3DXVECTOR2& +D3DXVECTOR2::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + x *= fInv; + y *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator - () const +{ + return D3DXVECTOR2(-x, -y); +} + +/* binary operators */ +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator + ( CONST D3DXVECTOR2& v ) const +{ + return D3DXVECTOR2(x + v.x, y + v.y); +} + +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator - ( CONST D3DXVECTOR2& v ) const +{ + return D3DXVECTOR2(x - v.x, y - v.y); +} + +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator * ( FLOAT f ) const +{ + return D3DXVECTOR2(x * f, y * f); +} + +D3DXINLINE D3DXVECTOR2 +D3DXVECTOR2::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXVECTOR2(x * fInv, y * fInv); +} + +D3DXINLINE D3DXVECTOR2 +operator * ( FLOAT f, CONST D3DXVECTOR2& v ) +{ + return D3DXVECTOR2(f * v.x, f * v.y); +} + +D3DXINLINE BOOL +D3DXVECTOR2::operator == ( CONST D3DXVECTOR2& v ) const +{ + return x == v.x && y == v.y; +} + +D3DXINLINE BOOL +D3DXVECTOR2::operator != ( CONST D3DXVECTOR2& v ) const +{ + return x != v.x || y != v.y; +} + +/* + * 3D Vector + */ +D3DXINLINE +D3DXVECTOR3::D3DXVECTOR3( CONST FLOAT *pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + x = pf[0]; + y = pf[1]; + z = pf[2]; +} + +D3DXINLINE +D3DXVECTOR3::D3DXVECTOR3( CONST D3DVECTOR& v ) +{ + x = v.x; + y = v.y; + z = v.z; +} + +D3DXINLINE +D3DXVECTOR3::D3DXVECTOR3( FLOAT fx, FLOAT fy, FLOAT fz ) +{ + x = fx; + y = fy; + z = fz; +} + +/* casting */ +D3DXINLINE +D3DXVECTOR3::operator FLOAT* () +{ + return (FLOAT *) &x; +} + +D3DXINLINE +D3DXVECTOR3::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &x; +} + +/* assignment operators */ +D3DXINLINE D3DXVECTOR3& +D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& v ) +{ + x += v.x; + y += v.y; + z += v.z; + return *this; +} + +D3DXINLINE D3DXVECTOR3& +D3DXVECTOR3::operator -= ( CONST D3DXVECTOR3& v ) +{ + x -= v.x; + y -= v.y; + z -= v.z; + return *this; +} + +D3DXINLINE D3DXVECTOR3& +D3DXVECTOR3::operator *= ( FLOAT f ) +{ + x *= f; + y *= f; + z *= f; + return *this; +} + +D3DXINLINE D3DXVECTOR3& +D3DXVECTOR3::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + x *= fInv; + y *= fInv; + z *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator - () const +{ + return D3DXVECTOR3(-x, -y, -z); +} + +/* binary operators */ +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator + ( CONST D3DXVECTOR3& v ) const +{ + return D3DXVECTOR3(x + v.x, y + v.y, z + v.z); +} + +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator - ( CONST D3DXVECTOR3& v ) const +{ + return D3DXVECTOR3(x - v.x, y - v.y, z - v.z); +} + +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator * ( FLOAT f ) const +{ + return D3DXVECTOR3(x * f, y * f, z * f); +} + +D3DXINLINE D3DXVECTOR3 +D3DXVECTOR3::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXVECTOR3(x * fInv, y * fInv, z * fInv); +} + +D3DXINLINE D3DXVECTOR3 +operator * ( FLOAT f, CONST struct D3DXVECTOR3& v ) +{ + return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); +} + +D3DXINLINE BOOL +D3DXVECTOR3::operator == ( CONST D3DXVECTOR3& v ) const +{ + return x == v.x && y == v.y && z == v.z; +} + +D3DXINLINE BOOL +D3DXVECTOR3::operator != ( CONST D3DXVECTOR3& v ) const +{ + return x != v.x || y != v.y || z != v.z; +} + +/* + * 4D Vector + */ +D3DXINLINE +D3DXVECTOR4::D3DXVECTOR4( CONST FLOAT *pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + x = pf[0]; + y = pf[1]; + z = pf[2]; + w = pf[3]; +} + +D3DXINLINE +D3DXVECTOR4::D3DXVECTOR4( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) +{ + x = fx; + y = fy; + z = fz; + w = fw; +} + +/* casting */ +D3DXINLINE +D3DXVECTOR4::operator FLOAT* () +{ + return (FLOAT *) &x; +} + +D3DXINLINE +D3DXVECTOR4::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &x; +} + +/* assignment operators */ +D3DXINLINE D3DXVECTOR4& +D3DXVECTOR4::operator += ( CONST D3DXVECTOR4& v ) +{ + x += v.x; + y += v.y; + z += v.z; + w += v.w; + return *this; +} + +D3DXINLINE D3DXVECTOR4& +D3DXVECTOR4::operator -= ( CONST D3DXVECTOR4& v ) +{ + x -= v.x; + y -= v.y; + z -= v.z; + w -= v.w; + return *this; +} + +D3DXINLINE D3DXVECTOR4& +D3DXVECTOR4::operator *= ( FLOAT f ) +{ + x *= f; + y *= f; + z *= f; + w *= f; + return *this; +} + +D3DXINLINE D3DXVECTOR4& +D3DXVECTOR4::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + x *= fInv; + y *= fInv; + z *= fInv; + w *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator - () const +{ + return D3DXVECTOR4(-x, -y, -z, -w); +} + +/* binary operators */ +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator + ( CONST D3DXVECTOR4& v ) const +{ + return D3DXVECTOR4(x + v.x, y + v.y, z + v.z, w + v.w); +} + +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator - ( CONST D3DXVECTOR4& v ) const +{ + return D3DXVECTOR4(x - v.x, y - v.y, z - v.z, w - v.w); +} + +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator * ( FLOAT f ) const +{ + return D3DXVECTOR4(x * f, y * f, z * f, w * f); +} + +D3DXINLINE D3DXVECTOR4 +D3DXVECTOR4::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXVECTOR4(x * fInv, y * fInv, z * fInv, w * fInv); +} + +D3DXINLINE D3DXVECTOR4 +operator * ( FLOAT f, CONST D3DXVECTOR4& v ) +{ + return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w); +} + +D3DXINLINE BOOL +D3DXVECTOR4::operator == ( CONST D3DXVECTOR4& v ) const +{ + return x == v.x && y == v.y && z == v.z && w == v.w; +} + +D3DXINLINE BOOL +D3DXVECTOR4::operator != ( CONST D3DXVECTOR4& v ) const +{ + return x != v.x || y != v.y || z != v.z || w != v.w; +} + +/* + * Matrix + */ +D3DXINLINE +D3DXMATRIX::D3DXMATRIX( CONST FLOAT* pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + memcpy(&_11, pf, sizeof(D3DXMATRIX)); +} + +D3DXINLINE +D3DXMATRIX::D3DXMATRIX( CONST D3DMATRIX& mat ) +{ + memcpy(&_11, &mat, sizeof(D3DXMATRIX)); +} + +D3DXINLINE +D3DXMATRIX::D3DXMATRIX( FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, + FLOAT f21, FLOAT f22, FLOAT f23, FLOAT f24, + FLOAT f31, FLOAT f32, FLOAT f33, FLOAT f34, + FLOAT f41, FLOAT f42, FLOAT f43, FLOAT f44 ) +{ + _11 = f11; _12 = f12; _13 = f13; _14 = f14; + _21 = f21; _22 = f22; _23 = f23; _24 = f24; + _31 = f31; _32 = f32; _33 = f33; _34 = f34; + _41 = f41; _42 = f42; _43 = f43; _44 = f44; +} + +/* access grants */ +D3DXINLINE FLOAT& +D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) +{ + return m[iRow][iCol]; +} + +D3DXINLINE FLOAT +D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) const +{ + return m[iRow][iCol]; +} + +/* casting operators */ +D3DXINLINE +D3DXMATRIX::operator FLOAT* () +{ + return (FLOAT *) &_11; +} + +D3DXINLINE +D3DXMATRIX::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &_11; +} + +/* assignment operators */ +D3DXINLINE D3DXMATRIX& +D3DXMATRIX::operator *= ( CONST D3DXMATRIX& mat ) +{ + D3DXMatrixMultiply(this, this, &mat); + return *this; +} + +D3DXINLINE D3DXMATRIX& +D3DXMATRIX::operator += ( CONST D3DXMATRIX& mat ) +{ + _11 += mat._11; _12 += mat._12; _13 += mat._13; _14 += mat._14; + _21 += mat._21; _22 += mat._22; _23 += mat._23; _24 += mat._24; + _31 += mat._31; _32 += mat._32; _33 += mat._33; _34 += mat._34; + _41 += mat._41; _42 += mat._42; _43 += mat._43; _44 += mat._44; + return *this; +} + +D3DXINLINE D3DXMATRIX& +D3DXMATRIX::operator -= ( CONST D3DXMATRIX& mat ) +{ + _11 -= mat._11; _12 -= mat._12; _13 -= mat._13; _14 -= mat._14; + _21 -= mat._21; _22 -= mat._22; _23 -= mat._23; _24 -= mat._24; + _31 -= mat._31; _32 -= mat._32; _33 -= mat._33; _34 -= mat._34; + _41 -= mat._41; _42 -= mat._42; _43 -= mat._43; _44 -= mat._44; + return *this; +} + +D3DXINLINE D3DXMATRIX& +D3DXMATRIX::operator *= ( FLOAT f ) +{ + _11 *= f; _12 *= f; _13 *= f; _14 *= f; + _21 *= f; _22 *= f; _23 *= f; _24 *= f; + _31 *= f; _32 *= f; _33 *= f; _34 *= f; + _41 *= f; _42 *= f; _43 *= f; _44 *= f; + return *this; +} + +D3DXINLINE D3DXMATRIX& +D3DXMATRIX::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + _11 *= fInv; _12 *= fInv; _13 *= fInv; _14 *= fInv; + _21 *= fInv; _22 *= fInv; _23 *= fInv; _24 *= fInv; + _31 *= fInv; _32 *= fInv; _33 *= fInv; _34 *= fInv; + _41 *= fInv; _42 *= fInv; _43 *= fInv; _44 *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator - () const +{ + return D3DXMATRIX(-_11, -_12, -_13, -_14, + -_21, -_22, -_23, -_24, + -_31, -_32, -_33, -_34, + -_41, -_42, -_43, -_44); +} + +/* binary operators */ +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator * ( CONST D3DXMATRIX& mat ) const +{ + D3DXMATRIX matT; + D3DXMatrixMultiply(&matT, this, &mat); + return matT; +} + +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator + ( CONST D3DXMATRIX& mat ) const +{ + return D3DXMATRIX(_11 + mat._11, _12 + mat._12, _13 + mat._13, _14 + mat._14, + _21 + mat._21, _22 + mat._22, _23 + mat._23, _24 + mat._24, + _31 + mat._31, _32 + mat._32, _33 + mat._33, _34 + mat._34, + _41 + mat._41, _42 + mat._42, _43 + mat._43, _44 + mat._44); +} + +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator - ( CONST D3DXMATRIX& mat ) const +{ + return D3DXMATRIX(_11 - mat._11, _12 - mat._12, _13 - mat._13, _14 - mat._14, + _21 - mat._21, _22 - mat._22, _23 - mat._23, _24 - mat._24, + _31 - mat._31, _32 - mat._32, _33 - mat._33, _34 - mat._34, + _41 - mat._41, _42 - mat._42, _43 - mat._43, _44 - mat._44); +} + +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator * ( FLOAT f ) const +{ + return D3DXMATRIX(_11 * f, _12 * f, _13 * f, _14 * f, + _21 * f, _22 * f, _23 * f, _24 * f, + _31 * f, _32 * f, _33 * f, _34 * f, + _41 * f, _42 * f, _43 * f, _44 * f); +} + +D3DXINLINE D3DXMATRIX +D3DXMATRIX::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXMATRIX(_11 * fInv, _12 * fInv, _13 * fInv, _14 * fInv, + _21 * fInv, _22 * fInv, _23 * fInv, _24 * fInv, + _31 * fInv, _32 * fInv, _33 * fInv, _34 * fInv, + _41 * fInv, _42 * fInv, _43 * fInv, _44 * fInv); +} + +D3DXINLINE D3DXMATRIX +operator * ( FLOAT f, CONST D3DXMATRIX& mat ) +{ + return D3DXMATRIX(f * mat._11, f * mat._12, f * mat._13, f * mat._14, + f * mat._21, f * mat._22, f * mat._23, f * mat._24, + f * mat._31, f * mat._32, f * mat._33, f * mat._34, + f * mat._41, f * mat._42, f * mat._43, f * mat._44); +} + +D3DXINLINE BOOL +D3DXMATRIX::operator == ( CONST D3DXMATRIX& mat ) const +{ + return 0 == memcmp(this, &mat, sizeof(D3DXMATRIX)); +} + +D3DXINLINE BOOL +D3DXMATRIX::operator != ( CONST D3DXMATRIX& mat ) const +{ + return 0 != memcmp(this, &mat, sizeof(D3DXMATRIX)); +} + +/* + * Quaternion + */ + +D3DXINLINE +D3DXQUATERNION::D3DXQUATERNION( CONST FLOAT* pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + x = pf[0]; + y = pf[1]; + z = pf[2]; + w = pf[3]; +} + +D3DXINLINE +D3DXQUATERNION::D3DXQUATERNION( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) +{ + x = fx; + y = fy; + z = fz; + w = fw; +} + +/* casting */ +D3DXINLINE +D3DXQUATERNION::operator FLOAT* () +{ + return (FLOAT *) &x; +} + +D3DXINLINE +D3DXQUATERNION::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &x; +} + +/* assignment operators */ +D3DXINLINE D3DXQUATERNION& +D3DXQUATERNION::operator += ( CONST D3DXQUATERNION& q ) +{ + x += q.x; + y += q.y; + z += q.z; + w += q.w; + return *this; +} + +D3DXINLINE D3DXQUATERNION& +D3DXQUATERNION::operator -= ( CONST D3DXQUATERNION& q ) +{ + x -= q.x; + y -= q.y; + z -= q.z; + w -= q.w; + return *this; +} + +D3DXINLINE D3DXQUATERNION& +D3DXQUATERNION::operator *= ( CONST D3DXQUATERNION& q ) +{ + D3DXQuaternionMultiply(this, this, &q); + return *this; +} + +D3DXINLINE D3DXQUATERNION& +D3DXQUATERNION::operator *= ( FLOAT f ) +{ + x *= f; + y *= f; + z *= f; + w *= f; + return *this; +} + +D3DXINLINE D3DXQUATERNION& +D3DXQUATERNION::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + x *= fInv; + y *= fInv; + z *= fInv; + w *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator - () const +{ + return D3DXQUATERNION(-x, -y, -z, -w); +} + +/* binary operators */ +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator + ( CONST D3DXQUATERNION& q ) const +{ + return D3DXQUATERNION(x + q.x, y + q.y, z + q.z, w + q.w); +} + +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator - ( CONST D3DXQUATERNION& q ) const +{ + return D3DXQUATERNION(x - q.x, y - q.y, z - q.z, w - q.w); +} + +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator * ( CONST D3DXQUATERNION& q ) const +{ + D3DXQUATERNION qT; + D3DXQuaternionMultiply(&qT, this, &q); + return qT; +} + +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator * ( FLOAT f ) const +{ + return D3DXQUATERNION(x * f, y * f, z * f, w * f); +} + +D3DXINLINE D3DXQUATERNION +D3DXQUATERNION::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXQUATERNION(x * fInv, y * fInv, z * fInv, w * fInv); +} + +D3DXINLINE D3DXQUATERNION +operator * (FLOAT f, CONST D3DXQUATERNION& q ) +{ + return D3DXQUATERNION(f * q.x, f * q.y, f * q.z, f * q.w); +} + +D3DXINLINE BOOL +D3DXQUATERNION::operator == ( CONST D3DXQUATERNION& q ) const +{ + return x == q.x && y == q.y && z == q.z && w == q.w; +} + +D3DXINLINE BOOL +D3DXQUATERNION::operator != ( CONST D3DXQUATERNION& q ) const +{ + return x != q.x || y != q.y || z != q.z || w != q.w; +} + +/* + * Plane + */ + +D3DXINLINE +D3DXPLANE::D3DXPLANE( CONST FLOAT* pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + a = pf[0]; + b = pf[1]; + c = pf[2]; + d = pf[3]; +} + +D3DXINLINE +D3DXPLANE::D3DXPLANE( FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd ) +{ + a = fa; + b = fb; + c = fc; + d = fd; +} + +/* casting */ +D3DXINLINE +D3DXPLANE::operator FLOAT* () +{ + return (FLOAT *) &a; +} + +D3DXINLINE +D3DXPLANE::operator CONST FLOAT* () const +{ + return (CONST FLOAT *) &a; +} + +/* unary operators */ +D3DXINLINE D3DXPLANE +D3DXPLANE::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXPLANE +D3DXPLANE::operator - () const +{ + return D3DXPLANE(-a, -b, -c, -d); +} + +/* binary operators */ +D3DXINLINE BOOL +D3DXPLANE::operator == ( CONST D3DXPLANE& p ) const +{ + return a == p.a && b == p.b && c == p.c && d == p.d; +} + +D3DXINLINE BOOL +D3DXPLANE::operator != ( CONST D3DXPLANE& p ) const +{ + return a != p.a || b != p.b || c != p.c || d != p.d; +} + +/* + * Color + */ + +D3DXINLINE +D3DXCOLOR::D3DXCOLOR( DWORD dw ) +{ + CONST FLOAT f = 1.0f / 255.0f; + r = f * (FLOAT) (unsigned char) (dw >> 16); + g = f * (FLOAT) (unsigned char) (dw >> 8); + b = f * (FLOAT) (unsigned char) (dw >> 0); + a = f * (FLOAT) (unsigned char) (dw >> 24); +} + +D3DXINLINE +D3DXCOLOR::D3DXCOLOR( CONST FLOAT* pf ) +{ +#ifdef D3DX_DEBUG + if(!pf) + return; +#endif + + r = pf[0]; + g = pf[1]; + b = pf[2]; + a = pf[3]; +} + +D3DXINLINE +D3DXCOLOR::D3DXCOLOR( CONST D3DCOLORVALUE& c ) +{ + r = c.r; + g = c.g; + b = c.b; + a = c.a; +} + +D3DXINLINE +D3DXCOLOR::D3DXCOLOR( FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa ) +{ + r = fr; + g = fg; + b = fb; + a = fa; +} + +/* casting */ +D3DXINLINE +D3DXCOLOR::operator DWORD () const +{ + DWORD dwR = r >= 1.0f ? 0xff : r <= 0.0f ? 0x00 : (DWORD) (r * 255.0f + 0.5f); + DWORD dwG = g >= 1.0f ? 0xff : g <= 0.0f ? 0x00 : (DWORD) (g * 255.0f + 0.5f); + DWORD dwB = b >= 1.0f ? 0xff : b <= 0.0f ? 0x00 : (DWORD) (b * 255.0f + 0.5f); + DWORD dwA = a >= 1.0f ? 0xff : a <= 0.0f ? 0x00 : (DWORD) (a * 255.0f + 0.5f); + + return (dwA << 24) | (dwR << 16) | (dwG << 8) | dwB; +} + +D3DXINLINE +D3DXCOLOR::operator FLOAT * () +{ + return (FLOAT *) &r; +} + +D3DXINLINE +D3DXCOLOR::operator CONST FLOAT * () const +{ + return (CONST FLOAT *) &r; +} + +D3DXINLINE +D3DXCOLOR::operator D3DCOLORVALUE * () +{ + return (D3DCOLORVALUE *) &r; +} + +D3DXINLINE +D3DXCOLOR::operator CONST D3DCOLORVALUE * () const +{ + return (CONST D3DCOLORVALUE *) &r; +} + +D3DXINLINE +D3DXCOLOR::operator D3DCOLORVALUE& () +{ + return *((D3DCOLORVALUE *) &r); +} + +D3DXINLINE +D3DXCOLOR::operator CONST D3DCOLORVALUE& () const +{ + return *((CONST D3DCOLORVALUE *) &r); +} + +/* assignment operators */ +D3DXINLINE D3DXCOLOR& +D3DXCOLOR::operator += ( CONST D3DXCOLOR& c ) +{ + r += c.r; + g += c.g; + b += c.b; + a += c.a; + return *this; +} + +D3DXINLINE D3DXCOLOR& +D3DXCOLOR::operator -= ( CONST D3DXCOLOR& c ) +{ + r -= c.r; + g -= c.g; + b -= c.b; + a -= c.a; + return *this; +} + +D3DXINLINE D3DXCOLOR& +D3DXCOLOR::operator *= ( FLOAT f ) +{ + r *= f; + g *= f; + b *= f; + a *= f; + return *this; +} + +D3DXINLINE D3DXCOLOR& +D3DXCOLOR::operator /= ( FLOAT f ) +{ + FLOAT fInv = 1.0f / f; + r *= fInv; + g *= fInv; + b *= fInv; + a *= fInv; + return *this; +} + +/* unary operators */ +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator + () const +{ + return *this; +} + +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator - () const +{ + return D3DXCOLOR(-r, -g, -b, -a); +} + +/* binary operators */ +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator + ( CONST D3DXCOLOR& c ) const +{ + return D3DXCOLOR(r + c.r, g + c.g, b + c.b, a + c.a); +} + +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator - ( CONST D3DXCOLOR& c ) const +{ + return D3DXCOLOR(r - c.r, g - c.g, b - c.b, a - c.a); +} + +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator * ( FLOAT f ) const +{ + return D3DXCOLOR(r * f, g * f, b * f, a * f); +} + +D3DXINLINE D3DXCOLOR +D3DXCOLOR::operator / ( FLOAT f ) const +{ + FLOAT fInv = 1.0f / f; + return D3DXCOLOR(r * fInv, g * fInv, b * fInv, a * fInv); +} + +D3DXINLINE D3DXCOLOR +operator * (FLOAT f, CONST D3DXCOLOR& c ) +{ + return D3DXCOLOR(f * c.r, f * c.g, f * c.b, f * c.a); +} + +D3DXINLINE BOOL +D3DXCOLOR::operator == ( CONST D3DXCOLOR& c ) const +{ + return r == c.r && g == c.g && b == c.b && a == c.a; +} + +D3DXINLINE BOOL +D3DXCOLOR::operator != ( CONST D3DXCOLOR& c ) const +{ + return r != c.r || g != c.g || b != c.b || a != c.a; +} + +#endif /* __cplusplus */ + +/* + * + * Inline functions + * + */ + +/* + * 2D Vector + */ + +D3DXINLINE FLOAT D3DXVec2Length + ( CONST D3DXVECTOR2 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + +#ifdef __cplusplus + return sqrtf(pV->x * pV->x + pV->y * pV->y); +#else + return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y); +#endif +} + +D3DXINLINE FLOAT D3DXVec2LengthSq + ( CONST D3DXVECTOR2 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + + return pV->x * pV->x + pV->y * pV->y; +} + +D3DXINLINE FLOAT D3DXVec2Dot + ( CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pV1 || !pV2) + return 0.0f; +#endif + + return pV1->x * pV2->x + pV1->y * pV2->y; +} + +D3DXINLINE FLOAT D3DXVec2CCW + ( CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pV1 || !pV2) + return 0.0f; +#endif + + return pV1->x * pV2->y - pV1->y * pV2->x; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Add + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + pV2->x; + pOut->y = pV1->y + pV2->y; + return pOut; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Subtract + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x - pV2->x; + pOut->y = pV1->y - pV2->y; + return pOut; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Minimize + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; + return pOut; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Maximize + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; + return pOut; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Scale + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, FLOAT s ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV) + return NULL; +#endif + + pOut->x = pV->x * s; + pOut->y = pV->y * s; + return pOut; +} + +D3DXINLINE D3DXVECTOR2* D3DXVec2Lerp + ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV1, CONST D3DXVECTOR2 *pV2, + FLOAT s ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + s * (pV2->x - pV1->x); + pOut->y = pV1->y + s * (pV2->y - pV1->y); + return pOut; +} + +/* + * 3D Vector + */ + +D3DXINLINE FLOAT D3DXVec3Length + ( CONST D3DXVECTOR3 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + +#ifdef __cplusplus + return sqrtf(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z); +#else + return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z); +#endif +} + +D3DXINLINE FLOAT D3DXVec3LengthSq + ( CONST D3DXVECTOR3 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + + return pV->x * pV->x + pV->y * pV->y + pV->z * pV->z; +} + +D3DXINLINE FLOAT D3DXVec3Dot + ( CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pV1 || !pV2) + return 0.0f; +#endif + + return pV1->x * pV2->x + pV1->y * pV2->y + pV1->z * pV2->z; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Cross + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ + D3DXVECTOR3 v; + +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + v.x = pV1->y * pV2->z - pV1->z * pV2->y; + v.y = pV1->z * pV2->x - pV1->x * pV2->z; + v.z = pV1->x * pV2->y - pV1->y * pV2->x; + + *pOut = v; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Add + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + pV2->x; + pOut->y = pV1->y + pV2->y; + pOut->z = pV1->z + pV2->z; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Subtract + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x - pV2->x; + pOut->y = pV1->y - pV2->y; + pOut->z = pV1->z - pV2->z; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Minimize + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; + pOut->z = pV1->z < pV2->z ? pV1->z : pV2->z; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Maximize + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; + pOut->z = pV1->z > pV2->z ? pV1->z : pV2->z; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Scale + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, FLOAT s) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV) + return NULL; +#endif + + pOut->x = pV->x * s; + pOut->y = pV->y * s; + pOut->z = pV->z * s; + return pOut; +} + +D3DXINLINE D3DXVECTOR3* D3DXVec3Lerp + ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV1, CONST D3DXVECTOR3 *pV2, + FLOAT s ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + s * (pV2->x - pV1->x); + pOut->y = pV1->y + s * (pV2->y - pV1->y); + pOut->z = pV1->z + s * (pV2->z - pV1->z); + return pOut; +} + +/* + * 4D Vector + */ + +D3DXINLINE FLOAT D3DXVec4Length + ( CONST D3DXVECTOR4 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + +#ifdef __cplusplus + return sqrtf(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w); +#else + return (FLOAT) sqrt(pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w); +#endif +} + +D3DXINLINE FLOAT D3DXVec4LengthSq + ( CONST D3DXVECTOR4 *pV ) +{ +#ifdef D3DX_DEBUG + if(!pV) + return 0.0f; +#endif + + return pV->x * pV->x + pV->y * pV->y + pV->z * pV->z + pV->w * pV->w; +} + +D3DXINLINE FLOAT D3DXVec4Dot + ( CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2 ) +{ +#ifdef D3DX_DEBUG + if(!pV1 || !pV2) + return 0.0f; +#endif + + return pV1->x * pV2->x + pV1->y * pV2->y + pV1->z * pV2->z + pV1->w * pV2->w; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Add + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + pV2->x; + pOut->y = pV1->y + pV2->y; + pOut->z = pV1->z + pV2->z; + pOut->w = pV1->w + pV2->w; + return pOut; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Subtract + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x - pV2->x; + pOut->y = pV1->y - pV2->y; + pOut->z = pV1->z - pV2->z; + pOut->w = pV1->w - pV2->w; + return pOut; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Minimize + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x < pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y < pV2->y ? pV1->y : pV2->y; + pOut->z = pV1->z < pV2->z ? pV1->z : pV2->z; + pOut->w = pV1->w < pV2->w ? pV1->w : pV2->w; + return pOut; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Maximize + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x > pV2->x ? pV1->x : pV2->x; + pOut->y = pV1->y > pV2->y ? pV1->y : pV2->y; + pOut->z = pV1->z > pV2->z ? pV1->z : pV2->z; + pOut->w = pV1->w > pV2->w ? pV1->w : pV2->w; + return pOut; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Scale + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, FLOAT s) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV) + return NULL; +#endif + + pOut->x = pV->x * s; + pOut->y = pV->y * s; + pOut->z = pV->z * s; + pOut->w = pV->w * s; + return pOut; +} + +D3DXINLINE D3DXVECTOR4* D3DXVec4Lerp + ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV1, CONST D3DXVECTOR4 *pV2, + FLOAT s ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pV1 || !pV2) + return NULL; +#endif + + pOut->x = pV1->x + s * (pV2->x - pV1->x); + pOut->y = pV1->y + s * (pV2->y - pV1->y); + pOut->z = pV1->z + s * (pV2->z - pV1->z); + pOut->w = pV1->w + s * (pV2->w - pV1->w); + return pOut; +} + +/* + * 4D Matrix + */ + +D3DXINLINE D3DXMATRIX* D3DXMatrixIdentity + ( D3DXMATRIX *pOut ) +{ +#ifdef D3DX_DEBUG + if(!pOut) + return NULL; +#endif + + pOut->m[0][1] = pOut->m[0][2] = pOut->m[0][3] = + pOut->m[1][0] = pOut->m[1][2] = pOut->m[1][3] = + pOut->m[2][0] = pOut->m[2][1] = pOut->m[2][3] = + pOut->m[3][0] = pOut->m[3][1] = pOut->m[3][2] = 0.0f; + + pOut->m[0][0] = pOut->m[1][1] = pOut->m[2][2] = pOut->m[3][3] = 1.0f; + return pOut; +} + +D3DXINLINE BOOL D3DXMatrixIsIdentity + ( CONST D3DXMATRIX *pM ) +{ +#ifdef D3DX_DEBUG + if(!pM) + return FALSE; +#endif + + return pM->m[0][0] == 1.0f && pM->m[0][1] == 0.0f && pM->m[0][2] == 0.0f && pM->m[0][3] == 0.0f && + pM->m[1][0] == 0.0f && pM->m[1][1] == 1.0f && pM->m[1][2] == 0.0f && pM->m[1][3] == 0.0f && + pM->m[2][0] == 0.0f && pM->m[2][1] == 0.0f && pM->m[2][2] == 1.0f && pM->m[2][3] == 0.0f && + pM->m[3][0] == 0.0f && pM->m[3][1] == 0.0f && pM->m[3][2] == 0.0f && pM->m[3][3] == 1.0f; +} + +/* + * Quaternion + */ + +D3DXINLINE FLOAT D3DXQuaternionLength + ( CONST D3DXQUATERNION *pQ ) +{ +#ifdef D3DX_DEBUG + if(!pQ) + return 0.0f; +#endif + +#ifdef __cplusplus + return sqrtf(pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w); +#else + return (FLOAT) sqrt(pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w); +#endif +} + +D3DXINLINE FLOAT D3DXQuaternionLengthSq + ( CONST D3DXQUATERNION *pQ ) +{ +#ifdef D3DX_DEBUG + if(!pQ) + return 0.0f; +#endif + + return pQ->x * pQ->x + pQ->y * pQ->y + pQ->z * pQ->z + pQ->w * pQ->w; +} + +D3DXINLINE FLOAT D3DXQuaternionDot + ( CONST D3DXQUATERNION *pQ1, CONST D3DXQUATERNION *pQ2 ) +{ +#ifdef D3DX_DEBUG + if(!pQ1 || !pQ2) + return 0.0f; +#endif + + return pQ1->x * pQ2->x + pQ1->y * pQ2->y + pQ1->z * pQ2->z + pQ1->w * pQ2->w; +} + +D3DXINLINE D3DXQUATERNION* D3DXQuaternionIdentity + ( D3DXQUATERNION *pOut ) +{ +#ifdef D3DX_DEBUG + if(!pOut) + return NULL; +#endif + + pOut->x = pOut->y = pOut->z = 0.0f; + pOut->w = 1.0f; + return pOut; +} + +D3DXINLINE BOOL D3DXQuaternionIsIdentity + ( CONST D3DXQUATERNION *pQ ) +{ +#ifdef D3DX_DEBUG + if(!pQ) + return FALSE; +#endif + + return pQ->x == 0.0f && pQ->y == 0.0f && pQ->z == 0.0f && pQ->w == 1.0f; +} + +D3DXINLINE D3DXQUATERNION* D3DXQuaternionConjugate + ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ ) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pQ) + return NULL; +#endif + + pOut->x = -pQ->x; + pOut->y = -pQ->y; + pOut->z = -pQ->z; + pOut->w = pQ->w; + return pOut; +} + +/* + * Plane + */ + +D3DXINLINE FLOAT D3DXPlaneDot + ( CONST D3DXPLANE *pP, CONST D3DXVECTOR4 *pV) +{ +#ifdef D3DX_DEBUG + if(!pP || !pV) + return 0.0f; +#endif + + return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z + pP->d * pV->w; +} + +D3DXINLINE FLOAT D3DXPlaneDotCoord + ( CONST D3DXPLANE *pP, CONST D3DXVECTOR3 *pV) +{ +#ifdef D3DX_DEBUG + if(!pP || !pV) + return 0.0f; +#endif + + return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z + pP->d; +} + +D3DXINLINE FLOAT D3DXPlaneDotNormal + ( CONST D3DXPLANE *pP, CONST D3DXVECTOR3 *pV) +{ +#ifdef D3DX_DEBUG + if(!pP || !pV) + return 0.0f; +#endif + + return pP->a * pV->x + pP->b * pV->y + pP->c * pV->z; +} + +/* + * Color + */ + +D3DXINLINE D3DXCOLOR* D3DXColorNegative + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC) + return NULL; +#endif + + pOut->r = 1.0f - pC->r; + pOut->g = 1.0f - pC->g; + pOut->b = 1.0f - pC->b; + pOut->a = pC->a; + return pOut; +} + +D3DXINLINE D3DXCOLOR* D3DXColorAdd + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC1 || !pC2) + return NULL; +#endif + + pOut->r = pC1->r + pC2->r; + pOut->g = pC1->g + pC2->g; + pOut->b = pC1->b + pC2->b; + pOut->a = pC1->a + pC2->a; + return pOut; +} + +D3DXINLINE D3DXCOLOR* D3DXColorSubtract + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC1 || !pC2) + return NULL; +#endif + + pOut->r = pC1->r - pC2->r; + pOut->g = pC1->g - pC2->g; + pOut->b = pC1->b - pC2->b; + pOut->a = pC1->a - pC2->a; + return pOut; +} + +D3DXINLINE D3DXCOLOR* D3DXColorScale + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC, FLOAT s) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC) + return NULL; +#endif + + pOut->r = pC->r * s; + pOut->g = pC->g * s; + pOut->b = pC->b * s; + pOut->a = pC->a * s; + return pOut; +} + +D3DXINLINE D3DXCOLOR* D3DXColorModulate + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC1 || !pC2) + return NULL; +#endif + + pOut->r = pC1->r * pC2->r; + pOut->g = pC1->g * pC2->g; + pOut->b = pC1->b * pC2->b; + pOut->a = pC1->a * pC2->a; + return pOut; +} + +D3DXINLINE D3DXCOLOR* D3DXColorLerp + (D3DXCOLOR *pOut, CONST D3DXCOLOR *pC1, CONST D3DXCOLOR *pC2, FLOAT s) +{ +#ifdef D3DX_DEBUG + if(!pOut || !pC1 || !pC2) + return NULL; +#endif + + pOut->r = pC1->r + s * (pC2->r - pC1->r); + pOut->g = pC1->g + s * (pC2->g - pC1->g); + pOut->b = pC1->b + s * (pC2->b - pC1->b); + pOut->a = pC1->a + s * (pC2->a - pC1->a); + return pOut; +} + +#endif /* __D3DX8MATH_INL__ */ diff --git a/gfx/include/d3d9/d3dx9effect.h b/gfx/include/d3d9/d3dx9effect.h index 2d14ebdd61..0dfdc0859b 100644 --- a/gfx/include/d3d9/d3dx9effect.h +++ b/gfx/include/d3d9/d3dx9effect.h @@ -199,7 +199,7 @@ DECLARE_INTERFACE_(ID3DXBaseEffect, IUnknown) STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9 *ppVShader) PURE; /* Set Range of an Array to pass to device - * Useful for sending only a subrange of an + * Useful for sending only a subrange of an * array down to the device */ STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE hParameter, UINT uStart, UINT uEnd) PURE; diff --git a/gfx/include/d3d9/d3dx9math.inl b/gfx/include/d3d9/d3dx9math.inl index 08a408fc7c..51e2c9d639 100644 --- a/gfx/include/d3d9/d3dx9math.inl +++ b/gfx/include/d3d9/d3dx9math.inl @@ -54,7 +54,6 @@ D3DXFLOAT16::operator != ( CONST D3DXFLOAT16& f ) const return value != f.value; } - /* * 2D Vector */ @@ -69,7 +68,7 @@ D3DXVECTOR2::D3DXVECTOR2( CONST FLOAT *pf ) D3DXINLINE D3DXVECTOR2::D3DXVECTOR2( CONST D3DXFLOAT16 *pf ) { - D3DXFloat16To32Array(&x, pf, 2); + D3DXFloat16To32Array(&x, pf, 2); } D3DXINLINE @@ -220,19 +219,18 @@ D3DXVECTOR2_16F::operator CONST D3DXFLOAT16* () const } /* binary operators */ -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR2_16F::operator == ( CONST D3DXVECTOR2_16F &v ) const { return *((DWORD *) &x) == *((DWORD *) &v.x); } -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR2_16F::operator != ( CONST D3DXVECTOR2_16F &v ) const { return *((DWORD *) &x) != *((DWORD *) &v.x); } - /* * 3D Vector */ @@ -356,14 +354,12 @@ D3DXVECTOR3::operator / ( FLOAT f ) const return D3DXVECTOR3(x * fInv, y * fInv, z * fInv); } - D3DXINLINE D3DXVECTOR3 operator * ( FLOAT f, CONST struct D3DXVECTOR3& v ) { return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); } - D3DXINLINE BOOL D3DXVECTOR3::operator == ( CONST D3DXVECTOR3& v ) const { @@ -423,21 +419,20 @@ D3DXVECTOR3_16F::operator CONST D3DXFLOAT16* () const } /* binary operators */ -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR3_16F::operator == ( CONST D3DXVECTOR3_16F &v ) const { return *((DWORD *) &x) == *((DWORD *) &v.x) && *((WORD *) &z) == *((WORD *) &v.z); } -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR3_16F::operator != ( CONST D3DXVECTOR3_16F &v ) const { return *((DWORD *) &x) != *((DWORD *) &v.x) || *((WORD *) &z) != *((WORD *) &v.z); } - /* * 4D Vector */ @@ -574,7 +569,6 @@ operator * ( FLOAT f, CONST D3DXVECTOR4& v ) return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w); } - D3DXINLINE BOOL D3DXVECTOR4::operator == ( CONST D3DXVECTOR4& v ) const { @@ -636,21 +630,20 @@ D3DXVECTOR4_16F::operator CONST D3DXFLOAT16* () const } /* binary operators */ -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR4_16F::operator == ( CONST D3DXVECTOR4_16F &v ) const { return *((DWORD *) &x) == *((DWORD *) &v.x) && *((DWORD *) &z) == *((DWORD *) &v.z); } -D3DXINLINE BOOL +D3DXINLINE BOOL D3DXVECTOR4_16F::operator != ( CONST D3DXVECTOR4_16F &v ) const { return *((DWORD *) &x) != *((DWORD *) &v.x) || *((DWORD *) &z) != *((DWORD *) &v.z); } - /* * Matrix */ @@ -821,7 +814,6 @@ D3DXMATRIX::operator / ( FLOAT f ) const _41 * fInv, _42 * fInv, _43 * fInv, _44 * fInv); } - D3DXINLINE D3DXMATRIX operator * ( FLOAT f, CONST D3DXMATRIX& mat ) { @@ -831,7 +823,6 @@ operator * ( FLOAT f, CONST D3DXMATRIX& mat ) f * mat._41, f * mat._42, f * mat._43, f * mat._44); } - D3DXINLINE BOOL D3DXMATRIX::operator == ( CONST D3DXMATRIX& mat ) const { @@ -849,20 +840,20 @@ D3DXMATRIX::operator != ( CONST D3DXMATRIX& mat ) const */ D3DXINLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST FLOAT* f ) : - D3DXMATRIX( f ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST FLOAT* f ) : + D3DXMATRIX( f ) { } D3DXINLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DMATRIX& m ) : - D3DXMATRIX( m ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DMATRIX& m ) : + D3DXMATRIX( m ) { } D3DXINLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DXFLOAT16* f ) : - D3DXMATRIX( f ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DXFLOAT16* f ) : + D3DXMATRIX( f ) { } @@ -874,7 +865,7 @@ _D3DXMATRIXA16::_D3DXMATRIXA16( FLOAT _11, FLOAT _12, FLOAT _13, FLOAT _14, D3DXMATRIX(_11, _12, _13, _14, _21, _22, _23, _24, _31, _32, _33, _34, - _41, _42, _43, _44) + _41, _42, _43, _44) { } @@ -882,7 +873,7 @@ _D3DXMATRIXA16::_D3DXMATRIXA16( FLOAT _11, FLOAT _12, FLOAT _13, FLOAT _14, #define SIZE_MAX ((SIZE_T)-1) #endif -D3DXINLINE void* +D3DXINLINE void* _D3DXMATRIXA16::operator new( size_t s ) { if (s > (SIZE_MAX-16)) @@ -897,7 +888,7 @@ _D3DXMATRIXA16::operator new( size_t s ) return p; } -D3DXINLINE void* +D3DXINLINE void* _D3DXMATRIXA16::operator new[]( size_t s ) { if (s > (SIZE_MAX-16)) @@ -912,7 +903,7 @@ _D3DXMATRIXA16::operator new[]( size_t s ) return p; } -D3DXINLINE void +D3DXINLINE void _D3DXMATRIXA16::operator delete(void* p) { if(p) @@ -923,7 +914,7 @@ _D3DXMATRIXA16::operator delete(void* p) } } -D3DXINLINE void +D3DXINLINE void _D3DXMATRIXA16::operator delete[](void* p) { if(p) @@ -934,7 +925,7 @@ _D3DXMATRIXA16::operator delete[](void* p) } } -D3DXINLINE _D3DXMATRIXA16& +D3DXINLINE _D3DXMATRIXA16& _D3DXMATRIXA16::operator=(CONST D3DXMATRIX& rhs) { memcpy(&_11, &rhs, sizeof(D3DXMATRIX)); @@ -1078,14 +1069,12 @@ D3DXQUATERNION::operator / ( FLOAT f ) const return D3DXQUATERNION(x * fInv, y * fInv, z * fInv, w * fInv); } - D3DXINLINE D3DXQUATERNION operator * (FLOAT f, CONST D3DXQUATERNION& q ) { return D3DXQUATERNION(f * q.x, f * q.y, f * q.z, f * q.w); } - D3DXINLINE BOOL D3DXQUATERNION::operator == ( CONST D3DXQUATERNION& q ) const { @@ -1265,7 +1254,6 @@ D3DXCOLOR::operator DWORD () const return (dwA << 24) | (dwR << 16) | (dwG << 8) | dwB; } - D3DXINLINE D3DXCOLOR::operator FLOAT * () { @@ -1278,7 +1266,6 @@ D3DXCOLOR::operator CONST FLOAT * () const return (CONST FLOAT *) &r; } - D3DXINLINE D3DXCOLOR::operator D3DCOLORVALUE * () { @@ -1291,7 +1278,6 @@ D3DXCOLOR::operator CONST D3DCOLORVALUE * () const return (CONST D3DCOLORVALUE *) &r; } - D3DXINLINE D3DXCOLOR::operator D3DCOLORVALUE& () { @@ -1385,14 +1371,12 @@ D3DXCOLOR::operator / ( FLOAT f ) const return D3DXCOLOR(r * fInv, g * fInv, b * fInv, a * fInv); } - D3DXINLINE D3DXCOLOR operator * (FLOAT f, CONST D3DXCOLOR& c ) { return D3DXCOLOR(f * c.r, f * c.g, f * c.b, f * c.a); } - D3DXINLINE BOOL D3DXCOLOR::operator == ( CONST D3DXCOLOR& c ) const { @@ -1405,7 +1389,6 @@ D3DXCOLOR::operator != ( CONST D3DXCOLOR& c ) const return r != c.r || g != c.g || b != c.b || a != c.a; } - #endif /*__cplusplus */ /* @@ -1413,7 +1396,6 @@ D3DXCOLOR::operator != ( CONST D3DXCOLOR& c ) const * Inline functions */ - /* * 2D Vector */ @@ -1589,7 +1571,6 @@ D3DXINLINE D3DXVECTOR3* D3DXVec3Lerp return pOut; } - /* * 4D Vector */ @@ -1677,7 +1658,6 @@ D3DXINLINE D3DXVECTOR4* D3DXVec4Lerp return pOut; } - /* * 4D Matrix */ @@ -1694,7 +1674,6 @@ D3DXINLINE D3DXMATRIX* D3DXMatrixIdentity return pOut; } - D3DXINLINE BOOL D3DXMatrixIsIdentity ( CONST D3DXMATRIX *pM ) { @@ -1704,7 +1683,6 @@ D3DXINLINE BOOL D3DXMatrixIsIdentity pM->m[3][0] == 0.0f && pM->m[3][1] == 0.0f && pM->m[3][2] == 0.0f && pM->m[3][3] == 1.0f; } - /* * Quaternion */ @@ -1731,7 +1709,6 @@ D3DXINLINE FLOAT D3DXQuaternionDot return pQ1->x * pQ2->x + pQ1->y * pQ2->y + pQ1->z * pQ2->z + pQ1->w * pQ2->w; } - D3DXINLINE D3DXQUATERNION* D3DXQuaternionIdentity ( D3DXQUATERNION *pOut ) { @@ -1746,7 +1723,6 @@ D3DXINLINE BOOL D3DXQuaternionIsIdentity return pQ->x == 0.0f && pQ->y == 0.0f && pQ->z == 0.0f && pQ->w == 1.0f; } - D3DXINLINE D3DXQUATERNION* D3DXQuaternionConjugate ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ ) { @@ -1789,7 +1765,6 @@ D3DXINLINE D3DXPLANE* D3DXPlaneScale return pOut; } - /* * Color */ @@ -1854,5 +1829,4 @@ D3DXINLINE D3DXCOLOR* D3DXColorLerp return pOut; } - #endif /* __D3DX9MATH_INL__ */ diff --git a/gfx/include/d3d9/d3dx9tex.h b/gfx/include/d3d9/d3dx9tex.h index 757f4f65c3..12ca4bb605 100644 --- a/gfx/include/d3d9/d3dx9tex.h +++ b/gfx/include/d3d9/d3dx9tex.h @@ -56,7 +56,7 @@ typedef enum _D3DXIMAGE_FILEFORMAT D3DXIFF_PPM = 5, D3DXIFF_DIB = 6, D3DXIFF_HDR = 7, /* high dynamic range formats */ - D3DXIFF_PFM = 8, + D3DXIFF_PFM = 8, D3DXIFF_FORCE_DWORD = 0x7fffffff } D3DXIMAGE_FILEFORMAT; diff --git a/gfx/include/dxsdk/d2d1.h b/gfx/include/dxsdk/d2d1.h index adc43ff476..4a5e5e1a18 100644 --- a/gfx/include/dxsdk/d2d1.h +++ b/gfx/include/dxsdk/d2d1.h @@ -77,7 +77,7 @@ typedef interface ID2D1Geometry ID2D1Geometry; typedef interface ID2D1Brush ID2D1Brush; #endif - + #define D2D1_INVALID_TAG ULONGLONG_MAX #define D2D1_DEFAULT_FLATTENING_TOLERANCE (0.25f) @@ -85,7 +85,7 @@ typedef interface ID2D1Brush ID2D1Brush; /// This defines the superset of interpolation mode supported by D2D APIs /// and built-in effects /// -enum +enum { D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR = 0, D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR = 1, @@ -103,12 +103,12 @@ enum /// typedef enum D2D1_GAMMA { - + /// /// Colors are manipulated in 2.2 gamma color space. /// D2D1_GAMMA_2_2 = 0, - + /// /// Colors are manipulated in 1.0 gamma color space. /// @@ -122,17 +122,17 @@ typedef enum D2D1_GAMMA /// typedef enum D2D1_OPACITY_MASK_CONTENT { - + /// /// The mask contains geometries or bitmaps. /// D2D1_OPACITY_MASK_CONTENT_GRAPHICS = 0, - + /// /// The mask contains text rendered using one of the natural text modes. /// D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL = 1, - + /// /// The mask contains text rendered using one of the GDI compatible text modes. /// @@ -146,19 +146,19 @@ typedef enum D2D1_OPACITY_MASK_CONTENT /// typedef enum D2D1_EXTEND_MODE { - + /// /// Extend the edges of the source out by clamping sample points outside the source /// to the edges. /// D2D1_EXTEND_MODE_CLAMP = 0, - + /// /// The base tile is drawn untransformed and the remainder are filled by repeating /// the base tile. /// D2D1_EXTEND_MODE_WRAP = 1, - + /// /// The same as wrap, but alternate tiles are flipped The base tile is drawn /// untransformed. @@ -173,12 +173,12 @@ typedef enum D2D1_EXTEND_MODE /// typedef enum D2D1_ANTIALIAS_MODE { - + /// /// The edges of each primitive are antialiased sequentially. /// D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0, - + /// /// Each pixel is rendered if its pixel center is contained by the geometry. /// @@ -192,22 +192,22 @@ typedef enum D2D1_ANTIALIAS_MODE /// typedef enum D2D1_TEXT_ANTIALIAS_MODE { - + /// /// Render text using the current system setting. /// D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0, - + /// /// Render text using ClearType. /// D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1, - + /// /// Render text using gray-scale. /// D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2, - + /// /// Render text aliased. /// @@ -223,13 +223,13 @@ typedef enum D2D1_TEXT_ANTIALIAS_MODE /// typedef enum D2D1_BITMAP_INTERPOLATION_MODE { - + /// /// Nearest Neighbor filtering. Also known as nearest pixel or nearest point /// sampling. /// D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR = D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR, - + /// /// Linear filtering. /// @@ -244,22 +244,22 @@ typedef enum D2D1_BITMAP_INTERPOLATION_MODE /// typedef enum D2D1_DRAW_TEXT_OPTIONS { - + /// /// Do not snap the baseline of the text vertically. /// D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001, - + /// /// Clip the text to the content bounds. /// D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002, - + /// /// Render color versions of glyphs if defined by the font. /// D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004, - + /// /// Bitmap origins of color glyph bitmaps are not snapped. /// @@ -364,22 +364,22 @@ typedef enum D2D1_ARC_SIZE /// typedef enum D2D1_CAP_STYLE { - + /// /// Flat line cap. /// D2D1_CAP_STYLE_FLAT = 0, - + /// /// Square line cap. /// D2D1_CAP_STYLE_SQUARE = 1, - + /// /// Round line cap. /// D2D1_CAP_STYLE_ROUND = 2, - + /// /// Triangle line cap. /// @@ -408,22 +408,22 @@ typedef enum D2D1_DASH_STYLE /// typedef enum D2D1_LINE_JOIN { - + /// /// Miter join. /// D2D1_LINE_JOIN_MITER = 0, - + /// /// Bevel join. /// D2D1_LINE_JOIN_BEVEL = 1, - + /// /// Round join. /// D2D1_LINE_JOIN_ROUND = 2, - + /// /// Miter/Bevel join. /// @@ -437,25 +437,25 @@ typedef enum D2D1_LINE_JOIN /// typedef enum D2D1_COMBINE_MODE { - + /// /// Produce a geometry representing the set of points contained in either the first /// or the second geometry. /// D2D1_COMBINE_MODE_UNION = 0, - + /// /// Produce a geometry representing the set of points common to the first and the /// second geometries. /// D2D1_COMBINE_MODE_INTERSECT = 1, - + /// /// Produce a geometry representing the set of points contained in the first /// geometry or the second geometry, but not both. /// D2D1_COMBINE_MODE_XOR = 2, - + /// /// Produce a geometry representing the set of points contained in the first /// geometry but not the second geometry. @@ -471,28 +471,28 @@ typedef enum D2D1_COMBINE_MODE /// typedef enum D2D1_GEOMETRY_RELATION { - + /// /// The relation between the geometries couldn't be determined. This value is never /// returned by any D2D method. /// D2D1_GEOMETRY_RELATION_UNKNOWN = 0, - + /// /// The two geometries do not intersect at all. /// D2D1_GEOMETRY_RELATION_DISJOINT = 1, - + /// /// The passed in geometry is entirely contained by the object. /// D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2, - + /// /// The object entirely contains the passed in geometry. /// D2D1_GEOMETRY_RELATION_CONTAINS = 3, - + /// /// The two geometries overlap but neither completely contains the other. /// @@ -661,7 +661,7 @@ typedef struct D2D1_STROKE_STYLE_PROPERTIES typedef enum D2D1_LAYER_OPTIONS { D2D1_LAYER_OPTIONS_NONE = 0x00000000, - + /// /// The layer will render correctly for ClearType text. If the render target was set /// to ClearType previously, the layer will continue to render ClearType. If the @@ -683,43 +683,43 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_LAYER_OPTIONS); /// typedef struct D2D1_LAYER_PARAMETERS { - + /// /// The rectangular clip that will be applied to the layer. The clip is affected by /// the world transform. Content outside of the content bounds will not render. /// D2D1_RECT_F contentBounds; - + /// /// A general mask that can be optionally applied to the content. Content not inside /// the fill of the mask will not be rendered. /// _Field_size_opt_(1) ID2D1Geometry *geometricMask; - + /// /// Specifies whether the mask should be aliased or antialiased. /// D2D1_ANTIALIAS_MODE maskAntialiasMode; - + /// /// An additional transform that may be applied to the mask in addition to the /// current world transform. /// D2D1_MATRIX_3X2_F maskTransform; - + /// /// The opacity with which all of the content in the layer will be blended back to /// the target when the layer is popped. /// FLOAT opacity; - + /// /// An additional brush that can be applied to the layer. Only the opacity channel /// is sampled from this brush and multiplied both with the layer content and the /// over-all layer opacity. /// _Field_size_opt_(1) ID2D1Brush *opacityBrush; - + /// /// Specifies if ClearType will be rendered into the layer. /// @@ -746,17 +746,17 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_WINDOW_STATE); /// typedef enum D2D1_RENDER_TARGET_TYPE { - + /// /// D2D is free to choose the render target type for the caller. /// D2D1_RENDER_TARGET_TYPE_DEFAULT = 0, - + /// /// The render target will render using the CPU. /// D2D1_RENDER_TARGET_TYPE_SOFTWARE = 1, - + /// /// The render target will render using the GPU. /// @@ -771,17 +771,17 @@ typedef enum D2D1_RENDER_TARGET_TYPE /// typedef enum D2D1_FEATURE_LEVEL { - + /// /// The caller does not require a particular underlying D3D device level. /// D2D1_FEATURE_LEVEL_DEFAULT = 0, - + /// /// The D3D device level is DX9 compatible. /// D2D1_FEATURE_LEVEL_9 = D3D_FEATURE_LEVEL_9_1, - + /// /// The D3D device level is DX10 compatible. /// @@ -798,13 +798,13 @@ typedef enum D2D1_FEATURE_LEVEL typedef enum D2D1_RENDER_TARGET_USAGE { D2D1_RENDER_TARGET_USAGE_NONE = 0x00000000, - + /// /// Rendering will occur locally, if a terminal-services session is established, the /// bitmap updates will be sent to the terminal services client. /// D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING = 0x00000001, - + /// /// The render target will allow a call to GetDC on the ID2D1GdiInteropRenderTarget /// interface. Rendering will also occur locally. @@ -822,12 +822,12 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_RENDER_TARGET_USAGE); typedef enum D2D1_PRESENT_OPTIONS { D2D1_PRESENT_OPTIONS_NONE = 0x00000000, - + /// /// Keep the target contents intact through present. /// D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001, - + /// /// Do not wait for display refresh to commit changes to display. /// @@ -873,7 +873,7 @@ typedef struct D2D1_HWND_RENDER_TARGET_PROPERTIES typedef enum D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS { D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE = 0x00000000, - + /// /// The compatible render target will allow a call to GetDC on the /// ID2D1GdiInteropRenderTarget interface. This can be specified even if the parent @@ -906,12 +906,12 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION /// typedef enum D2D1_DC_INITIALIZE_MODE { - + /// /// The contents of the D2D render target will be copied to the DC. /// D2D1_DC_INITIALIZE_MODE_COPY = 0, - + /// /// The contents of the DC will be cleared. /// @@ -939,14 +939,14 @@ typedef enum D2D1_DEBUG_LEVEL /// typedef enum D2D1_FACTORY_TYPE { - + /// /// The resulting factory and derived resources may only be invoked serially. /// Reference counts on resources are interlocked, however, resource and render /// target state is not protected from multi-threaded access. /// D2D1_FACTORY_TYPE_SINGLE_THREADED = 0, - + /// /// The resulting factory may be invoked from multiple threads. Returned resources /// use interlocked reference counting and their state is protected. @@ -961,7 +961,7 @@ typedef enum D2D1_FACTORY_TYPE /// typedef struct D2D1_FACTORY_OPTIONS { - + /// /// Requests a certain level of debugging information from the debug layer. This /// parameter is ignored if the debug layer DLL is not present. @@ -1026,12 +1026,12 @@ EXTERN_C CONST IID IID_ID2D1GdiInteropRenderTarget; /// interface DX_DECLARE_INTERFACE("2cd90691-12e2-11dc-9fed-001143a055f9") ID2D1Resource : public IUnknown { - + /// /// Retrieve the factory associated with this resource. /// STDMETHOD_(void, GetFactory)( - _Outptr_ ID2D1Factory **factory + _Outptr_ ID2D1Factory **factory ) CONST PURE; }; // interface ID2D1Resource @@ -1047,49 +1047,49 @@ interface DX_DECLARE_INTERFACE("65019f75-8da2-497c-b32c-dfa34e48ede6") ID2D1Imag /// interface DX_DECLARE_INTERFACE("a2296057-ea42-4099-983b-539fb6505426") ID2D1Bitmap : public ID2D1Image { - + /// /// Returns the size of the bitmap in resolution independent units. /// STDMETHOD_(D2D1_SIZE_F, GetSize)( ) CONST PURE; - + /// /// Returns the size of the bitmap in resolution dependent units, (pixels). /// STDMETHOD_(D2D1_SIZE_U, GetPixelSize)( ) CONST PURE; - + /// /// Retrieve the format of the bitmap. /// STDMETHOD_(D2D1_PIXEL_FORMAT, GetPixelFormat)( ) CONST PURE; - + /// /// Return the DPI of the bitmap. /// STDMETHOD_(void, GetDpi)( _Out_ FLOAT *dpiX, - _Out_ FLOAT *dpiY + _Out_ FLOAT *dpiY ) CONST PURE; - + STDMETHOD(CopyFromBitmap)( _In_opt_ CONST D2D1_POINT_2U *destPoint, _In_ ID2D1Bitmap *bitmap, - _In_opt_ CONST D2D1_RECT_U *srcRect + _In_opt_ CONST D2D1_RECT_U *srcRect ) PURE; - + STDMETHOD(CopyFromRenderTarget)( _In_opt_ CONST D2D1_POINT_2U *destPoint, _In_ ID2D1RenderTarget *renderTarget, - _In_opt_ CONST D2D1_RECT_U *srcRect + _In_opt_ CONST D2D1_RECT_U *srcRect ) PURE; - + STDMETHOD(CopyFromMemory)( _In_opt_ CONST D2D1_RECT_U *dstRect, _In_ CONST void *srcData, - UINT32 pitch + UINT32 pitch ) PURE; }; // interface ID2D1Bitmap @@ -1099,28 +1099,28 @@ interface DX_DECLARE_INTERFACE("a2296057-ea42-4099-983b-539fb6505426") ID2D1Bitm /// interface DX_DECLARE_INTERFACE("2cd906a7-12e2-11dc-9fed-001143a055f9") ID2D1GradientStopCollection : public ID2D1Resource { - + /// /// Returns the number of stops in the gradient. /// STDMETHOD_(UINT32, GetGradientStopCount)( ) CONST PURE; - + /// /// Copies the gradient stops from the collection into the caller's interface. The /// returned colors have straight alpha. /// STDMETHOD_(void, GetGradientStops)( _Out_writes_to_(gradientStopsCount, _Inexpressible_("Retrieved through GetGradientStopCount()") ) D2D1_GRADIENT_STOP *gradientStops, - UINT32 gradientStopsCount + UINT32 gradientStopsCount ) CONST PURE; - + /// /// Returns whether the interpolation occurs with 1.0 or 2.2 gamma. /// STDMETHOD_(D2D1_GAMMA, GetColorInterpolationGamma)( ) CONST PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendMode)( ) CONST PURE; }; // interface ID2D1GradientStopCollection @@ -1130,33 +1130,33 @@ interface DX_DECLARE_INTERFACE("2cd906a7-12e2-11dc-9fed-001143a055f9") ID2D1Grad /// interface DX_DECLARE_INTERFACE("2cd906a8-12e2-11dc-9fed-001143a055f9") ID2D1Brush : public ID2D1Resource { - + /// /// Sets the opacity for when the brush is drawn over the entire fill of the brush. /// STDMETHOD_(void, SetOpacity)( - FLOAT opacity + FLOAT opacity ) PURE; - + /// /// Sets the transform that applies to everything drawn by the brush. /// STDMETHOD_(void, SetTransform)( - _In_ CONST D2D1_MATRIX_3X2_F *transform + _In_ CONST D2D1_MATRIX_3X2_F *transform ) PURE; - + STDMETHOD_(FLOAT, GetOpacity)( ) CONST PURE; - + STDMETHOD_(void, GetTransform)( - _Out_ D2D1_MATRIX_3X2_F *transform + _Out_ D2D1_MATRIX_3X2_F *transform ) CONST PURE; - + COM_DECLSPEC_NOTHROW void SetTransform( - CONST D2D1_MATRIX_3X2_F &transform - ) + CONST D2D1_MATRIX_3X2_F &transform + ) { SetTransform(&transform); } @@ -1167,48 +1167,48 @@ interface DX_DECLARE_INTERFACE("2cd906a8-12e2-11dc-9fed-001143a055f9") ID2D1Brus /// interface DX_DECLARE_INTERFACE("2cd906aa-12e2-11dc-9fed-001143a055f9") ID2D1BitmapBrush : public ID2D1Brush { - + /// /// Sets how the bitmap is to be treated outside of its natural extent on the X /// axis. /// STDMETHOD_(void, SetExtendModeX)( - D2D1_EXTEND_MODE extendModeX + D2D1_EXTEND_MODE extendModeX ) PURE; - + /// /// Sets how the bitmap is to be treated outside of its natural extent on the X /// axis. /// STDMETHOD_(void, SetExtendModeY)( - D2D1_EXTEND_MODE extendModeY + D2D1_EXTEND_MODE extendModeY ) PURE; - + /// /// Sets the interpolation mode used when this brush is used. /// STDMETHOD_(void, SetInterpolationMode)( - D2D1_BITMAP_INTERPOLATION_MODE interpolationMode + D2D1_BITMAP_INTERPOLATION_MODE interpolationMode ) PURE; - + /// /// Sets the bitmap associated as the source of this brush. /// STDMETHOD_(void, SetBitmap)( - _In_opt_ ID2D1Bitmap *bitmap + _In_opt_ ID2D1Bitmap *bitmap ) PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeX)( ) CONST PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeY)( ) CONST PURE; - + STDMETHOD_(D2D1_BITMAP_INTERPOLATION_MODE, GetInterpolationMode)( ) CONST PURE; - + STDMETHOD_(void, GetBitmap)( - _Outptr_result_maybenull_ ID2D1Bitmap **bitmap + _Outptr_result_maybenull_ ID2D1Bitmap **bitmap ) CONST PURE; }; // interface ID2D1BitmapBrush @@ -1217,19 +1217,19 @@ interface DX_DECLARE_INTERFACE("2cd906aa-12e2-11dc-9fed-001143a055f9") ID2D1Bitm /// interface DX_DECLARE_INTERFACE("2cd906a9-12e2-11dc-9fed-001143a055f9") ID2D1SolidColorBrush : public ID2D1Brush { - + STDMETHOD_(void, SetColor)( - _In_ CONST D2D1_COLOR_F *color + _In_ CONST D2D1_COLOR_F *color ) PURE; - + STDMETHOD_(D2D1_COLOR_F, GetColor)( ) CONST PURE; - + COM_DECLSPEC_NOTHROW void SetColor( - CONST D2D1_COLOR_F &color - ) + CONST D2D1_COLOR_F &color + ) { SetColor(&color); } @@ -1240,27 +1240,27 @@ interface DX_DECLARE_INTERFACE("2cd906a9-12e2-11dc-9fed-001143a055f9") ID2D1Soli /// interface DX_DECLARE_INTERFACE("2cd906ab-12e2-11dc-9fed-001143a055f9") ID2D1LinearGradientBrush : public ID2D1Brush { - + STDMETHOD_(void, SetStartPoint)( - D2D1_POINT_2F startPoint + D2D1_POINT_2F startPoint ) PURE; - + /// /// Sets the end point of the gradient in local coordinate space. This is not /// influenced by the geometry being filled. /// STDMETHOD_(void, SetEndPoint)( - D2D1_POINT_2F endPoint + D2D1_POINT_2F endPoint ) PURE; - + STDMETHOD_(D2D1_POINT_2F, GetStartPoint)( ) CONST PURE; - + STDMETHOD_(D2D1_POINT_2F, GetEndPoint)( ) CONST PURE; - + STDMETHOD_(void, GetGradientStopCollection)( - _Outptr_ ID2D1GradientStopCollection **gradientStopCollection + _Outptr_ ID2D1GradientStopCollection **gradientStopCollection ) CONST PURE; }; // interface ID2D1LinearGradientBrush @@ -1269,44 +1269,44 @@ interface DX_DECLARE_INTERFACE("2cd906ab-12e2-11dc-9fed-001143a055f9") ID2D1Line /// interface DX_DECLARE_INTERFACE("2cd906ac-12e2-11dc-9fed-001143a055f9") ID2D1RadialGradientBrush : public ID2D1Brush { - + /// /// Sets the center of the radial gradient. This will be in local coordinates and /// will not depend on the geometry being filled. /// STDMETHOD_(void, SetCenter)( - D2D1_POINT_2F center + D2D1_POINT_2F center ) PURE; - + /// /// Sets offset of the origin relative to the radial gradient center. /// STDMETHOD_(void, SetGradientOriginOffset)( - D2D1_POINT_2F gradientOriginOffset + D2D1_POINT_2F gradientOriginOffset ) PURE; - + STDMETHOD_(void, SetRadiusX)( - FLOAT radiusX + FLOAT radiusX ) PURE; - + STDMETHOD_(void, SetRadiusY)( - FLOAT radiusY + FLOAT radiusY ) PURE; - + STDMETHOD_(D2D1_POINT_2F, GetCenter)( ) CONST PURE; - + STDMETHOD_(D2D1_POINT_2F, GetGradientOriginOffset)( ) CONST PURE; - + STDMETHOD_(FLOAT, GetRadiusX)( ) CONST PURE; - + STDMETHOD_(FLOAT, GetRadiusY)( ) CONST PURE; - + STDMETHOD_(void, GetGradientStopCollection)( - _Outptr_ ID2D1GradientStopCollection **gradientStopCollection + _Outptr_ ID2D1GradientStopCollection **gradientStopCollection ) CONST PURE; }; // interface ID2D1RadialGradientBrush @@ -1315,38 +1315,38 @@ interface DX_DECLARE_INTERFACE("2cd906ac-12e2-11dc-9fed-001143a055f9") ID2D1Radi /// interface DX_DECLARE_INTERFACE("2cd9069d-12e2-11dc-9fed-001143a055f9") ID2D1StrokeStyle : public ID2D1Resource { - + STDMETHOD_(D2D1_CAP_STYLE, GetStartCap)( ) CONST PURE; - + STDMETHOD_(D2D1_CAP_STYLE, GetEndCap)( ) CONST PURE; - + STDMETHOD_(D2D1_CAP_STYLE, GetDashCap)( ) CONST PURE; - + STDMETHOD_(FLOAT, GetMiterLimit)( ) CONST PURE; - + STDMETHOD_(D2D1_LINE_JOIN, GetLineJoin)( ) CONST PURE; - + STDMETHOD_(FLOAT, GetDashOffset)( ) CONST PURE; - + STDMETHOD_(D2D1_DASH_STYLE, GetDashStyle)( ) CONST PURE; - + STDMETHOD_(UINT32, GetDashesCount)( ) CONST PURE; - + /// /// Returns the dashes from the object into a user allocated array. The user must /// call GetDashesCount to retrieve the required size. /// STDMETHOD_(void, GetDashes)( _Out_writes_(dashesCount) FLOAT *dashes, - UINT32 dashesCount + UINT32 dashesCount ) CONST PURE; }; // interface ID2D1StrokeStyle @@ -1357,15 +1357,15 @@ interface DX_DECLARE_INTERFACE("2cd9069d-12e2-11dc-9fed-001143a055f9") ID2D1Stro /// interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geometry : public ID2D1Resource { - + /// /// Retrieve the bounds of the geometry, with an optional applied transform. /// STDMETHOD(GetBounds)( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) CONST PURE; - + /// /// Get the bounds of the corresponding geometry after it has been widened or have /// an optional pen style applied. @@ -1375,9 +1375,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) CONST PURE; - + /// /// Checks to see whether the corresponding penned and widened geometry contains the /// given point. @@ -1388,9 +1388,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ BOOL *contains + _Out_ BOOL *contains ) CONST PURE; - + /// /// Test whether the given fill of this geometry would contain this point. /// @@ -1398,9 +1398,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom D2D1_POINT_2F point, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ BOOL *contains + _Out_ BOOL *contains ) CONST PURE; - + /// /// Compare how one geometry intersects or contains another geometry. /// @@ -1408,9 +1408,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_ ID2D1Geometry *inputGeometry, _In_opt_ CONST D2D1_MATRIX_3X2_F *inputGeometryTransform, FLOAT flatteningTolerance, - _Out_ D2D1_GEOMETRY_RELATION *relation + _Out_ D2D1_GEOMETRY_RELATION *relation ) CONST PURE; - + /// /// Converts a geometry to a simplified geometry that has arcs and quadratic beziers /// removed. @@ -1419,18 +1419,18 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom D2D1_GEOMETRY_SIMPLIFICATION_OPTION simplificationOption, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink + _In_ ID2D1SimplifiedGeometrySink *geometrySink ) CONST PURE; - + /// /// Tessellates a geometry into triangles. /// STDMETHOD(Tessellate)( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1TessellationSink *tessellationSink + _In_ ID2D1TessellationSink *tessellationSink ) CONST PURE; - + /// /// Performs a combine operation between the two geometries to produce a resulting /// geometry. @@ -1440,9 +1440,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom D2D1_COMBINE_MODE combineMode, _In_opt_ CONST D2D1_MATRIX_3X2_F *inputGeometryTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink + _In_ ID2D1SimplifiedGeometrySink *geometrySink ) CONST PURE; - + /// /// Computes the outline of the geometry. The result is written back into a /// simplified geometry sink. @@ -1450,27 +1450,27 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom STDMETHOD(Outline)( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink + _In_ ID2D1SimplifiedGeometrySink *geometrySink ) CONST PURE; - + /// /// Computes the area of the geometry. /// STDMETHOD(ComputeArea)( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ FLOAT *area + _Out_ FLOAT *area ) CONST PURE; - + /// /// Computes the length of the geometry. /// STDMETHOD(ComputeLength)( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ FLOAT *length + _Out_ FLOAT *length ) CONST PURE; - + /// /// Computes the point and tangent a given distance along the path. /// @@ -1479,9 +1479,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, _Out_opt_ D2D1_POINT_2F *point, - _Out_opt_ D2D1_POINT_2F *unitTangentVector + _Out_opt_ D2D1_POINT_2F *unitTangentVector ) CONST PURE; - + /// /// Get the geometry and widen it as well as apply an optional pen style. /// @@ -1490,9 +1490,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink + _In_ ID2D1SimplifiedGeometrySink *geometrySink ) CONST PURE; - + /// /// Retrieve the bounds of the geometry, with an optional applied transform. /// @@ -1500,12 +1500,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT GetBounds( CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ D2D1_RECT_F *bounds - ) CONST + _Out_ D2D1_RECT_F *bounds + ) CONST { return GetBounds(&worldTransform, bounds); } - + /// /// Get the bounds of the corresponding geometry after it has been widened or have /// an optional pen style applied. @@ -1517,12 +1517,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ D2D1_RECT_F *bounds - ) CONST + _Out_ D2D1_RECT_F *bounds + ) CONST { return GetWidenedBounds(strokeWidth, strokeStyle, &worldTransform, flatteningTolerance, bounds); } - + /// /// Get the bounds of the corresponding geometry after it has been widened or have /// an optional pen style applied. @@ -1533,12 +1533,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ D2D1_RECT_F *bounds - ) CONST + _Out_ D2D1_RECT_F *bounds + ) CONST { return GetWidenedBounds(strokeWidth, strokeStyle, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, bounds); } - + /// /// Get the bounds of the corresponding geometry after it has been widened or have /// an optional pen style applied. @@ -1549,12 +1549,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ D2D1_RECT_F *bounds - ) CONST + _Out_ D2D1_RECT_F *bounds + ) CONST { return GetWidenedBounds(strokeWidth, strokeStyle, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, bounds); } - + COM_DECLSPEC_NOTHROW HRESULT StrokeContainsPoint( @@ -1563,12 +1563,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return StrokeContainsPoint(point, strokeWidth, strokeStyle, &worldTransform, flatteningTolerance, contains); } - + /// /// Checks to see whether the corresponding penned and widened geometry contains the /// given point. @@ -1580,12 +1580,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return StrokeContainsPoint(point, strokeWidth, strokeStyle, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, contains); } - + COM_DECLSPEC_NOTHROW HRESULT StrokeContainsPoint( @@ -1593,24 +1593,24 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return StrokeContainsPoint(point, strokeWidth, strokeStyle, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, contains); } - + COM_DECLSPEC_NOTHROW HRESULT FillContainsPoint( D2D1_POINT_2F point, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return FillContainsPoint(point, &worldTransform, flatteningTolerance, contains); } - + /// /// Test whether the given fill of this geometry would contain this point. /// @@ -1619,23 +1619,23 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FillContainsPoint( D2D1_POINT_2F point, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return FillContainsPoint(point, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, contains); } - + COM_DECLSPEC_NOTHROW HRESULT FillContainsPoint( D2D1_POINT_2F point, CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ BOOL *contains - ) CONST + _Out_ BOOL *contains + ) CONST { return FillContainsPoint(point, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, contains); } - + /// /// Compare how one geometry intersects or contains another geometry. /// @@ -1645,12 +1645,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_ ID2D1Geometry *inputGeometry, CONST D2D1_MATRIX_3X2_F &inputGeometryTransform, FLOAT flatteningTolerance, - _Out_ D2D1_GEOMETRY_RELATION *relation - ) CONST + _Out_ D2D1_GEOMETRY_RELATION *relation + ) CONST { return CompareWithGeometry(inputGeometry, &inputGeometryTransform, flatteningTolerance, relation); } - + /// /// Compare how one geometry intersects or contains another geometry. /// @@ -1659,12 +1659,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom CompareWithGeometry( _In_ ID2D1Geometry *inputGeometry, _In_opt_ CONST D2D1_MATRIX_3X2_F *inputGeometryTransform, - _Out_ D2D1_GEOMETRY_RELATION *relation - ) CONST + _Out_ D2D1_GEOMETRY_RELATION *relation + ) CONST { return CompareWithGeometry(inputGeometry, inputGeometryTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, relation); } - + /// /// Compare how one geometry intersects or contains another geometry. /// @@ -1673,12 +1673,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom CompareWithGeometry( _In_ ID2D1Geometry *inputGeometry, CONST D2D1_MATRIX_3X2_F &inputGeometryTransform, - _Out_ D2D1_GEOMETRY_RELATION *relation - ) CONST + _Out_ D2D1_GEOMETRY_RELATION *relation + ) CONST { return CompareWithGeometry(inputGeometry, &inputGeometryTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, relation); } - + /// /// Converts a geometry to a simplified geometry that has arcs and quadratic beziers /// removed. @@ -1689,12 +1689,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom D2D1_GEOMETRY_SIMPLIFICATION_OPTION simplificationOption, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Simplify(simplificationOption, &worldTransform, flatteningTolerance, geometrySink); } - + /// /// Converts a geometry to a simplified geometry that has arcs and quadratic beziers /// removed. @@ -1704,12 +1704,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom Simplify( D2D1_GEOMETRY_SIMPLIFICATION_OPTION simplificationOption, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Simplify(simplificationOption, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Converts a geometry to a simplified geometry that has arcs and quadratic beziers /// removed. @@ -1719,12 +1719,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom Simplify( D2D1_GEOMETRY_SIMPLIFICATION_OPTION simplificationOption, CONST D2D1_MATRIX_3X2_F &worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Simplify(simplificationOption, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Tessellates a geometry into triangles. /// @@ -1733,12 +1733,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom Tessellate( CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1TessellationSink *tessellationSink - ) CONST + _In_ ID2D1TessellationSink *tessellationSink + ) CONST { return Tessellate(&worldTransform, flatteningTolerance, tessellationSink); } - + /// /// Tessellates a geometry into triangles. /// @@ -1746,12 +1746,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT Tessellate( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _In_ ID2D1TessellationSink *tessellationSink - ) CONST + _In_ ID2D1TessellationSink *tessellationSink + ) CONST { return Tessellate(worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, tessellationSink); } - + /// /// Tessellates a geometry into triangles. /// @@ -1759,12 +1759,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT Tessellate( CONST D2D1_MATRIX_3X2_F &worldTransform, - _In_ ID2D1TessellationSink *tessellationSink - ) CONST + _In_ ID2D1TessellationSink *tessellationSink + ) CONST { return Tessellate(&worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, tessellationSink); } - + /// /// Performs a combine operation between the two geometries to produce a resulting /// geometry. @@ -1776,12 +1776,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom D2D1_COMBINE_MODE combineMode, CONST D2D1_MATRIX_3X2_F &inputGeometryTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return CombineWithGeometry(inputGeometry, combineMode, &inputGeometryTransform, flatteningTolerance, geometrySink); } - + /// /// Performs a combine operation between the two geometries to produce a resulting /// geometry. @@ -1792,12 +1792,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_ ID2D1Geometry *inputGeometry, D2D1_COMBINE_MODE combineMode, _In_opt_ CONST D2D1_MATRIX_3X2_F *inputGeometryTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return CombineWithGeometry(inputGeometry, combineMode, inputGeometryTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Performs a combine operation between the two geometries to produce a resulting /// geometry. @@ -1808,12 +1808,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_ ID2D1Geometry *inputGeometry, D2D1_COMBINE_MODE combineMode, CONST D2D1_MATRIX_3X2_F &inputGeometryTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return CombineWithGeometry(inputGeometry, combineMode, &inputGeometryTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Computes the outline of the geometry. The result is written back into a /// simplified geometry sink. @@ -1823,12 +1823,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom Outline( CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Outline(&worldTransform, flatteningTolerance, geometrySink); } - + /// /// Computes the outline of the geometry. The result is written back into a /// simplified geometry sink. @@ -1837,12 +1837,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT Outline( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Outline(worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Computes the outline of the geometry. The result is written back into a /// simplified geometry sink. @@ -1851,12 +1851,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT Outline( CONST D2D1_MATRIX_3X2_F &worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Outline(&worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Computes the area of the geometry. /// @@ -1865,12 +1865,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom ComputeArea( CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ FLOAT *area - ) CONST + _Out_ FLOAT *area + ) CONST { return ComputeArea(&worldTransform, flatteningTolerance, area); } - + /// /// Computes the area of the geometry. /// @@ -1878,12 +1878,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT ComputeArea( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ FLOAT *area - ) CONST + _Out_ FLOAT *area + ) CONST { return ComputeArea(worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, area); } - + /// /// Computes the area of the geometry. /// @@ -1891,12 +1891,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT ComputeArea( CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ FLOAT *area - ) CONST + _Out_ FLOAT *area + ) CONST { return ComputeArea(&worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, area); } - + /// /// Computes the length of the geometry. /// @@ -1905,12 +1905,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom ComputeLength( CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ FLOAT *length - ) CONST + _Out_ FLOAT *length + ) CONST { return ComputeLength(&worldTransform, flatteningTolerance, length); } - + /// /// Computes the length of the geometry. /// @@ -1918,12 +1918,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT ComputeLength( _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ FLOAT *length - ) CONST + _Out_ FLOAT *length + ) CONST { return ComputeLength(worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, length); } - + /// /// Computes the length of the geometry. /// @@ -1931,12 +1931,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom HRESULT ComputeLength( CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ FLOAT *length - ) CONST + _Out_ FLOAT *length + ) CONST { return ComputeLength(&worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, length); } - + /// /// Computes the point and tangent a given distance along the path. /// @@ -1947,12 +1947,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, _Out_opt_ D2D1_POINT_2F *point, - _Out_opt_ D2D1_POINT_2F *unitTangentVector - ) CONST + _Out_opt_ D2D1_POINT_2F *unitTangentVector + ) CONST { return ComputePointAtLength(length, &worldTransform, flatteningTolerance, point, unitTangentVector); } - + /// /// Computes the point and tangent a given distance along the path. /// @@ -1962,12 +1962,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT length, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, _Out_opt_ D2D1_POINT_2F *point, - _Out_opt_ D2D1_POINT_2F *unitTangentVector - ) CONST + _Out_opt_ D2D1_POINT_2F *unitTangentVector + ) CONST { return ComputePointAtLength(length, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, point, unitTangentVector); } - + /// /// Computes the point and tangent a given distance along the path. /// @@ -1977,12 +1977,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT length, CONST D2D1_MATRIX_3X2_F &worldTransform, _Out_opt_ D2D1_POINT_2F *point, - _Out_opt_ D2D1_POINT_2F *unitTangentVector - ) CONST + _Out_opt_ D2D1_POINT_2F *unitTangentVector + ) CONST { return ComputePointAtLength(length, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, point, unitTangentVector); } - + /// /// Get the geometry and widen it as well as apply an optional pen style. /// @@ -1993,12 +1993,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Widen(strokeWidth, strokeStyle, &worldTransform, flatteningTolerance, geometrySink); } - + /// /// Get the geometry and widen it as well as apply an optional pen style. /// @@ -2008,12 +2008,12 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Widen(strokeWidth, strokeStyle, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Get the geometry and widen it as well as apply an optional pen style. /// @@ -2023,8 +2023,8 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return Widen(strokeWidth, strokeStyle, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } @@ -2035,9 +2035,9 @@ interface DX_DECLARE_INTERFACE("2cd906a1-12e2-11dc-9fed-001143a055f9") ID2D1Geom /// interface DX_DECLARE_INTERFACE("2cd906a2-12e2-11dc-9fed-001143a055f9") ID2D1RectangleGeometry : public ID2D1Geometry { - + STDMETHOD_(void, GetRect)( - _Out_ D2D1_RECT_F *rect + _Out_ D2D1_RECT_F *rect ) CONST PURE; }; // interface ID2D1RectangleGeometry @@ -2046,9 +2046,9 @@ interface DX_DECLARE_INTERFACE("2cd906a2-12e2-11dc-9fed-001143a055f9") ID2D1Rect /// interface DX_DECLARE_INTERFACE("2cd906a3-12e2-11dc-9fed-001143a055f9") ID2D1RoundedRectangleGeometry : public ID2D1Geometry { - + STDMETHOD_(void, GetRoundedRect)( - _Out_ D2D1_ROUNDED_RECT *roundedRect + _Out_ D2D1_ROUNDED_RECT *roundedRect ) CONST PURE; }; // interface ID2D1RoundedRectangleGeometry @@ -2057,9 +2057,9 @@ interface DX_DECLARE_INTERFACE("2cd906a3-12e2-11dc-9fed-001143a055f9") ID2D1Roun /// interface DX_DECLARE_INTERFACE("2cd906a4-12e2-11dc-9fed-001143a055f9") ID2D1EllipseGeometry : public ID2D1Geometry { - + STDMETHOD_(void, GetEllipse)( - _Out_ D2D1_ELLIPSE *ellipse + _Out_ D2D1_ELLIPSE *ellipse ) CONST PURE; }; // interface ID2D1EllipseGeometry @@ -2068,16 +2068,16 @@ interface DX_DECLARE_INTERFACE("2cd906a4-12e2-11dc-9fed-001143a055f9") ID2D1Elli /// interface DX_DECLARE_INTERFACE("2cd906a6-12e2-11dc-9fed-001143a055f9") ID2D1GeometryGroup : public ID2D1Geometry { - + STDMETHOD_(D2D1_FILL_MODE, GetFillMode)( ) CONST PURE; - + STDMETHOD_(UINT32, GetSourceGeometryCount)( ) CONST PURE; - + STDMETHOD_(void, GetSourceGeometries)( _Out_writes_(geometriesCount) ID2D1Geometry **geometries, - UINT32 geometriesCount + UINT32 geometriesCount ) CONST PURE; }; // interface ID2D1GeometryGroup @@ -2086,13 +2086,13 @@ interface DX_DECLARE_INTERFACE("2cd906a6-12e2-11dc-9fed-001143a055f9") ID2D1Geom /// interface DX_DECLARE_INTERFACE("2cd906bb-12e2-11dc-9fed-001143a055f9") ID2D1TransformedGeometry : public ID2D1Geometry { - + STDMETHOD_(void, GetSourceGeometry)( - _Outptr_ ID2D1Geometry **sourceGeometry + _Outptr_ ID2D1Geometry **sourceGeometry ) CONST PURE; - + STDMETHOD_(void, GetTransform)( - _Out_ D2D1_MATRIX_3X2_F *transform + _Out_ D2D1_MATRIX_3X2_F *transform ) CONST PURE; }; // interface ID2D1TransformedGeometry @@ -2102,34 +2102,34 @@ interface DX_DECLARE_INTERFACE("2cd906bb-12e2-11dc-9fed-001143a055f9") ID2D1Tran /// interface DX_DECLARE_INTERFACE("2cd9069e-12e2-11dc-9fed-001143a055f9") ID2D1SimplifiedGeometrySink : public IUnknown { - + STDMETHOD_(void, SetFillMode)( - D2D1_FILL_MODE fillMode + D2D1_FILL_MODE fillMode ) PURE; - + STDMETHOD_(void, SetSegmentFlags)( - D2D1_PATH_SEGMENT vertexFlags + D2D1_PATH_SEGMENT vertexFlags ) PURE; - + STDMETHOD_(void, BeginFigure)( D2D1_POINT_2F startPoint, - D2D1_FIGURE_BEGIN figureBegin + D2D1_FIGURE_BEGIN figureBegin ) PURE; - + STDMETHOD_(void, AddLines)( _In_reads_(pointsCount) CONST D2D1_POINT_2F *points, - UINT32 pointsCount + UINT32 pointsCount ) PURE; - + STDMETHOD_(void, AddBeziers)( _In_reads_(beziersCount) CONST D2D1_BEZIER_SEGMENT *beziers, - UINT32 beziersCount + UINT32 beziersCount ) PURE; - + STDMETHOD_(void, EndFigure)( - D2D1_FIGURE_END figureEnd + D2D1_FIGURE_END figureEnd ) PURE; - + STDMETHOD(Close)( ) PURE; }; // interface ID2D1SimplifiedGeometrySink @@ -2140,51 +2140,51 @@ interface DX_DECLARE_INTERFACE("2cd9069e-12e2-11dc-9fed-001143a055f9") ID2D1Simp /// interface DX_DECLARE_INTERFACE("2cd9069f-12e2-11dc-9fed-001143a055f9") ID2D1GeometrySink : public ID2D1SimplifiedGeometrySink { - + STDMETHOD_(void, AddLine)( - D2D1_POINT_2F point + D2D1_POINT_2F point ) PURE; - + STDMETHOD_(void, AddBezier)( - _In_ CONST D2D1_BEZIER_SEGMENT *bezier + _In_ CONST D2D1_BEZIER_SEGMENT *bezier ) PURE; - + STDMETHOD_(void, AddQuadraticBezier)( - _In_ CONST D2D1_QUADRATIC_BEZIER_SEGMENT *bezier + _In_ CONST D2D1_QUADRATIC_BEZIER_SEGMENT *bezier ) PURE; - + STDMETHOD_(void, AddQuadraticBeziers)( _In_reads_(beziersCount) CONST D2D1_QUADRATIC_BEZIER_SEGMENT *beziers, - UINT32 beziersCount + UINT32 beziersCount ) PURE; - + STDMETHOD_(void, AddArc)( - _In_ CONST D2D1_ARC_SEGMENT *arc + _In_ CONST D2D1_ARC_SEGMENT *arc ) PURE; - + COM_DECLSPEC_NOTHROW void AddBezier( - CONST D2D1_BEZIER_SEGMENT &bezier - ) + CONST D2D1_BEZIER_SEGMENT &bezier + ) { AddBezier(&bezier); } - + COM_DECLSPEC_NOTHROW void AddQuadraticBezier( - CONST D2D1_QUADRATIC_BEZIER_SEGMENT &bezier - ) + CONST D2D1_QUADRATIC_BEZIER_SEGMENT &bezier + ) { AddQuadraticBezier(&bezier); } - + COM_DECLSPEC_NOTHROW void AddArc( - CONST D2D1_ARC_SEGMENT &arc - ) + CONST D2D1_ARC_SEGMENT &arc + ) { AddArc(&arc); } @@ -2195,12 +2195,12 @@ interface DX_DECLARE_INTERFACE("2cd9069f-12e2-11dc-9fed-001143a055f9") ID2D1Geom /// interface DX_DECLARE_INTERFACE("2cd906c1-12e2-11dc-9fed-001143a055f9") ID2D1TessellationSink : public IUnknown { - + STDMETHOD_(void, AddTriangles)( _In_reads_(trianglesCount) CONST D2D1_TRIANGLE *triangles, - UINT32 trianglesCount + UINT32 trianglesCount ) PURE; - + STDMETHOD(Close)( ) PURE; }; // interface ID2D1TessellationSink @@ -2210,28 +2210,28 @@ interface DX_DECLARE_INTERFACE("2cd906c1-12e2-11dc-9fed-001143a055f9") ID2D1Tess /// interface DX_DECLARE_INTERFACE("2cd906a5-12e2-11dc-9fed-001143a055f9") ID2D1PathGeometry : public ID2D1Geometry { - + /// /// Opens a geometry sink that will be used to create this path geometry. /// STDMETHOD(Open)( - _COM_Outptr_ ID2D1GeometrySink **geometrySink + _COM_Outptr_ ID2D1GeometrySink **geometrySink ) PURE; - + /// /// Retrieve the contents of this geometry. The caller passes an implementation of a /// ID2D1GeometrySink interface to receive the data. /// STDMETHOD(Stream)( - _In_ ID2D1GeometrySink *geometrySink + _In_ ID2D1GeometrySink *geometrySink ) CONST PURE; - + STDMETHOD(GetSegmentCount)( - _Out_ UINT32 *count + _Out_ UINT32 *count ) CONST PURE; - + STDMETHOD(GetFigureCount)( - _Out_ UINT32 *count + _Out_ UINT32 *count ) CONST PURE; }; // interface ID2D1PathGeometry @@ -2240,12 +2240,12 @@ interface DX_DECLARE_INTERFACE("2cd906a5-12e2-11dc-9fed-001143a055f9") ID2D1Path /// interface DX_DECLARE_INTERFACE("2cd906c2-12e2-11dc-9fed-001143a055f9") ID2D1Mesh : public ID2D1Resource { - + /// /// Opens the mesh for population. /// STDMETHOD(Open)( - _COM_Outptr_ ID2D1TessellationSink **tessellationSink + _COM_Outptr_ ID2D1TessellationSink **tessellationSink ) PURE; }; // interface ID2D1Mesh @@ -2254,7 +2254,7 @@ interface DX_DECLARE_INTERFACE("2cd906c2-12e2-11dc-9fed-001143a055f9") ID2D1Mesh /// interface DX_DECLARE_INTERFACE("2cd9069b-12e2-11dc-9fed-001143a055f9") ID2D1Layer : public ID2D1Resource { - + STDMETHOD_(D2D1_SIZE_F, GetSize)( ) CONST PURE; }; // interface ID2D1Layer @@ -2265,42 +2265,42 @@ interface DX_DECLARE_INTERFACE("2cd9069b-12e2-11dc-9fed-001143a055f9") ID2D1Laye /// interface DX_DECLARE_INTERFACE("28506e39-ebf6-46a1-bb47-fd85565ab957") ID2D1DrawingStateBlock : public ID2D1Resource { - + /// /// Retrieves the state currently contained within this state block resource. /// STDMETHOD_(void, GetDescription)( - _Out_ D2D1_DRAWING_STATE_DESCRIPTION *stateDescription + _Out_ D2D1_DRAWING_STATE_DESCRIPTION *stateDescription ) CONST PURE; - + /// /// Sets the state description of this state block resource. /// STDMETHOD_(void, SetDescription)( - _In_ CONST D2D1_DRAWING_STATE_DESCRIPTION *stateDescription + _In_ CONST D2D1_DRAWING_STATE_DESCRIPTION *stateDescription ) PURE; - + /// /// Sets the text rendering parameters of this state block resource. /// STDMETHOD_(void, SetTextRenderingParams)( - _In_opt_ IDWriteRenderingParams *textRenderingParams = NULL + _In_opt_ IDWriteRenderingParams *textRenderingParams = NULL ) PURE; - + /// /// Retrieves the text rendering parameters contained within this state block /// resource. If a NULL text rendering parameter was specified, NULL will be /// returned. /// STDMETHOD_(void, GetTextRenderingParams)( - _Outptr_result_maybenull_ IDWriteRenderingParams **textRenderingParams + _Outptr_result_maybenull_ IDWriteRenderingParams **textRenderingParams ) CONST PURE; - + COM_DECLSPEC_NOTHROW void SetDescription( - CONST D2D1_DRAWING_STATE_DESCRIPTION &stateDescription - ) + CONST D2D1_DRAWING_STATE_DESCRIPTION &stateDescription + ) { SetDescription(&stateDescription); } @@ -2313,7 +2313,7 @@ interface DX_DECLARE_INTERFACE("28506e39-ebf6-46a1-bb47-fd85565ab957") ID2D1Draw /// interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1RenderTarget : public ID2D1Resource { - + /// /// Create a D2D bitmap by copying from memory, or create uninitialized. /// @@ -2322,18 +2322,18 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_opt_ CONST void *srcData, UINT32 pitch, _In_ CONST D2D1_BITMAP_PROPERTIES *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap + _COM_Outptr_ ID2D1Bitmap **bitmap ) PURE; - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// STDMETHOD(CreateBitmapFromWicBitmap)( _In_ IWICBitmapSource *wicBitmapSource, _In_opt_ CONST D2D1_BITMAP_PROPERTIES *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap + _COM_Outptr_ ID2D1Bitmap **bitmap ) PURE; - + /// /// Create a D2D bitmap by sharing bits from another resource. The bitmap must be /// compatible with the render target for the call to succeed. For example, an @@ -2344,9 +2344,9 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_ REFIID riid, _Inout_ void *data, _In_opt_ CONST D2D1_BITMAP_PROPERTIES *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap + _COM_Outptr_ ID2D1Bitmap **bitmap ) PURE; - + /// /// Creates a bitmap brush. The bitmap is scaled, rotated, skewed or tiled to fill /// or pen a geometry. @@ -2355,15 +2355,15 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_opt_ ID2D1Bitmap *bitmap, _In_opt_ CONST D2D1_BITMAP_BRUSH_PROPERTIES *bitmapBrushProperties, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, - _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush + _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush ) PURE; - + STDMETHOD(CreateSolidColorBrush)( _In_ CONST D2D1_COLOR_F *color, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, - _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush + _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush ) PURE; - + /// /// A gradient stop collection represents a set of stops in an ideal unit length. /// This is the source resource for a linear gradient and radial gradient brush. @@ -2377,23 +2377,23 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_range_(>=,1) UINT32 gradientStopsCount, D2D1_GAMMA colorInterpolationGamma, D2D1_EXTEND_MODE extendMode, - _COM_Outptr_ ID2D1GradientStopCollection **gradientStopCollection + _COM_Outptr_ ID2D1GradientStopCollection **gradientStopCollection ) PURE; - + STDMETHOD(CreateLinearGradientBrush)( _In_ CONST D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *linearGradientBrushProperties, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush + _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush ) PURE; - + STDMETHOD(CreateRadialGradientBrush)( _In_ CONST D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES *radialGradientBrushProperties, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush + _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush ) PURE; - + /// /// Creates a bitmap render target whose bitmap can be used as a source for /// rendering in the API. @@ -2417,9 +2417,9 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_opt_ CONST D2D1_SIZE_U *desiredPixelSize, _In_opt_ CONST D2D1_PIXEL_FORMAT *desiredFormat, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget ) PURE; - + /// /// Creates a layer resource that can be used on any target and which will resize /// under the covers if necessary. @@ -2432,67 +2432,67 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// content when the layer is pushed. STDMETHOD(CreateLayer)( _In_opt_ CONST D2D1_SIZE_F *size, - _COM_Outptr_ ID2D1Layer **layer + _COM_Outptr_ ID2D1Layer **layer ) PURE; - + /// /// Create a D2D mesh. /// STDMETHOD(CreateMesh)( - _COM_Outptr_ ID2D1Mesh **mesh + _COM_Outptr_ ID2D1Mesh **mesh ) PURE; - + STDMETHOD_(void, DrawLine)( D2D1_POINT_2F point0, D2D1_POINT_2F point1, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL ) PURE; - + STDMETHOD_(void, DrawRectangle)( _In_ CONST D2D1_RECT_F *rect, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL ) PURE; - + STDMETHOD_(void, FillRectangle)( _In_ CONST D2D1_RECT_F *rect, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + STDMETHOD_(void, DrawRoundedRectangle)( _In_ CONST D2D1_ROUNDED_RECT *roundedRect, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL ) PURE; - + STDMETHOD_(void, FillRoundedRectangle)( _In_ CONST D2D1_ROUNDED_RECT *roundedRect, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + STDMETHOD_(void, DrawEllipse)( _In_ CONST D2D1_ELLIPSE *ellipse, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL ) PURE; - + STDMETHOD_(void, FillEllipse)( _In_ CONST D2D1_ELLIPSE *ellipse, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + STDMETHOD_(void, DrawGeometry)( _In_ ID2D1Geometry *geometry, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL ) PURE; - + /// An optionally specified opacity brush. Only the alpha /// channel of the corresponding brush will be sampled and will be applied to the /// entire fill of the geometry. If this brush is specified, the fill brush must be @@ -2500,18 +2500,18 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend STDMETHOD_(void, FillGeometry)( _In_ ID2D1Geometry *geometry, _In_ ID2D1Brush *brush, - _In_opt_ ID2D1Brush *opacityBrush = NULL + _In_opt_ ID2D1Brush *opacityBrush = NULL ) PURE; - + /// /// Fill a mesh. Since meshes can only render aliased content, the render target /// antialiasing mode must be set to aliased. /// STDMETHOD_(void, FillMesh)( _In_ ID2D1Mesh *mesh, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + /// /// Fill using the alpha channel of the supplied opacity mask bitmap. The brush /// opacity will be modulated by the mask. The render target antialiasing mode must @@ -2522,17 +2522,17 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_ ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, _In_opt_ CONST D2D1_RECT_F *destinationRectangle = NULL, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL ) PURE; - + STDMETHOD_(void, DrawBitmap)( _In_ ID2D1Bitmap *bitmap, _In_opt_ CONST D2D1_RECT_F *destinationRectangle = NULL, FLOAT opacity = 1.0f, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL ) PURE; - + /// /// Draws the text within the given layout rectangle and by default also performs /// baseline snapping. @@ -2544,9 +2544,9 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_ CONST D2D1_RECT_F *layoutRect, _In_ ID2D1Brush *defaultFillBrush, D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_NONE, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL ) PURE; - + /// /// Draw a text layout object. If the layout is not subsequently changed, this can /// be more efficient than DrawText when drawing the same layout repeatedly. @@ -2559,68 +2559,68 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend D2D1_POINT_2F origin, _In_ IDWriteTextLayout *textLayout, _In_ ID2D1Brush *defaultFillBrush, - D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_NONE + D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_NONE ) PURE; - + STDMETHOD_(void, DrawGlyphRun)( D2D1_POINT_2F baselineOrigin, _In_ CONST DWRITE_GLYPH_RUN *glyphRun, _In_ ID2D1Brush *foregroundBrush, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL ) PURE; - + STDMETHOD_(void, SetTransform)( - _In_ CONST D2D1_MATRIX_3X2_F *transform + _In_ CONST D2D1_MATRIX_3X2_F *transform ) PURE; - + STDMETHOD_(void, GetTransform)( - _Out_ D2D1_MATRIX_3X2_F *transform + _Out_ D2D1_MATRIX_3X2_F *transform ) CONST PURE; - + STDMETHOD_(void, SetAntialiasMode)( - D2D1_ANTIALIAS_MODE antialiasMode + D2D1_ANTIALIAS_MODE antialiasMode ) PURE; - + STDMETHOD_(D2D1_ANTIALIAS_MODE, GetAntialiasMode)( ) CONST PURE; - + STDMETHOD_(void, SetTextAntialiasMode)( - D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode ) PURE; - + STDMETHOD_(D2D1_TEXT_ANTIALIAS_MODE, GetTextAntialiasMode)( ) CONST PURE; - + STDMETHOD_(void, SetTextRenderingParams)( - _In_opt_ IDWriteRenderingParams *textRenderingParams = NULL + _In_opt_ IDWriteRenderingParams *textRenderingParams = NULL ) PURE; - + /// /// Retrieve the text render parameters. NOTE: If NULL is specified to /// SetTextRenderingParameters, NULL will be returned. /// STDMETHOD_(void, GetTextRenderingParams)( - _Outptr_result_maybenull_ IDWriteRenderingParams **textRenderingParams + _Outptr_result_maybenull_ IDWriteRenderingParams **textRenderingParams ) CONST PURE; - + /// /// Set a tag to correspond to the succeeding primitives. If an error occurs /// rendering a primitive, the tags can be returned from the Flush or EndDraw call. /// STDMETHOD_(void, SetTags)( D2D1_TAG tag1, - D2D1_TAG tag2 + D2D1_TAG tag2 ) PURE; - + /// /// Retrieves the currently set tags. This does not retrieve the tags corresponding /// to any primitive that is in error. /// STDMETHOD_(void, GetTags)( _Out_opt_ D2D1_TAG *tag1 = NULL, - _Out_opt_ D2D1_TAG *tag2 = NULL + _Out_opt_ D2D1_TAG *tag2 = NULL ) CONST PURE; - + /// /// Start a layer of drawing calls. The way in which the layer must be resolved is /// specified first as well as the logical resource that stores the layer @@ -2630,35 +2630,35 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// STDMETHOD_(void, PushLayer)( _In_ CONST D2D1_LAYER_PARAMETERS *layerParameters, - _In_opt_ ID2D1Layer *layer + _In_opt_ ID2D1Layer *layer ) PURE; - + /// /// Ends a layer that was defined with particular layer resources. /// STDMETHOD_(void, PopLayer)( ) PURE; - + STDMETHOD(Flush)( _Out_opt_ D2D1_TAG *tag1 = NULL, - _Out_opt_ D2D1_TAG *tag2 = NULL + _Out_opt_ D2D1_TAG *tag2 = NULL ) PURE; - + /// /// Gets the current drawing state and saves it into the supplied /// IDrawingStatckBlock. /// STDMETHOD_(void, SaveDrawingState)( - _Inout_ ID2D1DrawingStateBlock *drawingStateBlock + _Inout_ ID2D1DrawingStateBlock *drawingStateBlock ) CONST PURE; - + /// /// Copies the state stored in the block interface. /// STDMETHOD_(void, RestoreDrawingState)( - _In_ ID2D1DrawingStateBlock *drawingStateBlock + _In_ ID2D1DrawingStateBlock *drawingStateBlock ) PURE; - + /// /// Pushes a clip. The clip can be antialiased. The clip must be axis aligned. If /// the current world transform is not axis preserving, then the bounding box of the @@ -2667,35 +2667,35 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// STDMETHOD_(void, PushAxisAlignedClip)( _In_ CONST D2D1_RECT_F *clipRect, - D2D1_ANTIALIAS_MODE antialiasMode + D2D1_ANTIALIAS_MODE antialiasMode ) PURE; - + STDMETHOD_(void, PopAxisAlignedClip)( ) PURE; - + STDMETHOD_(void, Clear)( - _In_opt_ CONST D2D1_COLOR_F *clearColor = NULL + _In_opt_ CONST D2D1_COLOR_F *clearColor = NULL ) PURE; - + /// /// Start drawing on this render target. Draw calls can only be issued between a /// BeginDraw and EndDraw call. /// STDMETHOD_(void, BeginDraw)( ) PURE; - + /// /// Ends drawing on the render target, error results can be retrieved at this time, /// or when calling flush. /// STDMETHOD(EndDraw)( _Out_opt_ D2D1_TAG *tag1 = NULL, - _Out_opt_ D2D1_TAG *tag2 = NULL + _Out_opt_ D2D1_TAG *tag2 = NULL ) PURE; - + STDMETHOD_(D2D1_PIXEL_FORMAT, GetPixelFormat)( ) CONST PURE; - + /// /// Sets the DPI on the render target. This results in the render target being /// interpreted to a different scale. Neither DPI can be negative. If zero is @@ -2704,36 +2704,36 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// STDMETHOD_(void, SetDpi)( FLOAT dpiX, - FLOAT dpiY + FLOAT dpiY ) PURE; - + /// /// Return the current DPI from the target. /// STDMETHOD_(void, GetDpi)( _Out_ FLOAT *dpiX, - _Out_ FLOAT *dpiY + _Out_ FLOAT *dpiY ) CONST PURE; - + /// /// Returns the size of the render target in DIPs. /// STDMETHOD_(D2D1_SIZE_F, GetSize)( ) CONST PURE; - + /// /// Returns the size of the render target in pixels. /// STDMETHOD_(D2D1_SIZE_U, GetPixelSize)( ) CONST PURE; - + /// /// Returns the maximum bitmap and render target size that is guaranteed to be /// supported by the render target. /// STDMETHOD_(UINT32, GetMaximumBitmapSize)( ) CONST PURE; - + /// /// Returns true if the given properties are supported by this render target. The /// DPI is ignored. NOTE: If the render target type is software, then neither @@ -2741,9 +2741,9 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// supported. /// STDMETHOD_(BOOL, IsSupported)( - _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties + _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmap( @@ -2751,23 +2751,23 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_opt_ CONST void *srcData, UINT32 pitch, CONST D2D1_BITMAP_PROPERTIES &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap - ) + _COM_Outptr_ ID2D1Bitmap **bitmap + ) { return CreateBitmap(size, srcData, pitch, &bitmapProperties, bitmap); } - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmap( D2D1_SIZE_U size, CONST D2D1_BITMAP_PROPERTIES &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap - ) + _COM_Outptr_ ID2D1Bitmap **bitmap + ) { return CreateBitmap(size, NULL, 0, &bitmapProperties, bitmap); } - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// @@ -2776,12 +2776,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend CreateBitmapFromWicBitmap( _In_ IWICBitmapSource *wicBitmapSource, CONST D2D1_BITMAP_PROPERTIES &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap **bitmap - ) + _COM_Outptr_ ID2D1Bitmap **bitmap + ) { return CreateBitmapFromWicBitmap(wicBitmapSource, &bitmapProperties, bitmap); } - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// @@ -2789,12 +2789,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend HRESULT CreateBitmapFromWicBitmap( _In_ IWICBitmapSource *wicBitmapSource, - _COM_Outptr_ ID2D1Bitmap **bitmap - ) + _COM_Outptr_ ID2D1Bitmap **bitmap + ) { return CreateBitmapFromWicBitmap(wicBitmapSource, NULL, bitmap); } - + /// /// Creates a bitmap brush. The bitmap is scaled, rotated, skewed or tiled to fill /// or pen a geometry. @@ -2803,12 +2803,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend HRESULT CreateBitmapBrush( _In_opt_ ID2D1Bitmap *bitmap, - _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush + ) { return CreateBitmapBrush(bitmap, NULL, NULL, bitmapBrush); } - + /// /// Creates a bitmap brush. The bitmap is scaled, rotated, skewed or tiled to fill /// or pen a geometry. @@ -2818,12 +2818,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend CreateBitmapBrush( _In_opt_ ID2D1Bitmap *bitmap, CONST D2D1_BITMAP_BRUSH_PROPERTIES &bitmapBrushProperties, - _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush + ) { return CreateBitmapBrush(bitmap, &bitmapBrushProperties, NULL, bitmapBrush); } - + /// /// Creates a bitmap brush. The bitmap is scaled, rotated, skewed or tiled to fill /// or pen a geometry. @@ -2834,132 +2834,132 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_opt_ ID2D1Bitmap *bitmap, CONST D2D1_BITMAP_BRUSH_PROPERTIES &bitmapBrushProperties, CONST D2D1_BRUSH_PROPERTIES &brushProperties, - _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush **bitmapBrush + ) { return CreateBitmapBrush(bitmap, &bitmapBrushProperties, &brushProperties, bitmapBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateSolidColorBrush( CONST D2D1_COLOR_F &color, - _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush - ) + _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush + ) { return CreateSolidColorBrush(&color, NULL, solidColorBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateSolidColorBrush( CONST D2D1_COLOR_F &color, CONST D2D1_BRUSH_PROPERTIES &brushProperties, - _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush - ) + _COM_Outptr_ ID2D1SolidColorBrush **solidColorBrush + ) { return CreateSolidColorBrush(&color, &brushProperties, solidColorBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateGradientStopCollection( _In_reads_(gradientStopsCount) CONST D2D1_GRADIENT_STOP *gradientStops, UINT32 gradientStopsCount, - _COM_Outptr_ ID2D1GradientStopCollection **gradientStopCollection - ) + _COM_Outptr_ ID2D1GradientStopCollection **gradientStopCollection + ) { return CreateGradientStopCollection(gradientStops, gradientStopsCount, D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, gradientStopCollection); } - + COM_DECLSPEC_NOTHROW HRESULT CreateLinearGradientBrush( CONST D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES &linearGradientBrushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush - ) + _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush + ) { return CreateLinearGradientBrush(&linearGradientBrushProperties, NULL, gradientStopCollection, linearGradientBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateLinearGradientBrush( CONST D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES &linearGradientBrushProperties, CONST D2D1_BRUSH_PROPERTIES &brushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush - ) + _COM_Outptr_ ID2D1LinearGradientBrush **linearGradientBrush + ) { return CreateLinearGradientBrush(&linearGradientBrushProperties, &brushProperties, gradientStopCollection, linearGradientBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateRadialGradientBrush( CONST D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES &radialGradientBrushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush - ) + _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush + ) { return CreateRadialGradientBrush(&radialGradientBrushProperties, NULL, gradientStopCollection, radialGradientBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateRadialGradientBrush( CONST D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES &radialGradientBrushProperties, CONST D2D1_BRUSH_PROPERTIES &brushProperties, _In_ ID2D1GradientStopCollection *gradientStopCollection, - _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush - ) + _COM_Outptr_ ID2D1RadialGradientBrush **radialGradientBrush + ) { return CreateRadialGradientBrush(&radialGradientBrushProperties, &brushProperties, gradientStopCollection, radialGradientBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateCompatibleRenderTarget( - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget - ) + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + ) { return CreateCompatibleRenderTarget(NULL, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, bitmapRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateCompatibleRenderTarget( D2D1_SIZE_F desiredSize, - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget - ) + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + ) { return CreateCompatibleRenderTarget(&desiredSize, NULL, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, bitmapRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateCompatibleRenderTarget( D2D1_SIZE_F desiredSize, D2D1_SIZE_U desiredPixelSize, - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget - ) + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + ) { return CreateCompatibleRenderTarget(&desiredSize, &desiredPixelSize, NULL, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, bitmapRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateCompatibleRenderTarget( D2D1_SIZE_F desiredSize, D2D1_SIZE_U desiredPixelSize, D2D1_PIXEL_FORMAT desiredFormat, - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget - ) + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + ) { return CreateCompatibleRenderTarget(&desiredSize, &desiredPixelSize, &desiredFormat, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, bitmapRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateCompatibleRenderTarget( @@ -2967,97 +2967,97 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend D2D1_SIZE_U desiredPixelSize, D2D1_PIXEL_FORMAT desiredFormat, D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS options, - _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget - ) + _COM_Outptr_ ID2D1BitmapRenderTarget **bitmapRenderTarget + ) { return CreateCompatibleRenderTarget(&desiredSize, &desiredPixelSize, &desiredFormat, options, bitmapRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateLayer( D2D1_SIZE_F size, - _COM_Outptr_ ID2D1Layer **layer - ) + _COM_Outptr_ ID2D1Layer **layer + ) { return CreateLayer(&size, layer); } - + COM_DECLSPEC_NOTHROW HRESULT CreateLayer( - _COM_Outptr_ ID2D1Layer **layer - ) + _COM_Outptr_ ID2D1Layer **layer + ) { return CreateLayer(NULL, layer); } - + COM_DECLSPEC_NOTHROW void DrawRectangle( CONST D2D1_RECT_F &rect, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL - ) + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + ) { DrawRectangle(&rect, brush, strokeWidth, strokeStyle); } - + COM_DECLSPEC_NOTHROW void FillRectangle( CONST D2D1_RECT_F &rect, - _In_ ID2D1Brush *brush - ) + _In_ ID2D1Brush *brush + ) { FillRectangle(&rect, brush); } - + COM_DECLSPEC_NOTHROW void DrawRoundedRectangle( CONST D2D1_ROUNDED_RECT &roundedRect, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL - ) + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + ) { DrawRoundedRectangle(&roundedRect, brush, strokeWidth, strokeStyle); } - + COM_DECLSPEC_NOTHROW void FillRoundedRectangle( CONST D2D1_ROUNDED_RECT &roundedRect, - _In_ ID2D1Brush *brush - ) + _In_ ID2D1Brush *brush + ) { FillRoundedRectangle(&roundedRect, brush); } - + COM_DECLSPEC_NOTHROW void DrawEllipse( CONST D2D1_ELLIPSE &ellipse, _In_ ID2D1Brush *brush, FLOAT strokeWidth = 1.0f, - _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL - ) + _In_opt_ ID2D1StrokeStyle *strokeStyle = NULL + ) { DrawEllipse(&ellipse, brush, strokeWidth, strokeStyle); } - + COM_DECLSPEC_NOTHROW void FillEllipse( CONST D2D1_ELLIPSE &ellipse, - _In_ ID2D1Brush *brush - ) + _In_ ID2D1Brush *brush + ) { FillEllipse(&ellipse, brush); } - + COM_DECLSPEC_NOTHROW void FillOpacityMask( @@ -3065,12 +3065,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend _In_ ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, CONST D2D1_RECT_F &destinationRectangle, - CONST D2D1_RECT_F &sourceRectangle - ) + CONST D2D1_RECT_F &sourceRectangle + ) { FillOpacityMask(opacityMask, brush, content, &destinationRectangle, &sourceRectangle); } - + COM_DECLSPEC_NOTHROW void DrawBitmap( @@ -3078,12 +3078,12 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend CONST D2D1_RECT_F &destinationRectangle, FLOAT opacity = 1.0f, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL - ) + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + ) { DrawBitmap(bitmap, &destinationRectangle, opacity, interpolationMode, sourceRectangle); } - + COM_DECLSPEC_NOTHROW void DrawBitmap( @@ -3091,50 +3091,50 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend CONST D2D1_RECT_F &destinationRectangle, FLOAT opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode, - CONST D2D1_RECT_F &sourceRectangle - ) + CONST D2D1_RECT_F &sourceRectangle + ) { DrawBitmap(bitmap, &destinationRectangle, opacity, interpolationMode, &sourceRectangle); } - + COM_DECLSPEC_NOTHROW void SetTransform( - CONST D2D1_MATRIX_3X2_F &transform - ) + CONST D2D1_MATRIX_3X2_F &transform + ) { SetTransform(&transform); } - + COM_DECLSPEC_NOTHROW void PushLayer( CONST D2D1_LAYER_PARAMETERS &layerParameters, - _In_opt_ ID2D1Layer *layer - ) + _In_opt_ ID2D1Layer *layer + ) { PushLayer(&layerParameters, layer); } - + COM_DECLSPEC_NOTHROW void PushAxisAlignedClip( CONST D2D1_RECT_F &clipRect, - D2D1_ANTIALIAS_MODE antialiasMode - ) + D2D1_ANTIALIAS_MODE antialiasMode + ) { return PushAxisAlignedClip(&clipRect, antialiasMode); } - + COM_DECLSPEC_NOTHROW void Clear( - CONST D2D1_COLOR_F &clearColor - ) + CONST D2D1_COLOR_F &clearColor + ) { return Clear(&clearColor); } - + /// /// Draws the text within the given layout rectangle and by default also performs /// baseline snapping. @@ -3148,17 +3148,17 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend CONST D2D1_RECT_F &layoutRect, _In_ ID2D1Brush *defaultFillBrush, D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_NONE, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL - ) + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + ) { return DrawText(string, stringLength, textFormat, &layoutRect, defaultFillBrush, options, measuringMode); } - + COM_DECLSPEC_NOTHROW BOOL IsSupported( - CONST D2D1_RENDER_TARGET_PROPERTIES &renderTargetProperties - ) CONST + CONST D2D1_RENDER_TARGET_PROPERTIES &renderTargetProperties + ) CONST { return IsSupported(&renderTargetProperties); } @@ -3170,9 +3170,9 @@ interface DX_DECLARE_INTERFACE("2cd90694-12e2-11dc-9fed-001143a055f9") ID2D1Rend /// interface DX_DECLARE_INTERFACE("2cd90695-12e2-11dc-9fed-001143a055f9") ID2D1BitmapRenderTarget : public ID2D1RenderTarget { - + STDMETHOD(GetBitmap)( - _COM_Outptr_ ID2D1Bitmap **bitmap + _COM_Outptr_ ID2D1Bitmap **bitmap ) PURE; }; // interface ID2D1BitmapRenderTarget @@ -3181,10 +3181,10 @@ interface DX_DECLARE_INTERFACE("2cd90695-12e2-11dc-9fed-001143a055f9") ID2D1Bitm /// interface DX_DECLARE_INTERFACE("2cd90698-12e2-11dc-9fed-001143a055f9") ID2D1HwndRenderTarget : public ID2D1RenderTarget { - + STDMETHOD_(D2D1_WINDOW_STATE, CheckWindowState)( ) PURE; - + /// /// Resize the buffer underlying the render target. This operation might fail if /// there is insufficient video memory or system memory, or if the render target is @@ -3194,17 +3194,17 @@ interface DX_DECLARE_INTERFACE("2cd90698-12e2-11dc-9fed-001143a055f9") ID2D1Hwnd /// be returned from Resize. /// STDMETHOD(Resize)( - _In_ CONST D2D1_SIZE_U *pixelSize + _In_ CONST D2D1_SIZE_U *pixelSize ) PURE; - + STDMETHOD_(HWND, GetHwnd)( ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT Resize( - CONST D2D1_SIZE_U &pixelSize - ) + CONST D2D1_SIZE_U &pixelSize + ) { return Resize(&pixelSize); } @@ -3221,14 +3221,14 @@ interface DX_DECLARE_INTERFACE("2cd90698-12e2-11dc-9fed-001143a055f9") ID2D1Hwnd /// interface DX_DECLARE_INTERFACE("e0db51c3-6f77-4bae-b3d5-e47509b35838") ID2D1GdiInteropRenderTarget : public IUnknown { - + STDMETHOD(GetDC)( D2D1_DC_INITIALIZE_MODE mode, - _Out_ HDC *hdc + _Out_ HDC *hdc ) PURE; - + STDMETHOD(ReleaseDC)( - _In_opt_ CONST RECT *update + _In_opt_ CONST RECT *update ) PURE; }; // interface ID2D1GdiInteropRenderTarget @@ -3243,10 +3243,10 @@ interface DX_DECLARE_INTERFACE("e0db51c3-6f77-4bae-b3d5-e47509b35838") ID2D1GdiI /// interface DX_DECLARE_INTERFACE("1c51bc64-de61-46fd-9899-63a5d8f03950") ID2D1DCRenderTarget : public ID2D1RenderTarget { - + STDMETHOD(BindDC)( _In_ CONST HDC hDC, - _In_ CONST RECT *pSubRect + _In_ CONST RECT *pSubRect ) PURE; }; // interface ID2D1DCRenderTarget @@ -3255,37 +3255,37 @@ interface DX_DECLARE_INTERFACE("1c51bc64-de61-46fd-9899-63a5d8f03950") ID2D1DCRe /// interface DX_DECLARE_INTERFACE("06152247-6f50-465a-9245-118bfd3b6007") ID2D1Factory : public IUnknown { - + /// /// Cause the factory to refresh any system metrics that it might have been snapped /// on factory creation. /// STDMETHOD(ReloadSystemMetrics)( ) PURE; - + /// /// Retrieves the current desktop DPI. To refresh this, call ReloadSystemMetrics. /// STDMETHOD_(void, GetDesktopDpi)( _Out_ FLOAT *dpiX, - _Out_ FLOAT *dpiY + _Out_ FLOAT *dpiY ) PURE; - + STDMETHOD(CreateRectangleGeometry)( _In_ CONST D2D1_RECT_F *rectangle, - _COM_Outptr_ ID2D1RectangleGeometry **rectangleGeometry + _COM_Outptr_ ID2D1RectangleGeometry **rectangleGeometry ) PURE; - + STDMETHOD(CreateRoundedRectangleGeometry)( _In_ CONST D2D1_ROUNDED_RECT *roundedRectangle, - _COM_Outptr_ ID2D1RoundedRectangleGeometry **roundedRectangleGeometry + _COM_Outptr_ ID2D1RoundedRectangleGeometry **roundedRectangleGeometry ) PURE; - + STDMETHOD(CreateEllipseGeometry)( _In_ CONST D2D1_ELLIPSE *ellipse, - _COM_Outptr_ ID2D1EllipseGeometry **ellipseGeometry + _COM_Outptr_ ID2D1EllipseGeometry **ellipseGeometry ) PURE; - + /// /// Create a geometry which holds other geometries. /// @@ -3293,23 +3293,23 @@ interface DX_DECLARE_INTERFACE("06152247-6f50-465a-9245-118bfd3b6007") ID2D1Fact D2D1_FILL_MODE fillMode, _In_reads_(geometriesCount) ID2D1Geometry **geometries, UINT32 geometriesCount, - _COM_Outptr_ ID2D1GeometryGroup **geometryGroup + _COM_Outptr_ ID2D1GeometryGroup **geometryGroup ) PURE; - + STDMETHOD(CreateTransformedGeometry)( _In_ ID2D1Geometry *sourceGeometry, _In_ CONST D2D1_MATRIX_3X2_F *transform, - _COM_Outptr_ ID2D1TransformedGeometry **transformedGeometry + _COM_Outptr_ ID2D1TransformedGeometry **transformedGeometry ) PURE; - + /// /// Returns an initially empty path geometry interface. A geometry sink is created /// off the interface to populate it. /// STDMETHOD(CreatePathGeometry)( - _COM_Outptr_ ID2D1PathGeometry **pathGeometry + _COM_Outptr_ ID2D1PathGeometry **pathGeometry ) PURE; - + /// /// Allows a non-default stroke style to be specified for a given geometry at draw /// time. @@ -3318,9 +3318,9 @@ interface DX_DECLARE_INTERFACE("06152247-6f50-465a-9245-118bfd3b6007") ID2D1Fact _In_ CONST D2D1_STROKE_STYLE_PROPERTIES *strokeStyleProperties, _In_reads_opt_(dashesCount) CONST FLOAT *dashes, UINT32 dashesCount, - _COM_Outptr_ ID2D1StrokeStyle **strokeStyle + _COM_Outptr_ ID2D1StrokeStyle **strokeStyle ) PURE; - + /// /// Creates a new drawing state block, this can be used in subsequent /// SaveDrawingState and RestoreDrawingState operations on the render target. @@ -3328,27 +3328,27 @@ interface DX_DECLARE_INTERFACE("06152247-6f50-465a-9245-118bfd3b6007") ID2D1Fact STDMETHOD(CreateDrawingStateBlock)( _In_opt_ CONST D2D1_DRAWING_STATE_DESCRIPTION *drawingStateDescription, _In_opt_ IDWriteRenderingParams *textRenderingParams, - _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock + _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock ) PURE; - + /// /// Creates a render target which is a source of bitmaps. /// STDMETHOD(CreateWicBitmapRenderTarget)( _In_ IWICBitmap *target, _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties, - _COM_Outptr_ ID2D1RenderTarget **renderTarget + _COM_Outptr_ ID2D1RenderTarget **renderTarget ) PURE; - + /// /// Creates a render target that appears on the display. /// STDMETHOD(CreateHwndRenderTarget)( _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties, _In_ CONST D2D1_HWND_RENDER_TARGET_PROPERTIES *hwndRenderTargetProperties, - _COM_Outptr_ ID2D1HwndRenderTarget **hwndRenderTarget + _COM_Outptr_ ID2D1HwndRenderTarget **hwndRenderTarget ) PURE; - + /// /// Creates a render target that draws to a DXGI Surface. The device that owns the /// surface is used for rendering. @@ -3356,118 +3356,118 @@ interface DX_DECLARE_INTERFACE("06152247-6f50-465a-9245-118bfd3b6007") ID2D1Fact STDMETHOD(CreateDxgiSurfaceRenderTarget)( _In_ IDXGISurface *dxgiSurface, _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties, - _COM_Outptr_ ID2D1RenderTarget **renderTarget + _COM_Outptr_ ID2D1RenderTarget **renderTarget ) PURE; - + /// /// Creates a render target that draws to a GDI device context. /// STDMETHOD(CreateDCRenderTarget)( _In_ CONST D2D1_RENDER_TARGET_PROPERTIES *renderTargetProperties, - _COM_Outptr_ ID2D1DCRenderTarget **dcRenderTarget + _COM_Outptr_ ID2D1DCRenderTarget **dcRenderTarget ) PURE; - + COM_DECLSPEC_NOTHROW HRESULT CreateRectangleGeometry( CONST D2D1_RECT_F &rectangle, - _COM_Outptr_ ID2D1RectangleGeometry **rectangleGeometry - ) + _COM_Outptr_ ID2D1RectangleGeometry **rectangleGeometry + ) { return CreateRectangleGeometry(&rectangle, rectangleGeometry); } - + COM_DECLSPEC_NOTHROW HRESULT CreateRoundedRectangleGeometry( CONST D2D1_ROUNDED_RECT &roundedRectangle, - _COM_Outptr_ ID2D1RoundedRectangleGeometry **roundedRectangleGeometry - ) + _COM_Outptr_ ID2D1RoundedRectangleGeometry **roundedRectangleGeometry + ) { return CreateRoundedRectangleGeometry(&roundedRectangle, roundedRectangleGeometry); } - + COM_DECLSPEC_NOTHROW HRESULT CreateEllipseGeometry( CONST D2D1_ELLIPSE &ellipse, - _COM_Outptr_ ID2D1EllipseGeometry **ellipseGeometry - ) + _COM_Outptr_ ID2D1EllipseGeometry **ellipseGeometry + ) { return CreateEllipseGeometry(&ellipse, ellipseGeometry); } - + COM_DECLSPEC_NOTHROW HRESULT CreateTransformedGeometry( _In_ ID2D1Geometry *sourceGeometry, CONST D2D1_MATRIX_3X2_F &transform, - _COM_Outptr_ ID2D1TransformedGeometry **transformedGeometry - ) + _COM_Outptr_ ID2D1TransformedGeometry **transformedGeometry + ) { return CreateTransformedGeometry(sourceGeometry, &transform, transformedGeometry); } - + COM_DECLSPEC_NOTHROW HRESULT CreateStrokeStyle( CONST D2D1_STROKE_STYLE_PROPERTIES &strokeStyleProperties, _In_reads_opt_(dashesCount) CONST FLOAT *dashes, UINT32 dashesCount, - _COM_Outptr_ ID2D1StrokeStyle **strokeStyle - ) + _COM_Outptr_ ID2D1StrokeStyle **strokeStyle + ) { return CreateStrokeStyle(&strokeStyleProperties, dashes, dashesCount, strokeStyle); } - + COM_DECLSPEC_NOTHROW HRESULT CreateDrawingStateBlock( CONST D2D1_DRAWING_STATE_DESCRIPTION &drawingStateDescription, - _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock - ) + _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock + ) { return CreateDrawingStateBlock(&drawingStateDescription, NULL, drawingStateBlock); } - + COM_DECLSPEC_NOTHROW HRESULT CreateDrawingStateBlock( - _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock - ) + _COM_Outptr_ ID2D1DrawingStateBlock **drawingStateBlock + ) { return CreateDrawingStateBlock(NULL, NULL, drawingStateBlock); } - + COM_DECLSPEC_NOTHROW HRESULT CreateWicBitmapRenderTarget( _In_ IWICBitmap *target, CONST D2D1_RENDER_TARGET_PROPERTIES &renderTargetProperties, - _COM_Outptr_ ID2D1RenderTarget **renderTarget - ) + _COM_Outptr_ ID2D1RenderTarget **renderTarget + ) { return CreateWicBitmapRenderTarget(target, &renderTargetProperties, renderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateHwndRenderTarget( CONST D2D1_RENDER_TARGET_PROPERTIES &renderTargetProperties, CONST D2D1_HWND_RENDER_TARGET_PROPERTIES &hwndRenderTargetProperties, - _COM_Outptr_ ID2D1HwndRenderTarget **hwndRenderTarget - ) + _COM_Outptr_ ID2D1HwndRenderTarget **hwndRenderTarget + ) { return CreateHwndRenderTarget(&renderTargetProperties, &hwndRenderTargetProperties, hwndRenderTarget); } - + COM_DECLSPEC_NOTHROW HRESULT CreateDxgiSurfaceRenderTarget( _In_ IDXGISurface *dxgiSurface, CONST D2D1_RENDER_TARGET_PROPERTIES &renderTargetProperties, - _COM_Outptr_ ID2D1RenderTarget **renderTarget - ) + _COM_Outptr_ ID2D1RenderTarget **renderTarget + ) { return CreateDxgiSurfaceRenderTarget(dxgiSurface, &renderTargetProperties, renderTarget); } @@ -3560,7 +3560,7 @@ typedef interface ID2D1Factory ID2D1Factory; /*#pragma region Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ - + #ifdef __cplusplus extern "C" { @@ -3611,7 +3611,6 @@ extern "C" #define D2D1FORCEINLINE FORCEINLINE #endif // #ifndef D2D1FORCEINLINE - #include #ifndef D2D_USE_C_DEFINITIONS diff --git a/gfx/include/dxsdk/d2d1_1.h b/gfx/include/dxsdk/d2d1_1.h index f6d909e9eb..889ff95123 100644 --- a/gfx/include/dxsdk/d2d1_1.h +++ b/gfx/include/dxsdk/d2d1_1.h @@ -128,28 +128,28 @@ typedef enum D2D1_SUBPROPERTY /// typedef enum D2D1_BITMAP_OPTIONS { - + /// /// The bitmap is created with default properties. /// D2D1_BITMAP_OPTIONS_NONE = 0x00000000, - + /// /// The bitmap can be specified as a target in ID2D1DeviceContext::SetTarget /// D2D1_BITMAP_OPTIONS_TARGET = 0x00000001, - + /// /// The bitmap cannot be used as an input to DrawBitmap, DrawImage, in a bitmap /// brush or as an input to an effect. /// D2D1_BITMAP_OPTIONS_CANNOT_DRAW = 0x00000002, - + /// /// The bitmap can be read from the CPU. /// D2D1_BITMAP_OPTIONS_CPU_READ = 0x00000004, - + /// /// The bitmap works with the ID2D1GdiInteropRenderTarget::GetDC API. /// @@ -202,22 +202,22 @@ typedef enum D2D1_BUFFER_PRECISION /// typedef enum D2D1_MAP_OPTIONS { - + /// /// The mapped pointer has undefined behavior. /// D2D1_MAP_OPTIONS_NONE = 0, - + /// /// The mapped pointer can be read from. /// D2D1_MAP_OPTIONS_READ = 1, - + /// /// The mapped pointer can be written to. /// D2D1_MAP_OPTIONS_WRITE = 2, - + /// /// The previous contents of the bitmap are discarded when it is mapped. /// @@ -260,17 +260,17 @@ typedef enum D2D1_UNIT_MODE /// typedef enum D2D1_COLOR_SPACE { - + /// /// The color space is described by accompanying data, such as a color profile. /// D2D1_COLOR_SPACE_CUSTOM = 0, - + /// /// The sRGB color space. /// D2D1_COLOR_SPACE_SRGB = 1, - + /// /// The scRGB color space. /// @@ -285,7 +285,7 @@ typedef enum D2D1_COLOR_SPACE typedef enum D2D1_DEVICE_CONTEXT_OPTIONS { D2D1_DEVICE_CONTEXT_OPTIONS_NONE = 0, - + /// /// Geometry rendering will be performed on many threads in parallel, a single /// thread is the default. @@ -303,18 +303,18 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_DEVICE_CONTEXT_OPTIONS); /// typedef enum D2D1_STROKE_TRANSFORM_TYPE { - + /// /// The stroke respects the world transform, the DPI, and the stroke width. /// D2D1_STROKE_TRANSFORM_TYPE_NORMAL = 0, - + /// /// The stroke does not respect the world transform, but it does respect the DPI and /// the stroke width. /// D2D1_STROKE_TRANSFORM_TYPE_FIXED = 1, - + /// /// The stroke is forced to one pixel wide. /// @@ -343,14 +343,14 @@ typedef enum D2D1_PRIMITIVE_BLEND /// typedef enum D2D1_THREADING_MODE { - + /// /// Resources may only be invoked serially. Reference counts on resources are /// interlocked, however, resource and render target state is not protected from /// multi-threaded access /// D2D1_THREADING_MODE_SINGLE_THREADED = D2D1_FACTORY_TYPE_SINGLE_THREADED, - + /// /// Resources may be invoked from multiple threads. Resources use interlocked /// reference counting and their state is protected. @@ -365,12 +365,12 @@ typedef enum D2D1_THREADING_MODE /// typedef enum D2D1_COLOR_INTERPOLATION_MODE { - + /// /// Colors will be interpolated in straight alpha space. /// D2D1_COLOR_INTERPOLATION_MODE_STRAIGHT = 0, - + /// /// Colors will be interpolated in premultiplied alpha space. /// @@ -391,7 +391,7 @@ typedef struct D2D1_BITMAP_PROPERTIES1 D2D1_PIXEL_FORMAT pixelFormat; FLOAT dpiX; FLOAT dpiY; - + /// /// Specifies how the bitmap can be used. /// @@ -415,12 +415,12 @@ typedef struct D2D1_MAPPED_RECT /// typedef struct D2D1_RENDERING_CONTROLS { - + /// /// The default buffer precision, used if the precision isn't otherwise specified. /// D2D1_BUFFER_PRECISION bufferPrecision; - + /// /// The size of allocated tiles used to render imaging effects. /// @@ -433,17 +433,17 @@ typedef struct D2D1_RENDERING_CONTROLS /// typedef struct D2D1_EFFECT_INPUT_DESCRIPTION { - + /// /// The effect whose input connection is being specified. /// ID2D1Effect *effect; - + /// /// The index of the input connection into the specified effect. /// UINT32 inputIndex; - + /// /// The rectangle which would be available on the specified input connection during /// render operations. @@ -504,7 +504,7 @@ typedef struct D2D1_STROKE_STYLE_PROPERTIES1 FLOAT miterLimit; D2D1_DASH_STYLE dashStyle; FLOAT dashOffset; - + /// /// How the nib of the stroke is influenced by the context properties. /// @@ -546,17 +546,17 @@ typedef struct D2D1_LAYER_PARAMETERS1 /// typedef enum D2D1_PRINT_FONT_SUBSET_MODE { - + /// /// Subset for used glyphs, send and discard font resource after every five pages /// D2D1_PRINT_FONT_SUBSET_MODE_DEFAULT = 0, - + /// /// Subset for used glyphs, send and discard font resource after each page /// D2D1_PRINT_FONT_SUBSET_MODE_EACHPAGE = 1, - + /// /// Do not subset, reuse font for all pages, send it after first page /// @@ -586,13 +586,13 @@ typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 typedef struct D2D1_PRINT_CONTROL_PROPERTIES { D2D1_PRINT_FONT_SUBSET_MODE fontSubset; - + /// /// DPI for rasterization of all unsupported D2D commands or options, defaults to /// 150.0 /// FLOAT rasterDPI; - + /// /// Color space for vector graphics in XPS package /// @@ -606,7 +606,7 @@ typedef struct D2D1_PRINT_CONTROL_PROPERTIES /// typedef struct D2D1_CREATION_PROPERTIES { - + /// /// Describes locking behavior of D2D resources /// @@ -643,14 +643,14 @@ EXTERN_C CONST IID IID_ID2D1Multithread; /// interface DX_DECLARE_INTERFACE("82237326-8111-4f7c-bcf4-b5c1175564fe") ID2D1GdiMetafileSink : public IUnknown { - + /// /// Callback for examining a metafile record. /// STDMETHOD(ProcessRecord)( DWORD recordType, _In_opt_ CONST void *recordData, - DWORD recordDataSize + DWORD recordDataSize ) PURE; }; // interface ID2D1GdiMetafileSink @@ -659,19 +659,19 @@ interface DX_DECLARE_INTERFACE("82237326-8111-4f7c-bcf4-b5c1175564fe") ID2D1GdiM /// interface DX_DECLARE_INTERFACE("2f543dc3-cfc1-4211-864f-cfd91c6f3395") ID2D1GdiMetafile : public ID2D1Resource { - + /// /// Play the metafile into a caller-supplied sink interface. /// STDMETHOD(Stream)( - _In_ ID2D1GdiMetafileSink *sink + _In_ ID2D1GdiMetafileSink *sink ) PURE; - + /// /// Gets the bounds of the metafile. /// STDMETHOD(GetBounds)( - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) PURE; }; // interface ID2D1GdiMetafile @@ -681,134 +681,134 @@ interface DX_DECLARE_INTERFACE("2f543dc3-cfc1-4211-864f-cfd91c6f3395") ID2D1GdiM /// interface DX_DECLARE_INTERFACE("54d7898a-a061-40a7-bec7-e465bcba2c4f") ID2D1CommandSink : public IUnknown { - + STDMETHOD(BeginDraw)( ) PURE; - + STDMETHOD(EndDraw)( ) PURE; - + STDMETHOD(SetAntialiasMode)( - D2D1_ANTIALIAS_MODE antialiasMode + D2D1_ANTIALIAS_MODE antialiasMode ) PURE; - + STDMETHOD(SetTags)( D2D1_TAG tag1, - D2D1_TAG tag2 + D2D1_TAG tag2 ) PURE; - + STDMETHOD(SetTextAntialiasMode)( - D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode ) PURE; - + STDMETHOD(SetTextRenderingParams)( - _In_opt_ IDWriteRenderingParams *textRenderingParams + _In_opt_ IDWriteRenderingParams *textRenderingParams ) PURE; - + STDMETHOD(SetTransform)( - _In_ CONST D2D1_MATRIX_3X2_F *transform + _In_ CONST D2D1_MATRIX_3X2_F *transform ) PURE; - + STDMETHOD(SetPrimitiveBlend)( - D2D1_PRIMITIVE_BLEND primitiveBlend + D2D1_PRIMITIVE_BLEND primitiveBlend ) PURE; - + STDMETHOD(SetUnitMode)( - D2D1_UNIT_MODE unitMode + D2D1_UNIT_MODE unitMode ) PURE; - + STDMETHOD(Clear)( - _In_opt_ CONST D2D1_COLOR_F *color + _In_opt_ CONST D2D1_COLOR_F *color ) PURE; - + STDMETHOD(DrawGlyphRun)( D2D1_POINT_2F baselineOrigin, _In_ CONST DWRITE_GLYPH_RUN *glyphRun, _In_opt_ CONST DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription, _In_ ID2D1Brush *foregroundBrush, - DWRITE_MEASURING_MODE measuringMode + DWRITE_MEASURING_MODE measuringMode ) PURE; - + STDMETHOD(DrawLine)( D2D1_POINT_2F point0, D2D1_POINT_2F point1, _In_ ID2D1Brush *brush, FLOAT strokeWidth, - _In_opt_ ID2D1StrokeStyle *strokeStyle + _In_opt_ ID2D1StrokeStyle *strokeStyle ) PURE; - + STDMETHOD(DrawGeometry)( _In_ ID2D1Geometry *geometry, _In_ ID2D1Brush *brush, FLOAT strokeWidth, - _In_opt_ ID2D1StrokeStyle *strokeStyle + _In_opt_ ID2D1StrokeStyle *strokeStyle ) PURE; - + STDMETHOD(DrawRectangle)( _In_ CONST D2D1_RECT_F *rect, _In_ ID2D1Brush *brush, FLOAT strokeWidth, - _In_opt_ ID2D1StrokeStyle *strokeStyle + _In_opt_ ID2D1StrokeStyle *strokeStyle ) PURE; - + STDMETHOD(DrawBitmap)( _In_ ID2D1Bitmap *bitmap, _In_opt_ CONST D2D1_RECT_F *destinationRectangle, FLOAT opacity, D2D1_INTERPOLATION_MODE interpolationMode, _In_opt_ CONST D2D1_RECT_F *sourceRectangle, - _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform + _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform ) PURE; - + STDMETHOD(DrawImage)( _In_ ID2D1Image *image, _In_opt_ CONST D2D1_POINT_2F *targetOffset, _In_opt_ CONST D2D1_RECT_F *imageRectangle, D2D1_INTERPOLATION_MODE interpolationMode, - D2D1_COMPOSITE_MODE compositeMode + D2D1_COMPOSITE_MODE compositeMode ) PURE; - + STDMETHOD(DrawGdiMetafile)( _In_ ID2D1GdiMetafile *gdiMetafile, - _In_opt_ CONST D2D1_POINT_2F *targetOffset + _In_opt_ CONST D2D1_POINT_2F *targetOffset ) PURE; - + STDMETHOD(FillMesh)( _In_ ID2D1Mesh *mesh, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + STDMETHOD(FillOpacityMask)( _In_ ID2D1Bitmap *opacityMask, _In_ ID2D1Brush *brush, _In_opt_ CONST D2D1_RECT_F *destinationRectangle, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle + _In_opt_ CONST D2D1_RECT_F *sourceRectangle ) PURE; - + STDMETHOD(FillGeometry)( _In_ ID2D1Geometry *geometry, _In_ ID2D1Brush *brush, - _In_opt_ ID2D1Brush *opacityBrush + _In_opt_ ID2D1Brush *opacityBrush ) PURE; - + STDMETHOD(FillRectangle)( _In_ CONST D2D1_RECT_F *rect, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; - + STDMETHOD(PushAxisAlignedClip)( _In_ CONST D2D1_RECT_F *clipRect, - D2D1_ANTIALIAS_MODE antialiasMode + D2D1_ANTIALIAS_MODE antialiasMode ) PURE; - + STDMETHOD(PushLayer)( _In_ CONST D2D1_LAYER_PARAMETERS1 *layerParameters1, - _In_opt_ ID2D1Layer *layer + _In_opt_ ID2D1Layer *layer ) PURE; - + STDMETHOD(PopAxisAlignedClip)( ) PURE; - + STDMETHOD(PopLayer)( ) PURE; }; // interface ID2D1CommandSink @@ -818,14 +818,14 @@ interface DX_DECLARE_INTERFACE("54d7898a-a061-40a7-bec7-e465bcba2c4f") ID2D1Comm /// interface DX_DECLARE_INTERFACE("b4f34a19-2383-4d76-94f6-ec343657c3dc") ID2D1CommandList : public ID2D1Image { - + /// /// Play the command list into a caller-supplied sink interface. /// STDMETHOD(Stream)( - _In_ ID2D1CommandSink *sink + _In_ ID2D1CommandSink *sink ) PURE; - + /// /// Marks the command list as ready for use. /// @@ -839,15 +839,15 @@ interface DX_DECLARE_INTERFACE("b4f34a19-2383-4d76-94f6-ec343657c3dc") ID2D1Comm /// interface DX_DECLARE_INTERFACE("2c1d867d-c290-41c8-ae7e-34a98702e9a5") ID2D1PrintControl : public IUnknown { - + STDMETHOD(AddPage)( _In_ ID2D1CommandList *commandList, D2D_SIZE_F pageSize, _In_opt_ IStream *pagePrintTicketStream, _Out_opt_ D2D1_TAG *tag1 = NULL, - _Out_opt_ D2D1_TAG *tag2 = NULL + _Out_opt_ D2D1_TAG *tag2 = NULL ) PURE; - + STDMETHOD(Close)( ) PURE; }; // interface ID2D1PrintControl @@ -858,42 +858,42 @@ interface DX_DECLARE_INTERFACE("2c1d867d-c290-41c8-ae7e-34a98702e9a5") ID2D1Prin /// interface DX_DECLARE_INTERFACE("fe9e984d-3f95-407c-b5db-cb94d4e8f87c") ID2D1ImageBrush : public ID2D1Brush { - + STDMETHOD_(void, SetImage)( - _In_opt_ ID2D1Image *image + _In_opt_ ID2D1Image *image ) PURE; - + STDMETHOD_(void, SetExtendModeX)( - D2D1_EXTEND_MODE extendModeX + D2D1_EXTEND_MODE extendModeX ) PURE; - + STDMETHOD_(void, SetExtendModeY)( - D2D1_EXTEND_MODE extendModeY + D2D1_EXTEND_MODE extendModeY ) PURE; - + STDMETHOD_(void, SetInterpolationMode)( - D2D1_INTERPOLATION_MODE interpolationMode + D2D1_INTERPOLATION_MODE interpolationMode ) PURE; - + STDMETHOD_(void, SetSourceRectangle)( - _In_ CONST D2D1_RECT_F *sourceRectangle + _In_ CONST D2D1_RECT_F *sourceRectangle ) PURE; - + STDMETHOD_(void, GetImage)( - _Outptr_result_maybenull_ ID2D1Image **image + _Outptr_result_maybenull_ ID2D1Image **image ) CONST PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeX)( ) CONST PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeY)( ) CONST PURE; - + STDMETHOD_(D2D1_INTERPOLATION_MODE, GetInterpolationMode)( ) CONST PURE; - + STDMETHOD_(void, GetSourceRectangle)( - _Out_ D2D1_RECT_F *sourceRectangle + _Out_ D2D1_RECT_F *sourceRectangle ) CONST PURE; }; // interface ID2D1ImageBrush @@ -903,14 +903,14 @@ interface DX_DECLARE_INTERFACE("fe9e984d-3f95-407c-b5db-cb94d4e8f87c") ID2D1Imag /// interface DX_DECLARE_INTERFACE("41343a53-e41a-49a2-91cd-21793bbb62e5") ID2D1BitmapBrush1 : public ID2D1BitmapBrush { - + /// /// Sets the interpolation mode used when this brush is used. /// STDMETHOD_(void, SetInterpolationMode1)( - D2D1_INTERPOLATION_MODE interpolationMode + D2D1_INTERPOLATION_MODE interpolationMode ) PURE; - + STDMETHOD_(D2D1_INTERPOLATION_MODE, GetInterpolationMode1)( ) CONST PURE; }; // interface ID2D1BitmapBrush1 @@ -920,7 +920,7 @@ interface DX_DECLARE_INTERFACE("41343a53-e41a-49a2-91cd-21793bbb62e5") ID2D1Bitm /// interface DX_DECLARE_INTERFACE("10a72a66-e91c-43f4-993f-ddf4b82b0b4a") ID2D1StrokeStyle1 : public ID2D1StrokeStyle { - + STDMETHOD_(D2D1_STROKE_TRANSFORM_TYPE, GetStrokeTransformType)( ) CONST PURE; }; // interface ID2D1StrokeStyle1 @@ -932,15 +932,15 @@ interface DX_DECLARE_INTERFACE("10a72a66-e91c-43f4-993f-ddf4b82b0b4a") ID2D1Stro /// interface DX_DECLARE_INTERFACE("62baa2d2-ab54-41b7-b872-787e0106a421") ID2D1PathGeometry1 : public ID2D1PathGeometry { - + STDMETHOD(ComputePointAndSegmentAtLength)( FLOAT length, UINT32 startSegment, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _Out_ D2D1_POINT_DESCRIPTION *pointDescription + _Out_ D2D1_POINT_DESCRIPTION *pointDescription ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT ComputePointAndSegmentAtLength( @@ -948,32 +948,32 @@ interface DX_DECLARE_INTERFACE("62baa2d2-ab54-41b7-b872-787e0106a421") ID2D1Path UINT32 startSegment, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _Out_ D2D1_POINT_DESCRIPTION *pointDescription - ) CONST + _Out_ D2D1_POINT_DESCRIPTION *pointDescription + ) CONST { return ComputePointAndSegmentAtLength(length, startSegment, &worldTransform, flatteningTolerance, pointDescription); } - + COM_DECLSPEC_NOTHROW HRESULT ComputePointAndSegmentAtLength( FLOAT length, UINT32 startSegment, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ D2D1_POINT_DESCRIPTION *pointDescription - ) CONST + _Out_ D2D1_POINT_DESCRIPTION *pointDescription + ) CONST { return ComputePointAndSegmentAtLength(length, startSegment, worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, pointDescription); } - + COM_DECLSPEC_NOTHROW HRESULT ComputePointAndSegmentAtLength( FLOAT length, UINT32 startSegment, CONST D2D1_MATRIX_3X2_F &worldTransform, - _Out_ D2D1_POINT_DESCRIPTION *pointDescription - ) CONST + _Out_ D2D1_POINT_DESCRIPTION *pointDescription + ) CONST { return ComputePointAndSegmentAtLength(length, startSegment, &worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, pointDescription); } @@ -985,43 +985,43 @@ interface DX_DECLARE_INTERFACE("62baa2d2-ab54-41b7-b872-787e0106a421") ID2D1Path /// interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Properties : public IUnknown { - + /// /// Returns the total number of custom properties in this interface. /// STDMETHOD_(UINT32, GetPropertyCount)( ) CONST PURE; - + /// /// Retrieves the property name from the given property index. /// STDMETHOD(GetPropertyName)( UINT32 index, _Out_writes_(nameCount) PWSTR name, - UINT32 nameCount + UINT32 nameCount ) CONST PURE; - + /// /// Returns the length of the property name from the given index. /// STDMETHOD_(UINT32, GetPropertyNameLength)( - UINT32 index + UINT32 index ) CONST PURE; - + /// /// Retrieves the type of the given property. /// STDMETHOD_(D2D1_PROPERTY_TYPE, GetType)( - UINT32 index + UINT32 index ) CONST PURE; - + /// /// Retrieves the property index for the given property name. /// STDMETHOD_(UINT32, GetPropertyIndex)( - _In_ PCWSTR name + _In_ PCWSTR name ) CONST PURE; - + /// /// Sets the value of the given property using its name. /// @@ -1029,9 +1029,9 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop _In_ PCWSTR name, D2D1_PROPERTY_TYPE type, _In_reads_(dataSize) CONST BYTE *data, - UINT32 dataSize + UINT32 dataSize ) PURE; - + /// /// Sets the given value using the property index. /// @@ -1039,9 +1039,9 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop UINT32 index, D2D1_PROPERTY_TYPE type, _In_reads_(dataSize) CONST BYTE *data, - UINT32 dataSize + UINT32 dataSize ) PURE; - + /// /// Retrieves the given property or sub-property by name. '.' is the delimiter for /// sub-properties. @@ -1050,9 +1050,9 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop _In_ PCWSTR name, D2D1_PROPERTY_TYPE type, _Out_writes_(dataSize) BYTE *data, - UINT32 dataSize + UINT32 dataSize ) CONST PURE; - + /// /// Retrieves the given value by index. /// @@ -1060,68 +1060,68 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop UINT32 index, D2D1_PROPERTY_TYPE type, _Out_writes_(dataSize) BYTE *data, - UINT32 dataSize + UINT32 dataSize ) CONST PURE; - + /// /// Returns the value size for the given property index. /// STDMETHOD_(UINT32, GetValueSize)( - UINT32 index + UINT32 index ) CONST PURE; - + /// /// Retrieves the sub-properties of the given property by index. /// STDMETHOD(GetSubProperties)( UINT32 index, - _COM_Outptr_result_maybenull_ ID2D1Properties **subProperties + _COM_Outptr_result_maybenull_ ID2D1Properties **subProperties ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT SetValueByName( _In_ PCWSTR name, _In_reads_(dataSize) CONST BYTE *data, - UINT32 dataSize - ) + UINT32 dataSize + ) { return SetValueByName(name, D2D1_PROPERTY_TYPE_UNKNOWN, data, dataSize); } - + COM_DECLSPEC_NOTHROW HRESULT SetValue( UINT32 index, _In_reads_(dataSize) CONST BYTE *data, - UINT32 dataSize - ) + UINT32 dataSize + ) { return SetValue(index, D2D1_PROPERTY_TYPE_UNKNOWN, data, dataSize); } - + COM_DECLSPEC_NOTHROW HRESULT GetValueByName( _In_ PCWSTR name, _Out_writes_(dataSize) BYTE *data, - UINT32 dataSize - ) CONST + UINT32 dataSize + ) CONST { return GetValueByName(name, D2D1_PROPERTY_TYPE_UNKNOWN, data, dataSize); } - + COM_DECLSPEC_NOTHROW HRESULT GetValue( UINT32 index, _Out_writes_(dataSize) BYTE *data, - UINT32 dataSize - ) CONST + UINT32 dataSize + ) CONST { return GetValue(index, D2D1_PROPERTY_TYPE_UNKNOWN, data, dataSize); } - + // // Templatized helper functions: // @@ -1133,7 +1133,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetValueByName(propertyName, reinterpret_cast(value), sizeof(*value)); } - + template T GetValueByName( _In_ PCWSTR propertyName @@ -1142,11 +1142,10 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop T value; HRESULT ignoreHr = GetValueByName(propertyName, reinterpret_cast(&value), sizeof(value)); UNREFERENCED_PARAMETER(ignoreHr); - + return value; } - - + template HRESULT SetValueByName( _In_ PCWSTR propertyName, @@ -1155,7 +1154,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return SetValueByName(propertyName, reinterpret_cast(&value), sizeof(value)); } - + template HRESULT GetValue( U index, @@ -1165,7 +1164,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetValue(static_cast(index), data, dataSize); } - + template HRESULT GetValue( U index, @@ -1174,7 +1173,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetValue(static_cast(index), reinterpret_cast(value), sizeof(*value)); } - + template T GetValue( U index @@ -1182,13 +1181,13 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { T value; HRESULT ignoreHr = GetValue(static_cast(index), reinterpret_cast(&value), sizeof(value)); - + // Unreferenced variable: ignoreHr; - + return value; } - + template HRESULT SetValue( U index, @@ -1198,7 +1197,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return SetValue(static_cast(index), data, dataSize); } - + template HRESULT SetValue( U index, @@ -1207,7 +1206,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return SetValue(static_cast(index), reinterpret_cast(&value), sizeof(value)); } - + template HRESULT GetPropertyName( U index, @@ -1217,7 +1216,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetPropertyName(static_cast(index), name, nameCount); } - + template UINT32 GetPropertyNameLength( U index @@ -1225,7 +1224,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetPropertyNameLength(static_cast(index)); } - + template D2D1_PROPERTY_TYPE GetType( U index @@ -1233,8 +1232,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetType(static_cast(index)); } - - + template UINT32 GetValueSize( U index @@ -1242,7 +1240,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop { return GetValueSize(static_cast(index)); } - + template HRESULT GetSubProperties( U index, @@ -1259,7 +1257,7 @@ interface DX_DECLARE_INTERFACE("483473d7-cd46-4f9d-9d3a-3112aa80159d") ID2D1Prop /// interface DX_DECLARE_INTERFACE("28211a43-7d89-476f-8181-2d6159b220ad") ID2D1Effect : public ID2D1Properties { - + /// /// Sets the input to the given effect. The input can be a concrete bitmap or the /// output of another effect. @@ -1267,49 +1265,49 @@ interface DX_DECLARE_INTERFACE("28211a43-7d89-476f-8181-2d6159b220ad") ID2D1Effe STDMETHOD_(void, SetInput)( UINT32 index, _In_opt_ ID2D1Image *input, - BOOL invalidate = TRUE + BOOL invalidate = TRUE ) PURE; - + /// /// If the effect supports a variable number of inputs, this sets the number of /// input that are currently active on the effect. /// STDMETHOD(SetInputCount)( - UINT32 inputCount + UINT32 inputCount ) PURE; - + /// /// Returns the input image to the effect. The input could be another effect or a /// bitmap. /// STDMETHOD_(void, GetInput)( UINT32 index, - _Outptr_result_maybenull_ ID2D1Image **input + _Outptr_result_maybenull_ ID2D1Image **input ) CONST PURE; - + /// /// This returns the number of input that are bound into this effect. /// STDMETHOD_(UINT32, GetInputCount)( ) CONST PURE; - + /// /// Returns the output image of the given effect. This can be set as the input to /// another effect or can be drawn with DrawImage. /// STDMETHOD_(void, GetOutput)( - _Outptr_ ID2D1Image **outputImage + _Outptr_ ID2D1Image **outputImage ) CONST PURE; - + COM_DECLSPEC_NOTHROW void SetInputEffect( UINT32 index, _In_opt_ ID2D1Effect *inputEffect, - BOOL invalidate = TRUE - ) + BOOL invalidate = TRUE + ) { - + ID2D1Image *output = NULL; if (inputEffect != NULL) { @@ -1329,37 +1327,37 @@ interface DX_DECLARE_INTERFACE("28211a43-7d89-476f-8181-2d6159b220ad") ID2D1Effe /// interface DX_DECLARE_INTERFACE("a898a84c-3873-4588-b08b-ebbf978df041") ID2D1Bitmap1 : public ID2D1Bitmap { - + /// /// Retrieves the color context information associated with the bitmap. /// STDMETHOD_(void, GetColorContext)( - _Outptr_result_maybenull_ ID2D1ColorContext **colorContext + _Outptr_result_maybenull_ ID2D1ColorContext **colorContext ) CONST PURE; - + /// /// Retrieves the bitmap options used when creating the API. /// STDMETHOD_(D2D1_BITMAP_OPTIONS, GetOptions)( ) CONST PURE; - + /// /// Retrieves the DXGI surface from the corresponding bitmap, if the bitmap was /// created from a device derived from a D3D device. /// STDMETHOD(GetSurface)( - _COM_Outptr_result_maybenull_ IDXGISurface **dxgiSurface + _COM_Outptr_result_maybenull_ IDXGISurface **dxgiSurface ) CONST PURE; - + /// /// Maps the given bitmap into memory. The bitmap must have been created with the /// D2D1_BITMAP_OPTIONS_CPU_READ flag. /// STDMETHOD(Map)( D2D1_MAP_OPTIONS options, - _Out_ D2D1_MAPPED_RECT *mappedRect + _Out_ D2D1_MAPPED_RECT *mappedRect ) PURE; - + /// /// Unmaps the given bitmap from memory. /// @@ -1372,25 +1370,25 @@ interface DX_DECLARE_INTERFACE("a898a84c-3873-4588-b08b-ebbf978df041") ID2D1Bitm /// interface DX_DECLARE_INTERFACE("1c4820bb-5771-4518-a581-2fe4dd0ec657") ID2D1ColorContext : public ID2D1Resource { - + /// /// Retrieves the color space of the color context. /// STDMETHOD_(D2D1_COLOR_SPACE, GetColorSpace)( ) CONST PURE; - + /// /// Retrieves the size of the color profile, in bytes. /// STDMETHOD_(UINT32, GetProfileSize)( ) CONST PURE; - + /// /// Retrieves the color profile bytes. /// STDMETHOD(GetProfile)( _Out_writes_(profileSize) BYTE *profile, - UINT32 profileSize + UINT32 profileSize ) CONST PURE; }; // interface ID2D1ColorContext @@ -1400,7 +1398,7 @@ interface DX_DECLARE_INTERFACE("1c4820bb-5771-4518-a581-2fe4dd0ec657") ID2D1Colo /// interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1GradientStopCollection1 : public ID2D1GradientStopCollection { - + /// /// Copies the gradient stops from the collection into the caller's memory. If this /// object was created using ID2D1DeviceContext::CreateGradientStopCollection, this @@ -1411,9 +1409,9 @@ interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1Grad /// STDMETHOD_(void, GetGradientStops1)( _Out_writes_to_(gradientStopsCount, _Inexpressible_("Retrieved through GetGradientStopCount()") ) D2D1_GRADIENT_STOP *gradientStops, - UINT32 gradientStopsCount + UINT32 gradientStopsCount ) CONST PURE; - + /// /// Returns the color space in which interpolation occurs. If this object was /// created using ID2D1RenderTarget::CreateGradientStopCollection, this method @@ -1421,7 +1419,7 @@ interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1Grad /// STDMETHOD_(D2D1_COLOR_SPACE, GetPreInterpolationSpace)( ) CONST PURE; - + /// /// Returns the color space colors will be converted to after interpolation occurs. /// If this object was created using @@ -1430,7 +1428,7 @@ interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1Grad /// STDMETHOD_(D2D1_COLOR_SPACE, GetPostInterpolationSpace)( ) CONST PURE; - + /// /// Returns the buffer precision of this gradient. If this object was created using /// ID2D1RenderTarget::CreateGradientStopCollection, this method returns @@ -1438,7 +1436,7 @@ interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1Grad /// STDMETHOD_(D2D1_BUFFER_PRECISION, GetBufferPrecision)( ) CONST PURE; - + /// /// Returns the interpolation mode used to interpolate colors in the gradient. /// @@ -1451,23 +1449,23 @@ interface DX_DECLARE_INTERFACE("ae1572f4-5dd0-4777-998b-9279472ae63b") ID2D1Grad /// interface DX_DECLARE_INTERFACE("689f1f85-c72e-4e33-8f19-85754efd5ace") ID2D1DrawingStateBlock1 : public ID2D1DrawingStateBlock { - + /// /// Retrieves the state currently contained within this state block resource. /// STDMETHOD_(void, GetDescription)( - _Out_ D2D1_DRAWING_STATE_DESCRIPTION1 *stateDescription + _Out_ D2D1_DRAWING_STATE_DESCRIPTION1 *stateDescription ) CONST PURE; - + using ID2D1DrawingStateBlock::GetDescription; - + /// /// Sets the state description of this state block resource. /// STDMETHOD_(void, SetDescription)( - _In_ CONST D2D1_DRAWING_STATE_DESCRIPTION1 *stateDescription + _In_ CONST D2D1_DRAWING_STATE_DESCRIPTION1 *stateDescription ) PURE; - + using ID2D1DrawingStateBlock::SetDescription; }; // interface ID2D1DrawingStateBlock1 @@ -1477,7 +1475,7 @@ interface DX_DECLARE_INTERFACE("689f1f85-c72e-4e33-8f19-85754efd5ace") ID2D1Draw /// interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1DeviceContext : public ID2D1RenderTarget { - + /// /// Creates a bitmap with extended bitmap properties, potentially from a block of /// memory. @@ -1487,22 +1485,22 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ CONST void *sourceData, UINT32 pitch, _In_ CONST D2D1_BITMAP_PROPERTIES1 *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap + _COM_Outptr_ ID2D1Bitmap1 **bitmap ) PURE; - + using ID2D1RenderTarget::CreateBitmap; - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// STDMETHOD(CreateBitmapFromWicBitmap)( _In_ IWICBitmapSource *wicBitmapSource, _In_opt_ CONST D2D1_BITMAP_PROPERTIES1 *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap + _COM_Outptr_ ID2D1Bitmap1 **bitmap ) PURE; - + using ID2D1RenderTarget::CreateBitmapFromWicBitmap; - + /// /// Creates a color context from a color space. If the space is Custom, the context /// is initialized from the profile/profileSize arguments. Otherwise the context is @@ -1513,28 +1511,28 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi D2D1_COLOR_SPACE space, _In_reads_opt_(profileSize) CONST BYTE *profile, UINT32 profileSize, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + STDMETHOD(CreateColorContextFromFilename)( _In_ PCWSTR filename, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + STDMETHOD(CreateColorContextFromWicColorContext)( _In_ IWICColorContext *wicColorContext, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + /// /// Creates a bitmap from a DXGI surface with a set of extended properties. /// STDMETHOD(CreateBitmapFromDxgiSurface)( _In_ IDXGISurface *surface, _In_opt_ CONST D2D1_BITMAP_PROPERTIES1 *bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap + _COM_Outptr_ ID2D1Bitmap1 **bitmap ) PURE; - + /// /// Create a new effect, the effect must either be built in or previously registered /// through ID2D1Factory1::RegisterEffectFromStream or @@ -1542,9 +1540,9 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi /// STDMETHOD(CreateEffect)( _In_ REFCLSID effectId, - _COM_Outptr_ ID2D1Effect **effect + _COM_Outptr_ ID2D1Effect **effect ) PURE; - + /// /// A gradient stop collection represents a set of stops in an ideal unit length. /// This is the source resource for a linear gradient and radial gradient brush. @@ -1567,11 +1565,11 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi D2D1_BUFFER_PRECISION bufferPrecision, D2D1_EXTEND_MODE extendMode, D2D1_COLOR_INTERPOLATION_MODE colorInterpolationMode, - _COM_Outptr_ ID2D1GradientStopCollection1 **gradientStopCollection1 + _COM_Outptr_ ID2D1GradientStopCollection1 **gradientStopCollection1 ) PURE; - + using ID2D1RenderTarget::CreateGradientStopCollection; - + /// /// Creates an image brush, the input image can be any type of image, including a /// bitmap, effect and a command list. @@ -1580,57 +1578,57 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ ID2D1Image *image, _In_ CONST D2D1_IMAGE_BRUSH_PROPERTIES *imageBrushProperties, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, - _COM_Outptr_ ID2D1ImageBrush **imageBrush + _COM_Outptr_ ID2D1ImageBrush **imageBrush ) PURE; - + STDMETHOD(CreateBitmapBrush)( _In_opt_ ID2D1Bitmap *bitmap, _In_opt_ CONST D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmapBrushProperties, _In_opt_ CONST D2D1_BRUSH_PROPERTIES *brushProperties, - _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush + _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush ) PURE; - + using ID2D1RenderTarget::CreateBitmapBrush; - + /// /// Creates a new command list. /// STDMETHOD(CreateCommandList)( - _COM_Outptr_ ID2D1CommandList **commandList + _COM_Outptr_ ID2D1CommandList **commandList ) PURE; - + /// /// Indicates whether the format is supported by D2D. /// STDMETHOD_(BOOL, IsDxgiFormatSupported)( - DXGI_FORMAT format + DXGI_FORMAT format ) CONST PURE; - + /// /// Indicates whether the buffer precision is supported by D2D. /// STDMETHOD_(BOOL, IsBufferPrecisionSupported)( - D2D1_BUFFER_PRECISION bufferPrecision + D2D1_BUFFER_PRECISION bufferPrecision ) CONST PURE; - + /// /// This retrieves the local-space bounds in DIPs of the current image using the /// device context DPI. /// STDMETHOD(GetImageLocalBounds)( _In_ ID2D1Image *image, - _Out_ D2D1_RECT_F *localBounds + _Out_ D2D1_RECT_F *localBounds ) CONST PURE; - + /// /// This retrieves the world-space bounds in DIPs of the current image using the /// device context DPI. /// STDMETHOD(GetImageWorldBounds)( _In_ ID2D1Image *image, - _Out_ D2D1_RECT_F *worldBounds + _Out_ D2D1_RECT_F *worldBounds ) CONST PURE; - + /// /// Retrieves the world-space bounds in DIPs of the glyph run using the device /// context DPI. @@ -1639,73 +1637,73 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi D2D1_POINT_2F baselineOrigin, _In_ CONST DWRITE_GLYPH_RUN *glyphRun, DWRITE_MEASURING_MODE measuringMode, - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) CONST PURE; - + /// /// Retrieves the device associated with this device context. /// STDMETHOD_(void, GetDevice)( - _Outptr_ ID2D1Device **device + _Outptr_ ID2D1Device **device ) CONST PURE; - + /// /// Sets the target for this device context to point to the given image. The image /// can be a command list or a bitmap created with the D2D1_BITMAP_OPTIONS_TARGET /// flag. /// STDMETHOD_(void, SetTarget)( - _In_opt_ ID2D1Image *image + _In_opt_ ID2D1Image *image ) PURE; - + /// /// Gets the target that this device context is currently pointing to. /// STDMETHOD_(void, GetTarget)( - _Outptr_result_maybenull_ ID2D1Image **image + _Outptr_result_maybenull_ ID2D1Image **image ) CONST PURE; - + /// /// Sets tuning parameters for internal rendering inside the device context. /// STDMETHOD_(void, SetRenderingControls)( - _In_ CONST D2D1_RENDERING_CONTROLS *renderingControls + _In_ CONST D2D1_RENDERING_CONTROLS *renderingControls ) PURE; - + /// /// This retrieves the rendering controls currently selected into the device /// context. /// STDMETHOD_(void, GetRenderingControls)( - _Out_ D2D1_RENDERING_CONTROLS *renderingControls + _Out_ D2D1_RENDERING_CONTROLS *renderingControls ) CONST PURE; - + /// /// Changes the primitive blending mode for all of the rendering operations. /// STDMETHOD_(void, SetPrimitiveBlend)( - D2D1_PRIMITIVE_BLEND primitiveBlend + D2D1_PRIMITIVE_BLEND primitiveBlend ) PURE; - + /// /// Returns the primitive blend currently selected into the device context. /// STDMETHOD_(D2D1_PRIMITIVE_BLEND, GetPrimitiveBlend)( ) CONST PURE; - + /// /// Changes the units used for all of the rendering operations. /// STDMETHOD_(void, SetUnitMode)( - D2D1_UNIT_MODE unitMode + D2D1_UNIT_MODE unitMode ) PURE; - + /// /// Returns the unit mode currently set on the device context. /// STDMETHOD_(D2D1_UNIT_MODE, GetUnitMode)( ) CONST PURE; - + /// /// Draws the glyph run with an extended description to describe the glyphs. /// @@ -1714,11 +1712,11 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_ CONST DWRITE_GLYPH_RUN *glyphRun, _In_opt_ CONST DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription, _In_ ID2D1Brush *foregroundBrush, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL ) PURE; - + using ID2D1RenderTarget::DrawGlyphRun; - + /// /// Draw an image to the device context. The image represents either a concrete /// bitmap or the output of an effect graph. @@ -1728,38 +1726,38 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ CONST D2D1_POINT_2F *targetOffset = NULL, _In_opt_ CONST D2D1_RECT_F *imageRectangle = NULL, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER ) PURE; - + /// /// Draw a metafile to the device context. /// STDMETHOD_(void, DrawGdiMetafile)( _In_ ID2D1GdiMetafile *gdiMetafile, - _In_opt_ CONST D2D1_POINT_2F *targetOffset = NULL + _In_opt_ CONST D2D1_POINT_2F *targetOffset = NULL ) PURE; - + STDMETHOD_(void, DrawBitmap)( _In_ ID2D1Bitmap *bitmap, _In_opt_ CONST D2D1_RECT_F *destinationRectangle, FLOAT opacity, D2D1_INTERPOLATION_MODE interpolationMode, _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL, - _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL + _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL ) PURE; - + using ID2D1RenderTarget::DrawBitmap; - + /// /// Push a layer on the device context. /// STDMETHOD_(void, PushLayer)( _In_ CONST D2D1_LAYER_PARAMETERS1 *layerParameters, - _In_opt_ ID2D1Layer *layer + _In_opt_ ID2D1Layer *layer ) PURE; - + using ID2D1RenderTarget::PushLayer; - + /// /// This indicates that a portion of an effect's input is invalid. This method can /// be called many times. @@ -1767,27 +1765,27 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi STDMETHOD(InvalidateEffectInputRectangle)( _In_ ID2D1Effect *effect, UINT32 input, - _In_ CONST D2D1_RECT_F *inputRectangle + _In_ CONST D2D1_RECT_F *inputRectangle ) PURE; - + /// /// Gets the number of invalid ouptut rectangles that have accumulated at the /// effect. /// STDMETHOD(GetEffectInvalidRectangleCount)( _In_ ID2D1Effect *effect, - _Out_ UINT32 *rectangleCount + _Out_ UINT32 *rectangleCount ) PURE; - + /// /// Gets the invalid rectangles that are at the output of the effect. /// STDMETHOD(GetEffectInvalidRectangles)( _In_ ID2D1Effect *effect, _Out_writes_(rectanglesCount) D2D1_RECT_F *rectangles, - UINT32 rectanglesCount + UINT32 rectanglesCount ) PURE; - + /// /// Gets the maximum region of each specified input which would be used during a /// subsequent rendering operation @@ -1797,9 +1795,9 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ CONST D2D1_RECT_F *renderImageRectangle, _In_reads_(inputCount) CONST D2D1_EFFECT_INPUT_DESCRIPTION *inputDescriptions, _Out_writes_(inputCount) D2D1_RECT_F *requiredInputRects, - UINT32 inputCount + UINT32 inputCount ) PURE; - + /// /// Fill using the alpha channel of the supplied opacity mask bitmap. The brush /// opacity will be modulated by the mask. The render target antialiasing mode must @@ -1809,11 +1807,11 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_ ID2D1Bitmap *opacityMask, _In_ ID2D1Brush *brush, _In_opt_ CONST D2D1_RECT_F *destinationRectangle = NULL, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL ) PURE; - + using ID2D1RenderTarget::FillOpacityMask; - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmap( @@ -1821,12 +1819,12 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ CONST void *sourceData, UINT32 pitch, CONST D2D1_BITMAP_PROPERTIES1 &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap - ) + _COM_Outptr_ ID2D1Bitmap1 **bitmap + ) { return CreateBitmap(size, sourceData, pitch, &bitmapProperties, bitmap); } - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// @@ -1835,12 +1833,12 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi CreateBitmapFromWicBitmap( _In_ IWICBitmapSource *wicBitmapSource, CONST D2D1_BITMAP_PROPERTIES1 &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap - ) + _COM_Outptr_ ID2D1Bitmap1 **bitmap + ) { return CreateBitmapFromWicBitmap(wicBitmapSource, &bitmapProperties, bitmap); } - + /// /// Create a D2D bitmap by copying a WIC bitmap. /// @@ -1848,79 +1846,79 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi HRESULT CreateBitmapFromWicBitmap( _In_ IWICBitmapSource *wicBitmapSource, - _COM_Outptr_ ID2D1Bitmap1 **bitmap - ) + _COM_Outptr_ ID2D1Bitmap1 **bitmap + ) { return CreateBitmapFromWicBitmap(wicBitmapSource, NULL, bitmap); } - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmapFromDxgiSurface( _In_ IDXGISurface *surface, CONST D2D1_BITMAP_PROPERTIES1 &bitmapProperties, - _COM_Outptr_ ID2D1Bitmap1 **bitmap - ) + _COM_Outptr_ ID2D1Bitmap1 **bitmap + ) { return CreateBitmapFromDxgiSurface(surface, &bitmapProperties, bitmap); } - + COM_DECLSPEC_NOTHROW HRESULT CreateImageBrush( _In_opt_ ID2D1Image *image, CONST D2D1_IMAGE_BRUSH_PROPERTIES &imageBrushProperties, CONST D2D1_BRUSH_PROPERTIES &brushProperties, - _COM_Outptr_ ID2D1ImageBrush **imageBrush - ) + _COM_Outptr_ ID2D1ImageBrush **imageBrush + ) { return CreateImageBrush(image, &imageBrushProperties, &brushProperties, imageBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateImageBrush( _In_opt_ ID2D1Image *image, CONST D2D1_IMAGE_BRUSH_PROPERTIES &imageBrushProperties, - _COM_Outptr_ ID2D1ImageBrush **imageBrush - ) + _COM_Outptr_ ID2D1ImageBrush **imageBrush + ) { return CreateImageBrush(image,&imageBrushProperties, NULL, imageBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmapBrush( _In_opt_ ID2D1Bitmap *bitmap, - _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush + ) { return CreateBitmapBrush(bitmap, NULL, NULL, bitmapBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmapBrush( _In_opt_ ID2D1Bitmap *bitmap, CONST D2D1_BITMAP_BRUSH_PROPERTIES1 &bitmapBrushProperties, - _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush + ) { return CreateBitmapBrush(bitmap, &bitmapBrushProperties, NULL, bitmapBrush); } - + COM_DECLSPEC_NOTHROW HRESULT CreateBitmapBrush( _In_opt_ ID2D1Bitmap *bitmap, CONST D2D1_BITMAP_BRUSH_PROPERTIES1 &bitmapBrushProperties, CONST D2D1_BRUSH_PROPERTIES &brushProperties, - _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush - ) + _COM_Outptr_ ID2D1BitmapBrush1 **bitmapBrush + ) { return CreateBitmapBrush(bitmap, &bitmapBrushProperties, &brushProperties, bitmapBrush); } - + /// /// Draws the output of the effect as an image. /// @@ -1931,62 +1929,62 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi _In_opt_ CONST D2D1_POINT_2F *targetOffset = NULL, _In_opt_ CONST D2D1_RECT_F *imageRectangle = NULL, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { - + ID2D1Image *output = NULL; effect->GetOutput(&output); DrawImage(output, targetOffset, imageRectangle, interpolationMode, compositeMode); output->Release(); } - + COM_DECLSPEC_NOTHROW void DrawImage( _In_ ID2D1Image *image, D2D1_INTERPOLATION_MODE interpolationMode, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(image, NULL, NULL, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void DrawImage( _In_ ID2D1Effect *effect, D2D1_INTERPOLATION_MODE interpolationMode, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(effect, NULL, NULL, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void DrawImage( _In_ ID2D1Image *image, D2D1_POINT_2F targetOffset, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(image, &targetOffset, NULL, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void DrawImage( _In_ ID2D1Effect *effect, D2D1_POINT_2F targetOffset, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(effect, &targetOffset, NULL, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void DrawImage( @@ -1994,12 +1992,12 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi D2D1_POINT_2F targetOffset, CONST D2D1_RECT_F &imageRectangle, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(image, &targetOffset, &imageRectangle, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void DrawImage( @@ -2007,32 +2005,32 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi D2D1_POINT_2F targetOffset, CONST D2D1_RECT_F &imageRectangle, D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR, - D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER - ) + D2D1_COMPOSITE_MODE compositeMode = D2D1_COMPOSITE_MODE_SOURCE_OVER + ) { DrawImage(effect, &targetOffset, &imageRectangle, interpolationMode, compositeMode); } - + COM_DECLSPEC_NOTHROW void PushLayer( CONST D2D1_LAYER_PARAMETERS1 &layerParameters, - _In_opt_ ID2D1Layer *layer - ) + _In_opt_ ID2D1Layer *layer + ) { PushLayer(&layerParameters, layer); } - + COM_DECLSPEC_NOTHROW void DrawGdiMetafile( _In_ ID2D1GdiMetafile *gdiMetafile, - D2D1_POINT_2F targetOffset - ) + D2D1_POINT_2F targetOffset + ) { DrawGdiMetafile(gdiMetafile, &targetOffset); } - + COM_DECLSPEC_NOTHROW void DrawBitmap( @@ -2041,12 +2039,12 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi FLOAT opacity, D2D1_INTERPOLATION_MODE interpolationMode, _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL, - _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL - ) + _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL + ) { DrawBitmap(bitmap, &destinationRectangle, opacity, interpolationMode, sourceRectangle, perspectiveTransform); } - + COM_DECLSPEC_NOTHROW void DrawBitmap( @@ -2055,12 +2053,12 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi FLOAT opacity, D2D1_INTERPOLATION_MODE interpolationMode, CONST D2D1_RECT_F &sourceRectangle, - _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL - ) + _In_opt_ CONST D2D1_MATRIX_4X4_F *perspectiveTransform = NULL + ) { DrawBitmap(bitmap, &destinationRectangle, opacity, interpolationMode, &sourceRectangle, perspectiveTransform); } - + COM_DECLSPEC_NOTHROW void DrawBitmap( @@ -2069,44 +2067,44 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi FLOAT opacity, D2D1_INTERPOLATION_MODE interpolationMode, CONST D2D1_RECT_F &sourceRectangle, - CONST D2D1_MATRIX_4X4_F &perspectiveTransform - ) + CONST D2D1_MATRIX_4X4_F &perspectiveTransform + ) { DrawBitmap(bitmap, &destinationRectangle, opacity, interpolationMode, &sourceRectangle, &perspectiveTransform); } - + COM_DECLSPEC_NOTHROW void FillOpacityMask( _In_ ID2D1Bitmap *opacityMask, _In_ ID2D1Brush *brush, CONST D2D1_RECT_F &destinationRectangle, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL - ) + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + ) { FillOpacityMask(opacityMask, brush, &destinationRectangle, sourceRectangle); } - + COM_DECLSPEC_NOTHROW void FillOpacityMask( _In_ ID2D1Bitmap *opacityMask, _In_ ID2D1Brush *brush, CONST D2D1_RECT_F &destinationRectangle, - CONST D2D1_RECT_F &sourceRectangle - ) + CONST D2D1_RECT_F &sourceRectangle + ) { FillOpacityMask(opacityMask, brush, &destinationRectangle, &sourceRectangle); } - + /// /// Sets tuning parameters for internal rendering inside the device context. /// COM_DECLSPEC_NOTHROW void SetRenderingControls( - CONST D2D1_RENDERING_CONTROLS &renderingControls - ) + CONST D2D1_RENDERING_CONTROLS &renderingControls + ) { return SetRenderingControls(&renderingControls); } @@ -2118,15 +2116,15 @@ interface DX_DECLARE_INTERFACE("e8f7fe7a-191c-466d-ad95-975678bda998") ID2D1Devi /// interface DX_DECLARE_INTERFACE("47dd575d-ac05-4cdd-8049-9b02cd16f44c") ID2D1Device : public ID2D1Resource { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext **deviceContext + _COM_Outptr_ ID2D1DeviceContext **deviceContext ) PURE; - + /// /// Creates a D2D print control. /// @@ -2134,38 +2132,38 @@ interface DX_DECLARE_INTERFACE("47dd575d-ac05-4cdd-8049-9b02cd16f44c") ID2D1Devi _In_ IWICImagingFactory *wicFactory, _In_ IPrintDocumentPackageTarget *documentTarget, _In_opt_ CONST D2D1_PRINT_CONTROL_PROPERTIES *printControlProperties, - _COM_Outptr_ ID2D1PrintControl **printControl + _COM_Outptr_ ID2D1PrintControl **printControl ) PURE; - + /// /// Sets the maximum amount of texture memory to maintain before evicting caches. /// STDMETHOD_(void, SetMaximumTextureMemory)( - UINT64 maximumInBytes + UINT64 maximumInBytes ) PURE; - + /// /// Gets the maximum amount of texture memory to maintain before evicting caches. /// STDMETHOD_(UINT64, GetMaximumTextureMemory)( ) CONST PURE; - + /// /// Clears all resources that are cached but not held in use by the application /// through an interface reference. /// STDMETHOD_(void, ClearResources)( - UINT32 millisecondsSinceUse = 0 + UINT32 millisecondsSinceUse = 0 ) PURE; - + COM_DECLSPEC_NOTHROW HRESULT CreatePrintControl( _In_ IWICImagingFactory *wicFactory, _In_ IPrintDocumentPackageTarget *documentTarget, CONST D2D1_PRINT_CONTROL_PROPERTIES &printControlProperties, - _COM_Outptr_ ID2D1PrintControl **printControl - ) + _COM_Outptr_ ID2D1PrintControl **printControl + ) { return CreatePrintControl(wicFactory, documentTarget, &printControlProperties, printControl); } @@ -2176,15 +2174,15 @@ interface DX_DECLARE_INTERFACE("47dd575d-ac05-4cdd-8049-9b02cd16f44c") ID2D1Devi /// interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Factory1 : public ID2D1Factory { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device **d2dDevice + _COM_Outptr_ ID2D1Device **d2dDevice ) PURE; - + /// /// This creates a stroke style with the ability to preserve stroke width in various /// ways. @@ -2193,20 +2191,20 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact _In_ CONST D2D1_STROKE_STYLE_PROPERTIES1 *strokeStyleProperties, _In_reads_opt_(dashesCount) CONST FLOAT *dashes, UINT32 dashesCount, - _COM_Outptr_ ID2D1StrokeStyle1 **strokeStyle + _COM_Outptr_ ID2D1StrokeStyle1 **strokeStyle ) PURE; - + using ID2D1Factory::CreateStrokeStyle; - + /// /// Creates a path geometry with new operational methods. /// STDMETHOD(CreatePathGeometry)( - _COM_Outptr_ ID2D1PathGeometry1 **pathGeometry + _COM_Outptr_ ID2D1PathGeometry1 **pathGeometry ) PURE; - + using ID2D1Factory::CreatePathGeometry; - + /// /// Creates a new drawing state block, this can be used in subsequent /// SaveDrawingState and RestoreDrawingState operations on the render target. @@ -2214,19 +2212,19 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact STDMETHOD(CreateDrawingStateBlock)( _In_opt_ CONST D2D1_DRAWING_STATE_DESCRIPTION1 *drawingStateDescription, _In_opt_ IDWriteRenderingParams *textRenderingParams, - _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock + _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock ) PURE; - + using ID2D1Factory::CreateDrawingStateBlock; - + /// /// Creates a new GDI metafile. /// STDMETHOD(CreateGdiMetafile)( _In_ IStream *metafileStream, - _COM_Outptr_ ID2D1GdiMetafile **metafile + _COM_Outptr_ ID2D1GdiMetafile **metafile ) PURE; - + /// /// This globally registers the given effect. The effect can later be instantiated /// by using the registered class id. The effect registration is reference counted. @@ -2236,9 +2234,9 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact _In_ IStream *propertyXml, _In_reads_opt_(bindingsCount) CONST D2D1_PROPERTY_BINDING *bindings, UINT32 bindingsCount, - _In_ CONST PD2D1_EFFECT_FACTORY effectFactory + _In_ CONST PD2D1_EFFECT_FACTORY effectFactory ) PURE; - + /// /// This globally registers the given effect. The effect can later be instantiated /// by using the registered class id. The effect registration is reference counted. @@ -2248,18 +2246,18 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact _In_ PCWSTR propertyXml, _In_reads_opt_(bindingsCount) CONST D2D1_PROPERTY_BINDING *bindings, UINT32 bindingsCount, - _In_ CONST PD2D1_EFFECT_FACTORY effectFactory + _In_ CONST PD2D1_EFFECT_FACTORY effectFactory ) PURE; - + /// /// This unregisters the given effect by its class id, you need to call /// UnregisterEffect for every call to ID2D1Factory1::RegisterEffectFromStream and /// ID2D1Factory1::RegisterEffectFromString to completely unregister it. /// STDMETHOD(UnregisterEffect)( - _In_ REFCLSID classId + _In_ REFCLSID classId ) PURE; - + /// /// This returns all of the registered effects in the process, including any /// built-in effects. @@ -2272,9 +2270,9 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact _Out_writes_to_opt_(effectsCount, *effectsReturned) CLSID *effects, UINT32 effectsCount, _Out_opt_ UINT32 *effectsReturned, - _Out_opt_ UINT32 *effectsRegistered + _Out_opt_ UINT32 *effectsRegistered ) CONST PURE; - + /// /// This retrieves the effect properties for the given effect, all of the effect /// properties will be set to a default value since an effect is not instantiated to @@ -2282,36 +2280,36 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact /// STDMETHOD(GetEffectProperties)( _In_ REFCLSID effectId, - _COM_Outptr_ ID2D1Properties **properties + _COM_Outptr_ ID2D1Properties **properties ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT CreateStrokeStyle( CONST D2D1_STROKE_STYLE_PROPERTIES1 &strokeStyleProperties, _In_reads_opt_(dashesCount) CONST FLOAT *dashes, UINT32 dashesCount, - _COM_Outptr_ ID2D1StrokeStyle1 **strokeStyle - ) + _COM_Outptr_ ID2D1StrokeStyle1 **strokeStyle + ) { return CreateStrokeStyle(&strokeStyleProperties, dashes, dashesCount, strokeStyle); } - + COM_DECLSPEC_NOTHROW HRESULT CreateDrawingStateBlock( CONST D2D1_DRAWING_STATE_DESCRIPTION1 &drawingStateDescription, - _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock - ) + _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock + ) { return CreateDrawingStateBlock(&drawingStateDescription, NULL, drawingStateBlock); } - + COM_DECLSPEC_NOTHROW HRESULT CreateDrawingStateBlock( - _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock - ) + _COM_Outptr_ ID2D1DrawingStateBlock1 **drawingStateBlock + ) { return CreateDrawingStateBlock(NULL, NULL, drawingStateBlock); } @@ -2323,20 +2321,20 @@ interface DX_DECLARE_INTERFACE("bb12d362-daee-4b9a-aa1d-14ba401cfa1f") ID2D1Fact /// interface DX_DECLARE_INTERFACE("31e6e7bc-e0ff-4d46-8c64-a0a8c41c15d3") ID2D1Multithread : public IUnknown { - + /// /// Returns whether the D2D factory was created with /// D2D1_FACTORY_TYPE_MULTI_THREADED. /// STDMETHOD_(BOOL, GetMultithreadProtected)( ) CONST PURE; - + /// /// Enters the D2D API critical section, if it exists. /// STDMETHOD_(void, Enter)( ) PURE; - + /// /// Leaves the D2D API critical section, if it exists. /// @@ -2388,25 +2386,24 @@ typedef interface ID2D1Multithread ID2D1Multithread; #endif - #ifdef __cplusplus extern "C" { #endif - HRESULT WINAPI + HRESULT WINAPI D2D1CreateDevice( _In_ IDXGIDevice *dxgiDevice, _In_opt_ CONST D2D1_CREATION_PROPERTIES *creationProperties, _Outptr_ ID2D1Device **d2dDevice - ); - - HRESULT WINAPI + ); + + HRESULT WINAPI D2D1CreateDeviceContext( _In_ IDXGISurface *dxgiSurface, _In_opt_ CONST D2D1_CREATION_PROPERTIES *creationProperties, _Outptr_ ID2D1DeviceContext **d2dDeviceContext - ); + ); D2D1_COLOR_F WINAPI D2D1ConvertColorSpace( @@ -2414,40 +2411,40 @@ extern "C" D2D1_COLOR_SPACE destinationColorSpace, _In_ CONST D2D1_COLOR_F* color ); - + void WINAPI D2D1SinCos( _In_ FLOAT angle, _Out_ FLOAT *s, _Out_ FLOAT *c ); - + FLOAT WINAPI D2D1Tan( _In_ FLOAT angle ); - + FLOAT WINAPI D2D1Vec3Length( _In_ FLOAT x, _In_ FLOAT y, _In_ FLOAT z ); - + #ifdef __cplusplus } #endif - + #include #ifndef D2D_USE_C_DEFINITIONS -inline HRESULT +inline HRESULT D2D1CreateDevice( _In_ IDXGIDevice *dxgiDevice, _In_ CONST D2D1_CREATION_PROPERTIES &creationProperties, _Outptr_ ID2D1Device **d2dDevice - ) + ) { return @@ -2455,14 +2452,14 @@ D2D1CreateDevice( dxgiDevice, &creationProperties, d2dDevice); -} - -inline HRESULT +} + +inline HRESULT D2D1CreateDeviceContext( _In_ IDXGISurface *dxgiSurface, _In_ CONST D2D1_CREATION_PROPERTIES &creationProperties, _Outptr_ ID2D1DeviceContext **d2dDeviceContext - ) + ) { return D2D1CreateDeviceContext( diff --git a/gfx/include/dxsdk/d2d1_1helper.h b/gfx/include/dxsdk/d2d1_1helper.h index 8d0f941871..6261a0aebc 100644 --- a/gfx/include/dxsdk/d2d1_1helper.h +++ b/gfx/include/dxsdk/d2d1_1helper.h @@ -442,7 +442,7 @@ namespace D2D1 _22 = a._21 * b._12 + a._22 * b._22 + a._23 * b._32 + a._24 * b._42; _23 = a._21 * b._13 + a._22 * b._23 + a._23 * b._33 + a._24 * b._43; _24 = a._21 * b._14 + a._22 * b._24 + a._23 * b._34 + a._24 * b._44; - + _31 = a._31 * b._11 + a._32 * b._21 + a._33 * b._31 + a._34 * b._41; _32 = a._31 * b._12 + a._32 * b._22 + a._33 * b._32 + a._34 * b._42; _33 = a._31 * b._13 + a._32 * b._23 + a._33 * b._33 + a._34 * b._43; @@ -622,7 +622,7 @@ namespace D2D1 }; return bitmapProperties; - } + } COM_DECLSPEC_NOTHROW D2D1FORCEINLINE @@ -852,7 +852,7 @@ namespace D2D1 // // Sets a bitmap as an effect input, while inserting a DPI compensation effect // to preserve visual appearance as the device context's DPI changes. - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE HRESULT diff --git a/gfx/include/dxsdk/d2d1_2.h b/gfx/include/dxsdk/d2d1_2.h index 69bf3be627..9c7665d576 100644 --- a/gfx/include/dxsdk/d2d1_2.h +++ b/gfx/include/dxsdk/d2d1_2.h @@ -65,24 +65,24 @@ interface DX_DECLARE_INTERFACE("a16907d7-bc02-4801-99e8-8cf7f485f774") ID2D1Geom /// interface DX_DECLARE_INTERFACE("d37f57e4-6908-459f-a199-e72f24f79987") ID2D1DeviceContext1 : public ID2D1DeviceContext { - + STDMETHOD(CreateFilledGeometryRealization)( _In_ ID2D1Geometry *geometry, FLOAT flatteningTolerance, - _COM_Outptr_ ID2D1GeometryRealization **geometryRealization + _COM_Outptr_ ID2D1GeometryRealization **geometryRealization ) PURE; - + STDMETHOD(CreateStrokedGeometryRealization)( _In_ ID2D1Geometry *geometry, FLOAT flatteningTolerance, FLOAT strokeWidth, _In_opt_ ID2D1StrokeStyle *strokeStyle, - _COM_Outptr_ ID2D1GeometryRealization **geometryRealization + _COM_Outptr_ ID2D1GeometryRealization **geometryRealization ) PURE; - + STDMETHOD_(void, DrawGeometryRealization)( _In_ ID2D1GeometryRealization *geometryRealization, - _In_ ID2D1Brush *brush + _In_ ID2D1Brush *brush ) PURE; }; // interface ID2D1DeviceContext1 @@ -92,28 +92,28 @@ interface DX_DECLARE_INTERFACE("d37f57e4-6908-459f-a199-e72f24f79987") ID2D1Devi /// interface DX_DECLARE_INTERFACE("d21768e1-23a4-4823-a14b-7c3eba85d658") ID2D1Device1 : public ID2D1Device { - + /// /// Retrieves the rendering priority currently set on the device. /// STDMETHOD_(D2D1_RENDERING_PRIORITY, GetRenderingPriority)( ) PURE; - + /// /// Sets the rendering priority of the device. /// STDMETHOD_(void, SetRenderingPriority)( - D2D1_RENDERING_PRIORITY renderingPriority + D2D1_RENDERING_PRIORITY renderingPriority ) PURE; - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext1 **deviceContext1 + _COM_Outptr_ ID2D1DeviceContext1 **deviceContext1 ) PURE; - + using ID2D1Device::CreateDeviceContext; }; // interface ID2D1Device1 @@ -123,15 +123,15 @@ interface DX_DECLARE_INTERFACE("d21768e1-23a4-4823-a14b-7c3eba85d658") ID2D1Devi /// interface DX_DECLARE_INTERFACE("94f81a73-9212-4376-9c58-b16a3a0d3992") ID2D1Factory2 : public ID2D1Factory1 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device1 **d2dDevice1 + _COM_Outptr_ ID2D1Device1 **d2dDevice1 ) PURE; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory2 @@ -142,13 +142,13 @@ interface DX_DECLARE_INTERFACE("94f81a73-9212-4376-9c58-b16a3a0d3992") ID2D1Fact /// interface DX_DECLARE_INTERFACE("9eb767fd-4269-4467-b8c2-eb30cb305743") ID2D1CommandSink1 : public ID2D1CommandSink { - + /// /// This method is called if primitiveBlend value was added after Windows 8. /// SetPrimitiveBlend method is used for Win8 values (_SOURCE_OVER and _COPY). /// STDMETHOD(SetPrimitiveBlend1)( - D2D1_PRIMITIVE_BLEND primitiveBlend + D2D1_PRIMITIVE_BLEND primitiveBlend ) PURE; }; // interface ID2D1CommandSink1 @@ -168,23 +168,21 @@ typedef interface ID2D1CommandSink1 ID2D1CommandSink1; #endif - #ifdef __cplusplus extern "C" { #endif #if NTDDI_VERSION >= NTDDI_WINBLUE - FLOAT WINAPI + FLOAT WINAPI D2D1ComputeMaximumScaleFactor( _In_ CONST D2D1_MATRIX_3X2_F *matrix - ); + ); #endif // #if NTDDI_VERSION >= NTDDI_WINBLUE - + #ifdef __cplusplus } #endif - /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d2d1_2helper.h b/gfx/include/dxsdk/d2d1_2helper.h index 0918a214f7..f6f43b9ed8 100644 --- a/gfx/include/dxsdk/d2d1_2helper.h +++ b/gfx/include/dxsdk/d2d1_2helper.h @@ -45,10 +45,10 @@ namespace D2D1 { D2D1_MATRIX_3X2_F dpiDependentTransform = matrix * D2D1::Matrix3x2F::Scale(dpiX / 96.0f, dpiY / 96.0f); - + FLOAT absMaxZoomFactor = (maxZoomFactor > 0) ? maxZoomFactor : -maxZoomFactor; - return D2D1_DEFAULT_FLATTENING_TOLERANCE / + return D2D1_DEFAULT_FLATTENING_TOLERANCE / (absMaxZoomFactor * D2D1ComputeMaximumScaleFactor(&dpiDependentTransform)); } diff --git a/gfx/include/dxsdk/d2d1_3.h b/gfx/include/dxsdk/d2d1_3.h index d1028077a3..515d9ee571 100644 --- a/gfx/include/dxsdk/d2d1_3.h +++ b/gfx/include/dxsdk/d2d1_3.h @@ -94,7 +94,7 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS); typedef enum D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS { D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS_NONE = 0, - + /// /// Prevents the image source from being automatically scaled (by a ratio of the /// context DPI divided by 96) while drawn. @@ -111,28 +111,28 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_TRANSFORMED_IMAGE_SOURCE_OPTIONS); /// typedef struct D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES { - + /// /// The orientation at which the image source is drawn. /// D2D1_ORIENTATION orientation; - + /// /// The horizontal scale factor at which the image source is drawn. /// FLOAT scaleX; - + /// /// The vertical scale factor at which the image source is drawn. /// FLOAT scaleY; - + /// /// The interpolation mode used when the image source is drawn. This is ignored if /// the image source is drawn using the DrawImage method, or using an image brush. /// D2D1_INTERPOLATION_MODE interpolationMode; - + /// /// Option flags. /// @@ -170,12 +170,12 @@ typedef struct D2D1_INK_BEZIER_SEGMENT /// typedef struct D2D1_INK_STYLE_PROPERTIES { - + /// /// The general shape of the nib used to draw a given ink object. /// D2D1_INK_NIB_SHAPE nibShape; - + /// /// The transform applied to shape of the nib. _31 and _32 are ignored. /// @@ -188,17 +188,17 @@ typedef struct D2D1_INK_STYLE_PROPERTIES /// typedef enum D2D1_PATCH_EDGE_MODE { - + /// /// Render this edge aliased. /// D2D1_PATCH_EDGE_MODE_ALIASED = 0, - + /// /// Render this edge antialiased. /// D2D1_PATCH_EDGE_MODE_ANTIALIASED = 1, - + /// /// Render this edge aliased and inflated out slightly. /// @@ -215,122 +215,122 @@ typedef enum D2D1_PATCH_EDGE_MODE /// typedef struct D2D1_GRADIENT_MESH_PATCH { - + /// /// The gradient mesh patch control point at position 00. /// D2D1_POINT_2F point00; - + /// /// The gradient mesh patch control point at position 01. /// D2D1_POINT_2F point01; - + /// /// The gradient mesh patch control point at position 02. /// D2D1_POINT_2F point02; - + /// /// The gradient mesh patch control point at position 03. /// D2D1_POINT_2F point03; - + /// /// The gradient mesh patch control point at position 10. /// D2D1_POINT_2F point10; - + /// /// The gradient mesh patch control point at position 11. /// D2D1_POINT_2F point11; - + /// /// The gradient mesh patch control point at position 12. /// D2D1_POINT_2F point12; - + /// /// The gradient mesh patch control point at position 13. /// D2D1_POINT_2F point13; - + /// /// The gradient mesh patch control point at position 20. /// D2D1_POINT_2F point20; - + /// /// The gradient mesh patch control point at position 21. /// D2D1_POINT_2F point21; - + /// /// The gradient mesh patch control point at position 22. /// D2D1_POINT_2F point22; - + /// /// The gradient mesh patch control point at position 23. /// D2D1_POINT_2F point23; - + /// /// The gradient mesh patch control point at position 30. /// D2D1_POINT_2F point30; - + /// /// The gradient mesh patch control point at position 31. /// D2D1_POINT_2F point31; - + /// /// The gradient mesh patch control point at position 32. /// D2D1_POINT_2F point32; - + /// /// The gradient mesh patch control point at position 33. /// D2D1_POINT_2F point33; - + /// /// The color associated with control point at position 00. /// D2D1_COLOR_F color00; - + /// /// The color associated with control point at position 03. /// D2D1_COLOR_F color03; - + /// /// The color associated with control point at position 30. /// D2D1_COLOR_F color30; - + /// /// The color associated with control point at position 33. /// D2D1_COLOR_F color33; - + /// /// The edge mode for the top edge of the patch. /// D2D1_PATCH_EDGE_MODE topEdgeMode; - + /// /// The edge mode for the left edge of the patch. /// D2D1_PATCH_EDGE_MODE leftEdgeMode; - + /// /// The edge mode for the bottom edge of the patch. /// D2D1_PATCH_EDGE_MODE bottomEdgeMode; - + /// /// The edge mode for the right edge of the patch. /// @@ -340,12 +340,12 @@ typedef struct D2D1_GRADIENT_MESH_PATCH typedef enum D2D1_SPRITE_OPTIONS { - + /// /// Use default sprite rendering behavior. /// D2D1_SPRITE_OPTIONS_NONE = 0, - + /// /// Bitmap interpolation will be clamped to the sprite's source rectangle. /// @@ -361,13 +361,13 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_SPRITE_OPTIONS); /// typedef enum D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION { - + /// /// Color bitmap glyph positions are snapped to the nearest pixel if the bitmap /// resolution matches that of the device context. /// D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DEFAULT = 0, - + /// /// Color bitmap glyph positions are not snapped. /// @@ -381,17 +381,17 @@ typedef enum D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION /// typedef enum D2D1_GAMMA1 { - + /// /// Colors are manipulated in 2.2 gamma color space. /// D2D1_GAMMA1_G22 = D2D1_GAMMA_2_2, - + /// /// Colors are manipulated in 1.0 gamma color space. /// D2D1_GAMMA1_G10 = D2D1_GAMMA_1_0, - + /// /// Colors are manipulated in ST.2084 PQ gamma color space. /// @@ -405,28 +405,28 @@ typedef enum D2D1_GAMMA1 /// typedef struct D2D1_SIMPLE_COLOR_PROFILE { - + /// /// The XY coordinates of the red primary in CIEXYZ space. /// D2D1_POINT_2F redPrimary; - + /// /// The XY coordinates of the green primary in CIEXYZ space. /// D2D1_POINT_2F greenPrimary; - + /// /// The XY coordinates of the blue primary in CIEXYZ space. /// D2D1_POINT_2F bluePrimary; - + /// /// The X/Z tristimulus values for the whitepoint, normalized for relative /// luminance. /// D2D1_POINT_2F whitePointXZ; - + /// /// The gamma encoding to use for this color space. /// @@ -487,27 +487,27 @@ EXTERN_C CONST IID IID_ID2D1Factory7; /// interface DX_DECLARE_INTERFACE("bae8b344-23fc-4071-8cb5-d05d6f073848") ID2D1InkStyle : public ID2D1Resource { - + STDMETHOD_(void, SetNibTransform)( - _In_ CONST D2D1_MATRIX_3X2_F *transform + _In_ CONST D2D1_MATRIX_3X2_F *transform ) PURE; - + STDMETHOD_(void, GetNibTransform)( - _Out_ D2D1_MATRIX_3X2_F *transform + _Out_ D2D1_MATRIX_3X2_F *transform ) CONST PURE; - + STDMETHOD_(void, SetNibShape)( - D2D1_INK_NIB_SHAPE nibShape + D2D1_INK_NIB_SHAPE nibShape ) PURE; - + STDMETHOD_(D2D1_INK_NIB_SHAPE, GetNibShape)( ) CONST PURE; - + COM_DECLSPEC_NOTHROW void SetNibTransform( - CONST D2D1_MATRIX_3X2_F &transform - ) + CONST D2D1_MATRIX_3X2_F &transform + ) { SetNibTransform(&transform); } @@ -519,66 +519,66 @@ interface DX_DECLARE_INTERFACE("bae8b344-23fc-4071-8cb5-d05d6f073848") ID2D1InkS /// interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink : public ID2D1Resource { - + /// /// Resets the ink start point. /// STDMETHOD_(void, SetStartPoint)( - _In_ CONST D2D1_INK_POINT *startPoint + _In_ CONST D2D1_INK_POINT *startPoint ) PURE; - + /// /// Retrieve the start point with which the ink was initialized. /// STDMETHOD_(D2D1_INK_POINT, GetStartPoint)( ) CONST PURE; - + /// /// Add one or more segments to the end of the ink. /// STDMETHOD(AddSegments)( _In_reads_(segmentsCount) CONST D2D1_INK_BEZIER_SEGMENT *segments, - UINT32 segmentsCount + UINT32 segmentsCount ) PURE; - + /// /// Remove one or more segments from the end of the ink. /// STDMETHOD(RemoveSegmentsAtEnd)( - UINT32 segmentsCount + UINT32 segmentsCount ) PURE; - + /// /// Updates the specified segments with new control points. /// STDMETHOD(SetSegments)( UINT32 startSegment, _In_reads_(segmentsCount) CONST D2D1_INK_BEZIER_SEGMENT *segments, - UINT32 segmentsCount + UINT32 segmentsCount ) PURE; - + /// /// Update the last segment with new control points. /// STDMETHOD(SetSegmentAtEnd)( - _In_ CONST D2D1_INK_BEZIER_SEGMENT *segment + _In_ CONST D2D1_INK_BEZIER_SEGMENT *segment ) PURE; - + /// /// Returns the number of segments the ink is composed of. /// STDMETHOD_(UINT32, GetSegmentCount)( ) CONST PURE; - + /// /// Retrieve the segments stored in the ink. /// STDMETHOD(GetSegments)( UINT32 startSegment, _Out_writes_(segmentsCount) D2D1_INK_BEZIER_SEGMENT *segments, - UINT32 segmentsCount + UINT32 segmentsCount ) CONST PURE; - + /// /// Construct a geometric representation of the ink. /// @@ -586,39 +586,39 @@ interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink _In_opt_ ID2D1InkStyle *inkStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink + _In_ ID2D1SimplifiedGeometrySink *geometrySink ) CONST PURE; - + /// /// Retrieve the bounds of the ink, with an optional applied transform. /// STDMETHOD(GetBounds)( _In_opt_ ID2D1InkStyle *inkStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) CONST PURE; - + /// /// Resets the ink start point. /// COM_DECLSPEC_NOTHROW void SetStartPoint( - CONST D2D1_INK_POINT &startPoint - ) + CONST D2D1_INK_POINT &startPoint + ) { SetStartPoint(&startPoint); } - + COM_DECLSPEC_NOTHROW HRESULT SetSegmentAtEnd( - CONST D2D1_INK_BEZIER_SEGMENT &segment - ) + CONST D2D1_INK_BEZIER_SEGMENT &segment + ) { return SetSegmentAtEnd(&segment); } - + /// /// Construct a geometric representation of the ink. /// @@ -628,12 +628,12 @@ interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink _In_opt_ ID2D1InkStyle *inkStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, FLOAT flatteningTolerance, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return StreamAsGeometry(inkStyle,&worldTransform, flatteningTolerance, geometrySink); } - + /// /// Construct a geometric representation of the ink. /// @@ -642,12 +642,12 @@ interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink StreamAsGeometry( _In_opt_ ID2D1InkStyle *inkStyle, _In_opt_ CONST D2D1_MATRIX_3X2_F *worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return StreamAsGeometry(inkStyle,worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } - + /// /// Construct a geometric representation of the ink. /// @@ -656,8 +656,8 @@ interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink StreamAsGeometry( _In_opt_ ID2D1InkStyle *inkStyle, CONST D2D1_MATRIX_3X2_F &worldTransform, - _In_ ID2D1SimplifiedGeometrySink *geometrySink - ) CONST + _In_ ID2D1SimplifiedGeometrySink *geometrySink + ) CONST { return StreamAsGeometry(inkStyle,&worldTransform, D2D1_DEFAULT_FLATTENING_TOLERANCE, geometrySink); } @@ -670,20 +670,20 @@ interface DX_DECLARE_INTERFACE("b499923b-7029-478f-a8b3-432c7c5f5312") ID2D1Ink /// interface DX_DECLARE_INTERFACE("f292e401-c050-4cde-83d7-04962d3b23c2") ID2D1GradientMesh : public ID2D1Resource { - + /// /// Returns the number of patches of the gradient mesh. /// STDMETHOD_(UINT32, GetPatchCount)( ) CONST PURE; - + /// /// Retrieve the patch data stored in the gradient mesh. /// STDMETHOD(GetPatches)( UINT32 startIndex, _Out_writes_(patchesCount) D2D1_GRADIENT_MESH_PATCH *patches, - UINT32 patchesCount + UINT32 patchesCount ) CONST PURE; }; // interface ID2D1GradientMesh @@ -692,12 +692,12 @@ interface DX_DECLARE_INTERFACE("f292e401-c050-4cde-83d7-04962d3b23c2") ID2D1Grad /// interface DX_DECLARE_INTERFACE("c9b664e5-74a1-4378-9ac2-eefc37a3f4d8") ID2D1ImageSource : public ID2D1Image { - + STDMETHOD(OfferResources)( ) PURE; - + STDMETHOD(TryReclaimResources)( - _Out_ BOOL *resourcesDiscarded + _Out_ BOOL *resourcesDiscarded ) PURE; }; // interface ID2D1ImageSource @@ -706,33 +706,33 @@ interface DX_DECLARE_INTERFACE("c9b664e5-74a1-4378-9ac2-eefc37a3f4d8") ID2D1Imag /// interface DX_DECLARE_INTERFACE("77395441-1c8f-4555-8683-f50dab0fe792") ID2D1ImageSourceFromWic : public ID2D1ImageSource { - + STDMETHOD(EnsureCached)( - _In_opt_ CONST D2D1_RECT_U *rectangleToFill + _In_opt_ CONST D2D1_RECT_U *rectangleToFill ) PURE; - + STDMETHOD(TrimCache)( - _In_opt_ CONST D2D1_RECT_U *rectangleToPreserve + _In_opt_ CONST D2D1_RECT_U *rectangleToPreserve ) PURE; - + STDMETHOD_(void, GetSource)( - _Outptr_result_maybenull_ IWICBitmapSource **wicBitmapSource + _Outptr_result_maybenull_ IWICBitmapSource **wicBitmapSource ) CONST PURE; - + COM_DECLSPEC_NOTHROW HRESULT EnsureCached( - CONST D2D1_RECT_U &rectangleToFill - ) + CONST D2D1_RECT_U &rectangleToFill + ) { return EnsureCached(&rectangleToFill); } - + COM_DECLSPEC_NOTHROW HRESULT TrimCache( - CONST D2D1_RECT_U &rectangleToPreserve - ) + CONST D2D1_RECT_U &rectangleToPreserve + ) { return TrimCache(&rectangleToPreserve); } @@ -743,13 +743,13 @@ interface DX_DECLARE_INTERFACE("77395441-1c8f-4555-8683-f50dab0fe792") ID2D1Imag /// interface DX_DECLARE_INTERFACE("7f1f79e5-2796-416c-8f55-700f911445e5") ID2D1TransformedImageSource : public ID2D1Image { - + STDMETHOD_(void, GetSource)( - _Outptr_result_maybenull_ ID2D1ImageSource **imageSource + _Outptr_result_maybenull_ ID2D1ImageSource **imageSource ) CONST PURE; - + STDMETHOD_(void, GetProperties)( - _Out_ D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *properties + _Out_ D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *properties ) CONST PURE; }; // interface ID2D1TransformedImageSource @@ -768,33 +768,33 @@ interface DX_DECLARE_INTERFACE("53dd9855-a3b0-4d5b-82e1-26e25c5e5797") ID2D1Look /// interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1DeviceContext2 : public ID2D1DeviceContext1 { - + STDMETHOD(CreateInk)( _In_ CONST D2D1_INK_POINT *startPoint, - _COM_Outptr_ ID2D1Ink **ink + _COM_Outptr_ ID2D1Ink **ink ) PURE; - + /// /// Creates a new ink style. /// STDMETHOD(CreateInkStyle)( _In_opt_ CONST D2D1_INK_STYLE_PROPERTIES *inkStyleProperties, - _COM_Outptr_ ID2D1InkStyle **inkStyle + _COM_Outptr_ ID2D1InkStyle **inkStyle ) PURE; - + STDMETHOD(CreateGradientMesh)( _In_reads_(patchesCount) CONST D2D1_GRADIENT_MESH_PATCH *patches, UINT32 patchesCount, - _COM_Outptr_ ID2D1GradientMesh **gradientMesh + _COM_Outptr_ ID2D1GradientMesh **gradientMesh ) PURE; - + STDMETHOD(CreateImageSourceFromWic)( _In_ IWICBitmapSource *wicBitmapSource, D2D1_IMAGE_SOURCE_LOADING_OPTIONS loadingOptions, D2D1_ALPHA_MODE alphaMode, - _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource + _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource ) PURE; - + /// /// Creates a 3D lookup table for mapping a 3-channel input to a 3-channel output. /// The table data must be provided in 4-channel format. @@ -805,66 +805,66 @@ interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1Devi _In_reads_(dataCount) CONST BYTE *data, UINT32 dataCount, _In_reads_(2) CONST UINT32 *strides, - _COM_Outptr_ ID2D1LookupTable3D **lookupTable + _COM_Outptr_ ID2D1LookupTable3D **lookupTable ) PURE; - + STDMETHOD(CreateImageSourceFromDxgi)( _In_reads_(surfaceCount) IDXGISurface **surfaces, UINT32 surfaceCount, DXGI_COLOR_SPACE_TYPE colorSpace, D2D1_IMAGE_SOURCE_FROM_DXGI_OPTIONS options, - _COM_Outptr_ ID2D1ImageSource **imageSource + _COM_Outptr_ ID2D1ImageSource **imageSource ) PURE; - + /// /// Retrieves the world-space bounds in DIPs of the gradient mesh using the device /// context DPI. /// STDMETHOD(GetGradientMeshWorldBounds)( _In_ ID2D1GradientMesh *gradientMesh, - _Out_ D2D1_RECT_F *pBounds + _Out_ D2D1_RECT_F *pBounds ) CONST PURE; - + STDMETHOD_(void, DrawInk)( _In_ ID2D1Ink *ink, _In_ ID2D1Brush *brush, - _In_opt_ ID2D1InkStyle *inkStyle + _In_opt_ ID2D1InkStyle *inkStyle ) PURE; - + STDMETHOD_(void, DrawGradientMesh)( - _In_ ID2D1GradientMesh *gradientMesh + _In_ ID2D1GradientMesh *gradientMesh ) PURE; - + /// /// Draw a metafile to the device context. /// STDMETHOD_(void, DrawGdiMetafile)( _In_ ID2D1GdiMetafile *gdiMetafile, _In_opt_ CONST D2D1_RECT_F *destinationRectangle, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL + _In_opt_ CONST D2D1_RECT_F *sourceRectangle = NULL ) PURE; - + using ID2D1DeviceContext::DrawGdiMetafile; - + /// /// Creates an image source which shares resources with an original. /// STDMETHOD(CreateTransformedImageSource)( _In_ ID2D1ImageSource *imageSource, _In_ CONST D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *properties, - _COM_Outptr_ ID2D1TransformedImageSource **transformedImageSource + _COM_Outptr_ ID2D1TransformedImageSource **transformedImageSource ) PURE; - + COM_DECLSPEC_NOTHROW HRESULT CreateInk( CONST D2D1_INK_POINT &startPoint, - _COM_Outptr_ ID2D1Ink **ink - ) + _COM_Outptr_ ID2D1Ink **ink + ) { return CreateInk(&startPoint, ink); } - + /// /// Creates a new ink style. /// @@ -872,33 +872,33 @@ interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1Devi HRESULT CreateInkStyle( CONST D2D1_INK_STYLE_PROPERTIES &inkStyleProperties, - _COM_Outptr_ ID2D1InkStyle **inkStyle - ) + _COM_Outptr_ ID2D1InkStyle **inkStyle + ) { return CreateInkStyle(&inkStyleProperties, inkStyle); } - + COM_DECLSPEC_NOTHROW HRESULT CreateImageSourceFromWic( _In_ IWICBitmapSource *wicBitmapSource, D2D1_IMAGE_SOURCE_LOADING_OPTIONS loadingOptions, - _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource - ) + _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource + ) { return CreateImageSourceFromWic(wicBitmapSource, loadingOptions, D2D1_ALPHA_MODE_UNKNOWN, imageSource); } - + COM_DECLSPEC_NOTHROW HRESULT CreateImageSourceFromWic( _In_ IWICBitmapSource *wicBitmapSource, - _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource - ) + _COM_Outptr_ ID2D1ImageSourceFromWic **imageSource + ) { return CreateImageSourceFromWic(wicBitmapSource, D2D1_IMAGE_SOURCE_LOADING_OPTIONS_NONE, D2D1_ALPHA_MODE_UNKNOWN, imageSource); } - + /// /// Draw a metafile to the device context. /// @@ -907,12 +907,12 @@ interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1Devi DrawGdiMetafile( _In_ ID2D1GdiMetafile *gdiMetafile, CONST D2D1_RECT_F &destinationRectangle, - CONST D2D1_RECT_F &sourceRectangle - ) + CONST D2D1_RECT_F &sourceRectangle + ) { return DrawGdiMetafile(gdiMetafile, &destinationRectangle, &sourceRectangle); } - + /// /// Draw a metafile to the device context. /// @@ -921,8 +921,8 @@ interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1Devi DrawGdiMetafile( _In_ ID2D1GdiMetafile *gdiMetafile, CONST D2D1_RECT_F &destinationRectangle, - _In_ CONST D2D1_RECT_F *sourceRectangle = NULL - ) + _In_ CONST D2D1_RECT_F *sourceRectangle = NULL + ) { return DrawGdiMetafile(gdiMetafile, &destinationRectangle, sourceRectangle); } @@ -936,31 +936,31 @@ interface DX_DECLARE_INTERFACE("394ea6a3-0c34-4321-950b-6ca20f0be6c7") ID2D1Devi /// interface DX_DECLARE_INTERFACE("a44472e1-8dfb-4e60-8492-6e2861c9ca8b") ID2D1Device2 : public ID2D1Device1 { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext2 **deviceContext2 + _COM_Outptr_ ID2D1DeviceContext2 **deviceContext2 ) PURE; - + using ID2D1Device1::CreateDeviceContext; - + using ID2D1Device::CreateDeviceContext; - + /// /// Flush all device contexts that reference a given bitmap. /// STDMETHOD_(void, FlushDeviceContexts)( - _In_ ID2D1Bitmap *bitmap + _In_ ID2D1Bitmap *bitmap ) PURE; - + /// /// Returns the DXGI device associated with this D2D device. /// STDMETHOD(GetDxgiDevice)( - _COM_Outptr_ IDXGIDevice **dxgiDevice + _COM_Outptr_ IDXGIDevice **dxgiDevice ) PURE; }; // interface ID2D1Device2 @@ -970,17 +970,17 @@ interface DX_DECLARE_INTERFACE("a44472e1-8dfb-4e60-8492-6e2861c9ca8b") ID2D1Devi /// interface DX_DECLARE_INTERFACE("0869759f-4f00-413f-b03e-2bda45404d0f") ID2D1Factory3 : public ID2D1Factory2 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device2 **d2dDevice2 + _COM_Outptr_ ID2D1Device2 **d2dDevice2 ) PURE; - + using ID2D1Factory2::CreateDevice; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory3 @@ -990,23 +990,23 @@ interface DX_DECLARE_INTERFACE("0869759f-4f00-413f-b03e-2bda45404d0f") ID2D1Fact /// interface DX_DECLARE_INTERFACE("3bab440e-417e-47df-a2e2-bc0be6a00916") ID2D1CommandSink2 : public ID2D1CommandSink1 { - + STDMETHOD(DrawInk)( _In_ ID2D1Ink *ink, _In_ ID2D1Brush *brush, - _In_opt_ ID2D1InkStyle *inkStyle + _In_opt_ ID2D1InkStyle *inkStyle ) PURE; - + STDMETHOD(DrawGradientMesh)( - _In_ ID2D1GradientMesh *gradientMesh + _In_ ID2D1GradientMesh *gradientMesh ) PURE; - + STDMETHOD(DrawGdiMetafile)( _In_ ID2D1GdiMetafile *gdiMetafile, _In_opt_ CONST D2D1_RECT_F *destinationRectangle, - _In_opt_ CONST D2D1_RECT_F *sourceRectangle + _In_opt_ CONST D2D1_RECT_F *sourceRectangle ) PURE; - + using ID2D1CommandSink::DrawGdiMetafile; }; // interface ID2D1CommandSink2 @@ -1015,21 +1015,21 @@ interface DX_DECLARE_INTERFACE("3bab440e-417e-47df-a2e2-bc0be6a00916") ID2D1Comm /// interface DX_DECLARE_INTERFACE("2e69f9e8-dd3f-4bf9-95ba-c04f49d788df") ID2D1GdiMetafile1 : public ID2D1GdiMetafile { - + /// /// Returns the DPI reported by the metafile. /// STDMETHOD(GetDpi)( _Out_ FLOAT *dpiX, - _Out_ FLOAT *dpiY + _Out_ FLOAT *dpiY ) PURE; - + /// /// Gets the bounds (in DIPs) of the metafile (as specified by the frame rect /// declared in the metafile). /// STDMETHOD(GetSourceBounds)( - _Out_ D2D1_RECT_F *bounds + _Out_ D2D1_RECT_F *bounds ) PURE; }; // interface ID2D1GdiMetafile1 @@ -1038,7 +1038,7 @@ interface DX_DECLARE_INTERFACE("2e69f9e8-dd3f-4bf9-95ba-c04f49d788df") ID2D1GdiM /// interface DX_DECLARE_INTERFACE("fd0ecb6b-91e6-411e-8655-395e760f91b4") ID2D1GdiMetafileSink1 : public ID2D1GdiMetafileSink { - + /// /// Callback for examining a metafile record. /// @@ -1046,9 +1046,9 @@ interface DX_DECLARE_INTERFACE("fd0ecb6b-91e6-411e-8655-395e760f91b4") ID2D1GdiM DWORD recordType, _In_opt_ CONST void *recordData, DWORD recordDataSize, - UINT32 flags + UINT32 flags ) PURE; - + using ID2D1GdiMetafileSink::ProcessRecord; }; // interface ID2D1GdiMetafileSink1 @@ -1056,7 +1056,7 @@ interface DX_DECLARE_INTERFACE("fd0ecb6b-91e6-411e-8655-395e760f91b4") ID2D1GdiM interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1SpriteBatch : public ID2D1Resource { - + /// /// Adds sprites to the end of the sprite batch. /// @@ -1069,9 +1069,9 @@ interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1Spri UINT32 destinationRectanglesStride = sizeof(D2D1_RECT_F), UINT32 sourceRectanglesStride = sizeof(D2D1_RECT_U), UINT32 colorsStride = sizeof(D2D1_COLOR_F), - UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) + UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) ) PURE; - + /// /// Set properties for existing sprites. All properties not specified are /// unmodified. @@ -1086,9 +1086,9 @@ interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1Spri UINT32 destinationRectanglesStride = sizeof(D2D1_RECT_F), UINT32 sourceRectanglesStride = sizeof(D2D1_RECT_U), UINT32 colorsStride = sizeof(D2D1_COLOR_F), - UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) + UINT32 transformsStride = sizeof(D2D1_MATRIX_3X2_F) ) PURE; - + /// /// Retrieves sprite properties. /// @@ -1098,15 +1098,15 @@ interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1Spri _Out_writes_opt_(spriteCount) D2D1_RECT_F *destinationRectangles = NULL, _Out_writes_opt_(spriteCount) D2D1_RECT_U *sourceRectangles = NULL, _Out_writes_opt_(spriteCount) D2D1_COLOR_F *colors = NULL, - _Out_writes_opt_(spriteCount) D2D1_MATRIX_3X2_F *transforms = NULL + _Out_writes_opt_(spriteCount) D2D1_MATRIX_3X2_F *transforms = NULL ) CONST PURE; - + /// /// Retrieves the number of sprites in the sprite batch. /// STDMETHOD_(UINT32, GetSpriteCount)( ) CONST PURE; - + /// /// Removes all sprites from the sprite batch. /// @@ -1116,14 +1116,14 @@ interface DX_DECLARE_INTERFACE("4dc583bf-3a10-438a-8722-e9765224f1f1") ID2D1Spri interface DX_DECLARE_INTERFACE("235a7496-8351-414c-bcd4-6672ab2d8e00") ID2D1DeviceContext3 : public ID2D1DeviceContext2 { - + /// /// Creates a new sprite batch. /// STDMETHOD(CreateSpriteBatch)( - _COM_Outptr_ ID2D1SpriteBatch **spriteBatch + _COM_Outptr_ ID2D1SpriteBatch **spriteBatch ) PURE; - + /// /// Draws sprites in a sprite batch. /// @@ -1133,9 +1133,9 @@ interface DX_DECLARE_INTERFACE("235a7496-8351-414c-bcd4-6672ab2d8e00") ID2D1Devi UINT32 spriteCount, _In_ ID2D1Bitmap *bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, - D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE + D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE ) PURE; - + /// /// Draws all sprites in a sprite batch. /// @@ -1145,8 +1145,8 @@ interface DX_DECLARE_INTERFACE("235a7496-8351-414c-bcd4-6672ab2d8e00") ID2D1Devi _In_ ID2D1SpriteBatch *spriteBatch, _In_ ID2D1Bitmap *bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, - D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE - ) + D2D1_SPRITE_OPTIONS spriteOptions = D2D1_SPRITE_OPTIONS_NONE + ) { return DrawSpriteBatch(spriteBatch, 0, spriteBatch->GetSpriteCount(), bitmap, interpolationMode, spriteOptions); } @@ -1154,19 +1154,19 @@ interface DX_DECLARE_INTERFACE("235a7496-8351-414c-bcd4-6672ab2d8e00") ID2D1Devi interface DX_DECLARE_INTERFACE("852f2087-802c-4037-ab60-ff2e7ee6fc01") ID2D1Device3 : public ID2D1Device2 { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext3 **deviceContext3 + _COM_Outptr_ ID2D1DeviceContext3 **deviceContext3 ) PURE; - + using ID2D1Device2::CreateDeviceContext; - + using ID2D1Device1::CreateDeviceContext; - + using ID2D1Device::CreateDeviceContext; }; // interface ID2D1Device3 @@ -1176,32 +1176,32 @@ interface DX_DECLARE_INTERFACE("852f2087-802c-4037-ab60-ff2e7ee6fc01") ID2D1Devi /// interface DX_DECLARE_INTERFACE("bd4ec2d2-0662-4bee-ba8e-6f29f032e096") ID2D1Factory4 : public ID2D1Factory3 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device3 **d2dDevice3 + _COM_Outptr_ ID2D1Device3 **d2dDevice3 ) PURE; - + using ID2D1Factory3::CreateDevice; - + using ID2D1Factory2::CreateDevice; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory4 interface DX_DECLARE_INTERFACE("18079135-4cf3-4868-bc8e-06067e6d242d") ID2D1CommandSink3 : public ID2D1CommandSink2 { - + STDMETHOD(DrawSpriteBatch)( _In_ ID2D1SpriteBatch *spriteBatch, UINT32 startIndex, UINT32 spriteCount, _In_ ID2D1Bitmap *bitmap, D2D1_BITMAP_INTERPOLATION_MODE interpolationMode, - D2D1_SPRITE_OPTIONS spriteOptions + D2D1_SPRITE_OPTIONS spriteOptions ) PURE; }; // interface ID2D1CommandSink3 @@ -1214,7 +1214,7 @@ interface DX_DECLARE_INTERFACE("18079135-4cf3-4868-bc8e-06067e6d242d") ID2D1Comm /// interface DX_DECLARE_INTERFACE("af671749-d241-4db8-8e41-dcc2e5c1a438") ID2D1SvgGlyphStyle : public ID2D1Resource { - + /// /// Provides values to an SVG glyph for fill. The brush with opacity set to 1 is /// used as the 'context-fill'. The opacity of the brush is used as the @@ -1224,16 +1224,16 @@ interface DX_DECLARE_INTERFACE("af671749-d241-4db8-8e41-dcc2e5c1a438") ID2D1SvgG /// the defaultFillBrush. If the defaultFillBrush is also null, the context-fill /// value will be 'none'. STDMETHOD(SetFill)( - _In_opt_ ID2D1Brush *brush + _In_opt_ ID2D1Brush *brush ) PURE; - + /// /// Returns the requested fill parameters. /// STDMETHOD_(void, GetFill)( - _Outptr_result_maybenull_ ID2D1Brush **brush + _Outptr_result_maybenull_ ID2D1Brush **brush ) PURE; - + /// /// Provides values to an SVG glyph for stroke properties. The brush with opacity /// set to 1 is used as the 'context-stroke'. The opacity of the brush is used as @@ -1253,15 +1253,15 @@ interface DX_DECLARE_INTERFACE("af671749-d241-4db8-8e41-dcc2e5c1a438") ID2D1SvgG FLOAT strokeWidth = 1.0f, _In_reads_opt_(dashesCount) CONST FLOAT *dashes = NULL, UINT32 dashesCount = 0, - FLOAT dashOffset = 1.0f + FLOAT dashOffset = 1.0f ) PURE; - + /// /// Returns the number of dashes in the dash array. /// STDMETHOD_(UINT32, GetStrokeDashesCount)( ) PURE; - + /// /// Returns the requested stroke parameters. /// @@ -1270,20 +1270,20 @@ interface DX_DECLARE_INTERFACE("af671749-d241-4db8-8e41-dcc2e5c1a438") ID2D1SvgG _Out_opt_ FLOAT *strokeWidth = NULL, _Out_writes_opt_(dashesCount) FLOAT *dashes = NULL, UINT32 dashesCount = 0, - _Out_opt_ FLOAT *dashOffset = NULL + _Out_opt_ FLOAT *dashOffset = NULL ) PURE; }; // interface ID2D1SvgGlyphStyle interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1DeviceContext4 : public ID2D1DeviceContext3 { - + /// /// Creates an SVG glyph style object. /// STDMETHOD(CreateSvgGlyphStyle)( - _COM_Outptr_ ID2D1SvgGlyphStyle **svgGlyphStyle + _COM_Outptr_ ID2D1SvgGlyphStyle **svgGlyphStyle ) PURE; - + /// /// Draws the text within the given layout rectangle. By default, this method /// performs baseline snapping and renders color versions of glyphs in color fonts. @@ -1300,11 +1300,11 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi _In_opt_ ID2D1SvgGlyphStyle *svgGlyphStyle, UINT32 colorPaletteIndex = 0, D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL ) PURE; - + using ID2D1RenderTarget::DrawText; - + /// /// Draw a text layout object. If the layout is not subsequently changed, this can /// be more efficient than DrawText when drawing the same layout repeatedly. @@ -1322,11 +1322,11 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi _In_opt_ ID2D1Brush *defaultFillBrush, _In_opt_ ID2D1SvgGlyphStyle *svgGlyphStyle, UINT32 colorPaletteIndex = 0, - D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT + D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT ) PURE; - + using ID2D1RenderTarget::DrawTextLayout; - + /// /// Draws a color glyph run using one (and only one) of the bitmap formats- /// DWRITE_GLYPH_IMAGE_FORMATS_PNG, DWRITE_GLYPH_IMAGE_FORMATS_JPEG, @@ -1338,9 +1338,9 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi D2D1_POINT_2F baselineOrigin, _In_ CONST DWRITE_GLYPH_RUN *glyphRun, DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL, - D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION bitmapSnapOption = D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DEFAULT + D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION bitmapSnapOption = D2D1_COLOR_BITMAP_GLYPH_SNAP_OPTION_DEFAULT ) PURE; - + /// /// Draws a color glyph run that has the format of DWRITE_GLYPH_IMAGE_FORMATS_SVG. /// @@ -1354,9 +1354,9 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi _In_opt_ ID2D1Brush *defaultFillBrush = NULL, _In_opt_ ID2D1SvgGlyphStyle *svgGlyphStyle = NULL, UINT32 colorPaletteIndex = 0, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL ) PURE; - + /// /// Retrieves an image of the color bitmap glyph from the color glyph cache. If the /// cache does not already contain the requested resource, it will be created. This @@ -1381,9 +1381,9 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi FLOAT dpiX, FLOAT dpiY, _Out_ D2D1_MATRIX_3X2_F *glyphTransform, - _COM_Outptr_ ID2D1Image **glyphImage + _COM_Outptr_ ID2D1Image **glyphImage ) PURE; - + /// /// Retrieves an image of the SVG glyph from the color glyph cache. If the cache /// does not already contain the requested resource, it will be created. This method @@ -1411,9 +1411,9 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi _In_opt_ ID2D1SvgGlyphStyle *svgGlyphStyle, UINT32 colorPaletteIndex, _Out_ D2D1_MATRIX_3X2_F *glyphTransform, - _COM_Outptr_ ID2D1CommandList **glyphImage + _COM_Outptr_ ID2D1CommandList **glyphImage ) PURE; - + /// /// Draws the text within the given layout rectangle. By default, this method /// performs baseline snapping and renders color versions of glyphs in color fonts. @@ -1432,8 +1432,8 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi _In_opt_ ID2D1SvgGlyphStyle *svgGlyphStyle, UINT32 colorPaletteIndex = 0, D2D1_DRAW_TEXT_OPTIONS options = D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT, - DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL - ) + DWRITE_MEASURING_MODE measuringMode = DWRITE_MEASURING_MODE_NATURAL + ) { return DrawText(string, stringLength, textFormat, &layoutRect, defaultFillBrush, svgGlyphStyle, colorPaletteIndex, options, measuringMode); } @@ -1441,23 +1441,23 @@ interface DX_DECLARE_INTERFACE("8c427831-3d90-4476-b647-c4fae349e4db") ID2D1Devi interface DX_DECLARE_INTERFACE("d7bdb159-5683-4a46-bc9c-72dc720b858b") ID2D1Device4 : public ID2D1Device3 { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext4 **deviceContext4 + _COM_Outptr_ ID2D1DeviceContext4 **deviceContext4 ) PURE; - + using ID2D1Device3::CreateDeviceContext; - + using ID2D1Device2::CreateDeviceContext; - + using ID2D1Device1::CreateDeviceContext; - + using ID2D1Device::CreateDeviceContext; - + /// /// Sets the maximum capacity of the color glyph cache. This cache is used to store /// color bitmap glyphs and SVG glyphs, enabling faster performance if the same @@ -1466,9 +1466,9 @@ interface DX_DECLARE_INTERFACE("d7bdb159-5683-4a46-bc9c-72dc720b858b") ID2D1Devi /// glyph does not count toward the cache capacity. /// STDMETHOD_(void, SetMaximumColorGlyphCacheMemory)( - UINT64 maximumInBytes + UINT64 maximumInBytes ) PURE; - + /// /// Gets the maximum capacity of the color glyph cache. /// @@ -1482,21 +1482,21 @@ interface DX_DECLARE_INTERFACE("d7bdb159-5683-4a46-bc9c-72dc720b858b") ID2D1Devi /// interface DX_DECLARE_INTERFACE("c4349994-838e-4b0f-8cab-44997d9eeacc") ID2D1Factory5 : public ID2D1Factory4 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device4 **d2dDevice4 + _COM_Outptr_ ID2D1Device4 **d2dDevice4 ) PURE; - + using ID2D1Factory4::CreateDevice; - + using ID2D1Factory3::CreateDevice; - + using ID2D1Factory2::CreateDevice; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory5 @@ -1505,21 +1505,21 @@ interface DX_DECLARE_INTERFACE("c4349994-838e-4b0f-8cab-44997d9eeacc") ID2D1Fact interface DX_DECLARE_INTERFACE("c78a6519-40d6-4218-b2de-beeeb744bb3e") ID2D1CommandSink4 : public ID2D1CommandSink3 { - + /// /// A new function to set blend mode that respects the new MAX blend. - /// + /// /// Implementers of SetPrimitiveBlend2 should expect and handle blend mode: /// D2D1_PRIMITIVE_BLEND_MAX - /// + /// /// Implementers of SetPrimitiveBlend1 should expect and handle blend modes: /// D2D1_PRIMITIVE_BLEND_MIN and D2D1_PRIMITIVE_BLEND_ADD - /// + /// /// Implementers of SetPrimitiveBlend should expect and handle blend modes: /// D2D1_PRIMITIVE_BLEND_SOURCE_OVER and D2D1_PRIMITIVE_BLEND_COPY /// STDMETHOD(SetPrimitiveBlend2)( - D2D1_PRIMITIVE_BLEND primitiveBlend + D2D1_PRIMITIVE_BLEND primitiveBlend ) PURE; }; // interface ID2D1CommandSink4 @@ -1528,31 +1528,31 @@ interface DX_DECLARE_INTERFACE("c78a6519-40d6-4218-b2de-beeeb744bb3e") ID2D1Comm /// interface DX_DECLARE_INTERFACE("1ab42875-c57f-4be9-bd85-9cd78d6f55ee") ID2D1ColorContext1 : public ID2D1ColorContext { - + /// /// Retrieves the color context type. /// STDMETHOD_(D2D1_COLOR_CONTEXT_TYPE, GetColorContextType)( ) CONST PURE; - + /// /// Retrieves the DXGI color space of this context. Returns DXGI_COLOR_SPACE_CUSTOM /// when color context type is ICC. /// STDMETHOD_(DXGI_COLOR_SPACE_TYPE, GetDXGIColorSpace)( ) CONST PURE; - + /// /// Retrieves a set simple color profile. /// STDMETHOD(GetSimpleColorProfile)( - _Out_ D2D1_SIMPLE_COLOR_PROFILE *simpleProfile + _Out_ D2D1_SIMPLE_COLOR_PROFILE *simpleProfile ) CONST PURE; }; // interface ID2D1ColorContext1 interface DX_DECLARE_INTERFACE("7836d248-68cc-4df6-b9e8-de991bf62eb7") ID2D1DeviceContext5 : public ID2D1DeviceContext4 { - + /// /// Creates an SVG document from a stream. /// @@ -1564,34 +1564,34 @@ interface DX_DECLARE_INTERFACE("7836d248-68cc-4df6-b9e8-de991bf62eb7") ID2D1Devi STDMETHOD(CreateSvgDocument)( _In_opt_ IStream *inputXmlStream, D2D1_SIZE_F viewportSize, - _COM_Outptr_ ID2D1SvgDocument **svgDocument + _COM_Outptr_ ID2D1SvgDocument **svgDocument ) PURE; - + /// /// Draw an SVG document. /// STDMETHOD_(void, DrawSvgDocument)( - _In_ ID2D1SvgDocument *svgDocument + _In_ ID2D1SvgDocument *svgDocument ) PURE; - + /// /// Creates a color context from a DXGI color space type. It is only valid to use /// this with the Color Management Effect in 'Best' mode. /// STDMETHOD(CreateColorContextFromDxgiColorSpace)( DXGI_COLOR_SPACE_TYPE colorSpace, - _COM_Outptr_ ID2D1ColorContext1 **colorContext + _COM_Outptr_ ID2D1ColorContext1 **colorContext ) PURE; - + /// /// Creates a color context from a simple color profile. It is only valid to use /// this with the Color Management Effect in 'Best' mode. /// STDMETHOD(CreateColorContextFromSimpleColorProfile)( _In_ CONST D2D1_SIMPLE_COLOR_PROFILE *simpleProfile, - _COM_Outptr_ ID2D1ColorContext1 **colorContext + _COM_Outptr_ ID2D1ColorContext1 **colorContext ) PURE; - + /// /// Creates a color context from a simple color profile. /// @@ -1599,8 +1599,8 @@ interface DX_DECLARE_INTERFACE("7836d248-68cc-4df6-b9e8-de991bf62eb7") ID2D1Devi HRESULT CreateColorContextFromSimpleColorProfile( CONST D2D1_SIMPLE_COLOR_PROFILE &simpleProfile, - _COM_Outptr_ ID2D1ColorContext1 **colorContext - ) + _COM_Outptr_ ID2D1ColorContext1 **colorContext + ) { return CreateColorContextFromSimpleColorProfile(&simpleProfile, colorContext); } @@ -1608,23 +1608,23 @@ interface DX_DECLARE_INTERFACE("7836d248-68cc-4df6-b9e8-de991bf62eb7") ID2D1Devi interface DX_DECLARE_INTERFACE("d55ba0a4-6405-4694-aef5-08ee1a4358b4") ID2D1Device5 : public ID2D1Device4 { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext5 **deviceContext5 + _COM_Outptr_ ID2D1DeviceContext5 **deviceContext5 ) PURE; - + using ID2D1Device4::CreateDeviceContext; - + using ID2D1Device3::CreateDeviceContext; - + using ID2D1Device2::CreateDeviceContext; - + using ID2D1Device1::CreateDeviceContext; - + using ID2D1Device::CreateDeviceContext; }; // interface ID2D1Device5 @@ -1634,23 +1634,23 @@ interface DX_DECLARE_INTERFACE("d55ba0a4-6405-4694-aef5-08ee1a4358b4") ID2D1Devi /// interface DX_DECLARE_INTERFACE("f9976f46-f642-44c1-97ca-da32ea2a2635") ID2D1Factory6 : public ID2D1Factory5 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device5 **d2dDevice5 + _COM_Outptr_ ID2D1Device5 **d2dDevice5 ) PURE; - + using ID2D1Factory5::CreateDevice; - + using ID2D1Factory4::CreateDevice; - + using ID2D1Factory3::CreateDevice; - + using ID2D1Factory2::CreateDevice; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory6 @@ -1659,19 +1659,19 @@ interface DX_DECLARE_INTERFACE("f9976f46-f642-44c1-97ca-da32ea2a2635") ID2D1Fact interface DX_DECLARE_INTERFACE("7047dd26-b1e7-44a7-959a-8349e2144fa8") ID2D1CommandSink5 : public ID2D1CommandSink4 { - + STDMETHOD(BlendImage)( _In_ ID2D1Image *image, D2D1_BLEND_MODE blendMode, _In_opt_ CONST D2D1_POINT_2F *targetOffset, _In_opt_ CONST D2D1_RECT_F *imageRectangle, - D2D1_INTERPOLATION_MODE interpolationMode + D2D1_INTERPOLATION_MODE interpolationMode ) PURE; }; // interface ID2D1CommandSink5 interface DX_DECLARE_INTERFACE("985f7e37-4ed0-4a19-98a3-15b0edfde306") ID2D1DeviceContext6 : public ID2D1DeviceContext5 { - + /// /// Draw an image to the device context. /// @@ -1680,31 +1680,31 @@ interface DX_DECLARE_INTERFACE("985f7e37-4ed0-4a19-98a3-15b0edfde306") ID2D1Devi D2D1_BLEND_MODE blendMode, _In_opt_ CONST D2D1_POINT_2F *targetOffset = NULL, _In_opt_ CONST D2D1_RECT_F *imageRectangle = NULL, - D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR + D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR ) PURE; }; // interface ID2D1DeviceContext6 interface DX_DECLARE_INTERFACE("7bfef914-2d75-4bad-be87-e18ddb077b6d") ID2D1Device6 : public ID2D1Device5 { - + /// /// Creates a new device context with no initially assigned target. /// STDMETHOD(CreateDeviceContext)( D2D1_DEVICE_CONTEXT_OPTIONS options, - _COM_Outptr_ ID2D1DeviceContext6 **deviceContext6 + _COM_Outptr_ ID2D1DeviceContext6 **deviceContext6 ) PURE; - + using ID2D1Device5::CreateDeviceContext; - + using ID2D1Device4::CreateDeviceContext; - + using ID2D1Device3::CreateDeviceContext; - + using ID2D1Device2::CreateDeviceContext; - + using ID2D1Device1::CreateDeviceContext; - + using ID2D1Device::CreateDeviceContext; }; // interface ID2D1Device6 @@ -1714,25 +1714,25 @@ interface DX_DECLARE_INTERFACE("7bfef914-2d75-4bad-be87-e18ddb077b6d") ID2D1Devi /// interface DX_DECLARE_INTERFACE("bdc2bdd3-b96c-4de6-bdf7-99d4745454de") ID2D1Factory7 : public ID2D1Factory6 { - + /// /// This creates a new Direct2D device from the given IDXGIDevice. /// STDMETHOD(CreateDevice)( _In_ IDXGIDevice *dxgiDevice, - _COM_Outptr_ ID2D1Device6 **d2dDevice6 + _COM_Outptr_ ID2D1Device6 **d2dDevice6 ) PURE; - + using ID2D1Factory6::CreateDevice; - + using ID2D1Factory5::CreateDevice; - + using ID2D1Factory4::CreateDevice; - + using ID2D1Factory3::CreateDevice; - + using ID2D1Factory2::CreateDevice; - + using ID2D1Factory1::CreateDevice; }; // interface ID2D1Factory7 @@ -1770,14 +1770,13 @@ typedef interface ID2D1GdiMetafileSink1 ID2D1GdiMetafileSink1; #endif - #ifdef __cplusplus extern "C" { #endif #if NTDDI_VERSION >= NTDDI_WINTHRESHOLD - void WINAPI + void WINAPI D2D1GetGradientMeshInteriorPointsFromCoonsPatch( _In_ CONST D2D1_POINT_2F *pPoint0, _In_ CONST D2D1_POINT_2F *pPoint1, @@ -1795,13 +1794,12 @@ extern "C" _Out_ D2D1_POINT_2F *pTensorPoint12, _Out_ D2D1_POINT_2F *pTensorPoint21, _Out_ D2D1_POINT_2F *pTensorPoint22 - ); + ); #endif // #if NTDDI_VERSION >= NTDDI_WINTHRESHOLD - + #ifdef __cplusplus } #endif - /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d2d1_3helper.h b/gfx/include/dxsdk/d2d1_3helper.h index 94ef7c52d8..a0d9de4b7c 100644 --- a/gfx/include/dxsdk/d2d1_3helper.h +++ b/gfx/include/dxsdk/d2d1_3helper.h @@ -36,26 +36,26 @@ namespace D2D1 COM_DECLSPEC_NOTHROW D2D1FORCEINLINE D2D1_GRADIENT_MESH_PATCH - GradientMeshPatch( - D2D1_POINT_2F point00, - D2D1_POINT_2F point01, - D2D1_POINT_2F point02, - D2D1_POINT_2F point03, - D2D1_POINT_2F point10, - D2D1_POINT_2F point11, - D2D1_POINT_2F point12, - D2D1_POINT_2F point13, - D2D1_POINT_2F point20, - D2D1_POINT_2F point21, - D2D1_POINT_2F point22, - D2D1_POINT_2F point23, - D2D1_POINT_2F point30, - D2D1_POINT_2F point31, - D2D1_POINT_2F point32, - D2D1_POINT_2F point33, - D2D1_COLOR_F color00, - D2D1_COLOR_F color03, - D2D1_COLOR_F color30, + GradientMeshPatch( + D2D1_POINT_2F point00, + D2D1_POINT_2F point01, + D2D1_POINT_2F point02, + D2D1_POINT_2F point03, + D2D1_POINT_2F point10, + D2D1_POINT_2F point11, + D2D1_POINT_2F point12, + D2D1_POINT_2F point13, + D2D1_POINT_2F point20, + D2D1_POINT_2F point21, + D2D1_POINT_2F point22, + D2D1_POINT_2F point23, + D2D1_POINT_2F point30, + D2D1_POINT_2F point31, + D2D1_POINT_2F point32, + D2D1_POINT_2F point33, + D2D1_COLOR_F color00, + D2D1_COLOR_F color03, + D2D1_COLOR_F color30, D2D1_COLOR_F color33, D2D1_PATCH_EDGE_MODE topEdgeMode, D2D1_PATCH_EDGE_MODE leftEdgeMode, @@ -67,30 +67,30 @@ namespace D2D1 newPatch.point00 = point00; newPatch.point01 = point01; newPatch.point02 = point02; - newPatch.point03 = point03; + newPatch.point03 = point03; newPatch.point10 = point10; newPatch.point11 = point11; newPatch.point12 = point12; - newPatch.point13 = point13; + newPatch.point13 = point13; newPatch.point20 = point20; newPatch.point21 = point21; newPatch.point22 = point22; - newPatch.point23 = point23; + newPatch.point23 = point23; newPatch.point30 = point30; newPatch.point31 = point31; newPatch.point32 = point32; - newPatch.point33 = point33; + newPatch.point33 = point33; newPatch.color00 = color00; newPatch.color03 = color03; newPatch.color30 = color30; newPatch.color33 = color33; - + newPatch.topEdgeMode = topEdgeMode; newPatch.leftEdgeMode = leftEdgeMode; newPatch.bottomEdgeMode = bottomEdgeMode; newPatch.rightEdgeMode = rightEdgeMode; - + return newPatch; } @@ -124,7 +124,7 @@ namespace D2D1 newPatch.point00 = point0; newPatch.point01 = point1; newPatch.point02 = point2; - newPatch.point03 = point3; + newPatch.point03 = point3; newPatch.point13 = point4; newPatch.point23 = point5; newPatch.point33 = point6; @@ -133,25 +133,25 @@ namespace D2D1 newPatch.point30 = point9; newPatch.point20 = point10; newPatch.point10 = point11; - + D2D1GetGradientMeshInteriorPointsFromCoonsPatch( &point0, - &point1, + &point1, &point2, - &point3, + &point3, &point4, - &point5, + &point5, &point6, &point7, &point8, - &point9, + &point9, &point10, &point11, &newPatch.point11, &newPatch.point12, &newPatch.point21, &newPatch.point22 - ); + ); newPatch.color00 = color0; newPatch.color03 = color1; @@ -161,16 +161,16 @@ namespace D2D1 newPatch.leftEdgeMode = leftEdgeMode; newPatch.bottomEdgeMode = bottomEdgeMode; newPatch.rightEdgeMode = rightEdgeMode; - + return newPatch; } COM_DECLSPEC_NOTHROW D2D1FORCEINLINE - D2D1_INK_POINT - InkPoint( - const D2D1_POINT_2F &point, - FLOAT radius + D2D1_INK_POINT + InkPoint( + const D2D1_POINT_2F &point, + FLOAT radius ) { D2D1_INK_POINT inkPoint; @@ -184,11 +184,11 @@ namespace D2D1 COM_DECLSPEC_NOTHROW D2D1FORCEINLINE - D2D1_INK_BEZIER_SEGMENT - InkBezierSegment( - const D2D1_INK_POINT &point1, - const D2D1_INK_POINT &point2, - const D2D1_INK_POINT &point3 + D2D1_INK_BEZIER_SEGMENT + InkBezierSegment( + const D2D1_INK_POINT &point1, + const D2D1_INK_POINT &point2, + const D2D1_INK_POINT &point3 ) { D2D1_INK_BEZIER_SEGMENT inkBezierSegment; @@ -202,10 +202,10 @@ namespace D2D1 COM_DECLSPEC_NOTHROW D2D1FORCEINLINE - D2D1_INK_STYLE_PROPERTIES - InkStyleProperties( - D2D1_INK_NIB_SHAPE nibShape, - const D2D1_MATRIX_3X2_F &nibTransform + D2D1_INK_STYLE_PROPERTIES + InkStyleProperties( + D2D1_INK_NIB_SHAPE nibShape, + const D2D1_MATRIX_3X2_F &nibTransform ) { D2D1_INK_STYLE_PROPERTIES inkStyleProperties; diff --git a/gfx/include/dxsdk/d2d1effectauthor.h b/gfx/include/dxsdk/d2d1effectauthor.h index 36821c6742..df78348cb0 100644 --- a/gfx/include/dxsdk/d2d1effectauthor.h +++ b/gfx/include/dxsdk/d2d1effectauthor.h @@ -53,22 +53,22 @@ typedef interface ID2D1TransformNode ID2D1TransformNode; /// typedef enum D2D1_CHANGE_TYPE { - + /// /// Nothing has changed. /// D2D1_CHANGE_TYPE_NONE = 0, - + /// /// The effect's properties have changed. /// D2D1_CHANGE_TYPE_PROPERTIES = 1, - + /// /// The internal context has changed and should be inspected. /// D2D1_CHANGE_TYPE_CONTEXT = 2, - + /// /// A new graph has been set due to a change in the input count. /// @@ -84,12 +84,12 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_CHANGE_TYPE); /// typedef enum D2D1_PIXEL_OPTIONS { - + /// /// Default pixel processing. /// D2D1_PIXEL_OPTIONS_NONE = 0, - + /// /// Indicates that the shader samples its inputs only at exactly the same scene /// coordinate as the output pixel, and that it returns transparent black whenever @@ -107,25 +107,25 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_PIXEL_OPTIONS); /// typedef enum D2D1_VERTEX_OPTIONS { - + /// /// Default vertex processing. /// D2D1_VERTEX_OPTIONS_NONE = 0, - + /// /// Indicates that the output rectangle does not need to be cleared before drawing /// custom vertices. This must only be used by transforms whose custom vertices /// completely cover their output rectangle. /// D2D1_VERTEX_OPTIONS_DO_NOT_CLEAR = 1, - + /// /// Causes a depth buffer to be used while drawing custom vertices. This impacts /// drawing behavior when primitives overlap one another. /// D2D1_VERTEX_OPTIONS_USE_DEPTH_BUFFER = 2, - + /// /// Indicates that custom vertices do not form primitives which overlap one another. /// @@ -141,12 +141,12 @@ DEFINE_ENUM_FLAG_OPERATORS(D2D1_VERTEX_OPTIONS); /// typedef enum D2D1_VERTEX_USAGE { - + /// /// The vertex buffer content do not change frequently from frame to frame. /// D2D1_VERTEX_USAGE_STATIC = 0, - + /// /// The vertex buffer is intended to be updated frequently. /// @@ -240,17 +240,17 @@ typedef enum D2D1_FEATURE /// typedef struct D2D1_PROPERTY_BINDING { - + /// /// The name of the property. /// PCWSTR propertyName; - + /// /// The function that will receive the data to set. /// PD2D1_PROPERTY_SET_FUNCTION setFunction; - + /// /// The function that will be asked to write the output data. /// @@ -285,8 +285,8 @@ typedef struct D2D1_INPUT_ELEMENT_DESC } D2D1_INPUT_ELEMENT_DESC; -// -// Set to alignedByteOffset within D2D1_INPUT_ELEMENT_DESC for elements that +// +// Set to alignedByteOffset within D2D1_INPUT_ELEMENT_DESC for elements that // immediately follow preceding elements in memory // #define D2D1_APPEND_ALIGNED_ELEMENT ( 0xffffffff ) @@ -400,19 +400,19 @@ EXTERN_C CONST IID IID_ID2D1EffectContext; /// interface DX_DECLARE_INTERFACE("9b8b1336-00a5-4668-92b7-ced5d8bf9b7b") ID2D1VertexBuffer : public IUnknown { - + STDMETHOD(Map)( _Outptr_result_bytebuffer_(bufferSize) BYTE **data, - UINT32 bufferSize + UINT32 bufferSize ) PURE; - + STDMETHOD(Unmap)( ) PURE; }; // interface ID2D1VertexBuffer interface DX_DECLARE_INTERFACE("688d15c3-02b0-438d-b13a-d1b44c32c39a") ID2D1ResourceTexture : public IUnknown { - + /// /// Update the vertex text. /// @@ -422,7 +422,7 @@ interface DX_DECLARE_INTERFACE("688d15c3-02b0-438d-b13a-d1b44c32c39a") ID2D1Reso _In_reads_opt_(dimensions - 1) CONST UINT32 *strides, UINT32 dimensions, _In_reads_(dataCount) CONST BYTE *data, - UINT32 dataCount + UINT32 dataCount ) PURE; }; // interface ID2D1ResourceTexture @@ -432,37 +432,37 @@ interface DX_DECLARE_INTERFACE("688d15c3-02b0-438d-b13a-d1b44c32c39a") ID2D1Reso /// interface DX_DECLARE_INTERFACE("519ae1bd-d19a-420d-b849-364f594776b7") ID2D1RenderInfo : public IUnknown { - + /// /// Sets options for sampling the specified image input /// STDMETHOD(SetInputDescription)( UINT32 inputIndex, - D2D1_INPUT_DESCRIPTION inputDescription + D2D1_INPUT_DESCRIPTION inputDescription ) PURE; - + /// /// Controls the output precision and channel-depth for the associated transform. /// STDMETHOD(SetOutputBuffer)( D2D1_BUFFER_PRECISION bufferPrecision, - D2D1_CHANNEL_DEPTH channelDepth + D2D1_CHANNEL_DEPTH channelDepth ) PURE; - + /// /// Controls whether the output of the associated transform is cached. /// STDMETHOD_(void, SetCached)( - BOOL isCached + BOOL isCached ) PURE; - + /// /// Provides a hint of the approximate shader instruction count per pixel. If /// provided, it may improve performance when processing large images. Instructions /// should be counted multiple times if occurring within loops. /// STDMETHOD_(void, SetInstructionCountHint)( - UINT32 instructionCount + UINT32 instructionCount ) PURE; }; // interface ID2D1RenderInfo @@ -472,39 +472,39 @@ interface DX_DECLARE_INTERFACE("519ae1bd-d19a-420d-b849-364f594776b7") ID2D1Rend /// interface DX_DECLARE_INTERFACE("693ce632-7f2f-45de-93fe-18d88b37aa21") ID2D1DrawInfo : public ID2D1RenderInfo { - + /// /// Set the constant buffer for this transform's pixel shader. /// STDMETHOD(SetPixelShaderConstantBuffer)( _In_reads_(bufferCount) CONST BYTE *buffer, - UINT32 bufferCount + UINT32 bufferCount ) PURE; - + /// /// Sets the resource texture corresponding to the given shader texture index. /// STDMETHOD(SetResourceTexture)( UINT32 textureIndex, - _In_ ID2D1ResourceTexture *resourceTexture + _In_ ID2D1ResourceTexture *resourceTexture ) PURE; - + /// /// Set the constant buffer for this transform's vertex shader. /// STDMETHOD(SetVertexShaderConstantBuffer)( _In_reads_(bufferCount) CONST BYTE *buffer, - UINT32 bufferCount + UINT32 bufferCount ) PURE; - + /// /// Set the shader instructions for this transform. /// STDMETHOD(SetPixelShader)( _In_ REFGUID shaderId, - D2D1_PIXEL_OPTIONS pixelOptions = D2D1_PIXEL_OPTIONS_NONE + D2D1_PIXEL_OPTIONS pixelOptions = D2D1_PIXEL_OPTIONS_NONE ) PURE; - + /// /// Set custom vertices for the associated transform. A blend mode if /// foreground-over will be used if blendDescription is NULL. @@ -514,7 +514,7 @@ interface DX_DECLARE_INTERFACE("693ce632-7f2f-45de-93fe-18d88b37aa21") ID2D1Draw D2D1_VERTEX_OPTIONS vertexOptions, _In_opt_ CONST D2D1_BLEND_DESCRIPTION *blendDescription = NULL, _In_opt_ CONST D2D1_VERTEX_RANGE *vertexRange = NULL, - _In_opt_ CONST GUID *vertexShader = NULL + _In_opt_ CONST GUID *vertexShader = NULL ) PURE; }; // interface ID2D1DrawInfo @@ -524,28 +524,28 @@ interface DX_DECLARE_INTERFACE("693ce632-7f2f-45de-93fe-18d88b37aa21") ID2D1Draw /// interface DX_DECLARE_INTERFACE("5598b14b-9fd7-48b7-9bdb-8f0964eb38bc") ID2D1ComputeInfo : public ID2D1RenderInfo { - + /// /// Set the constant buffer for this transform. /// STDMETHOD(SetComputeShaderConstantBuffer)( _In_reads_(bufferCount) CONST BYTE *buffer, - UINT32 bufferCount + UINT32 bufferCount ) PURE; - + /// /// Set the shader instructions for this transform. /// STDMETHOD(SetComputeShader)( - _In_ REFGUID shaderId + _In_ REFGUID shaderId ) PURE; - + /// /// Sets the resource texture corresponding to the given shader texture index. /// STDMETHOD(SetResourceTexture)( UINT32 textureIndex, - _In_ ID2D1ResourceTexture *resourceTexture + _In_ ID2D1ResourceTexture *resourceTexture ) PURE; }; // interface ID2D1ComputeInfo @@ -554,7 +554,7 @@ interface DX_DECLARE_INTERFACE("5598b14b-9fd7-48b7-9bdb-8f0964eb38bc") ID2D1Comp /// interface DX_DECLARE_INTERFACE("b2efe1e7-729f-4102-949f-505fa21bf666") ID2D1TransformNode : public IUnknown { - + /// /// Return the number of input this node has. /// @@ -567,52 +567,52 @@ interface DX_DECLARE_INTERFACE("b2efe1e7-729f-4102-949f-505fa21bf666") ID2D1Tran /// interface DX_DECLARE_INTERFACE("13d29038-c3e6-4034-9081-13b53a417992") ID2D1TransformGraph : public IUnknown { - + /// /// Return the number of input this graph has. /// STDMETHOD_(UINT32, GetInputCount)( ) CONST PURE; - + /// /// Sets the graph to contain a single transform whose inputs map 1:1 with effect /// inputs. /// STDMETHOD(SetSingleTransformNode)( - _In_ ID2D1TransformNode *node + _In_ ID2D1TransformNode *node ) PURE; - + /// /// Adds the given transform node to the graph. /// STDMETHOD(AddNode)( - _In_ ID2D1TransformNode *node + _In_ ID2D1TransformNode *node ) PURE; - + /// /// Removes the given transform node from the graph. /// STDMETHOD(RemoveNode)( - _In_ ID2D1TransformNode *node + _In_ ID2D1TransformNode *node ) PURE; - + /// /// Indicates that the given transform node should be considered to be the output /// node of the graph. /// STDMETHOD(SetOutputNode)( - _In_ ID2D1TransformNode *node + _In_ ID2D1TransformNode *node ) PURE; - + /// /// Connects one node to another node inside the graph. /// STDMETHOD(ConnectNode)( _In_ ID2D1TransformNode *fromNode, _In_ ID2D1TransformNode *toNode, - UINT32 toNodeInputIndex + UINT32 toNodeInputIndex ) PURE; - + /// /// Connects a transform node inside the graph to the corresponding input of the /// encapsulating effect. @@ -620,20 +620,20 @@ interface DX_DECLARE_INTERFACE("13d29038-c3e6-4034-9081-13b53a417992") ID2D1Tran STDMETHOD(ConnectToEffectInput)( UINT32 toEffectInputIndex, _In_ ID2D1TransformNode *node, - UINT32 toNodeInputIndex + UINT32 toNodeInputIndex ) PURE; - + /// /// Clears all nodes and connections from the transform graph. /// STDMETHOD_(void, Clear)( ) PURE; - + /// /// Uses the specified input as the effect output. /// STDMETHOD(SetPassthroughGraph)( - UINT32 effectInputIndex + UINT32 effectInputIndex ) PURE; }; // interface ID2D1TransformGraph @@ -642,25 +642,25 @@ interface DX_DECLARE_INTERFACE("13d29038-c3e6-4034-9081-13b53a417992") ID2D1Tran /// interface DX_DECLARE_INTERFACE("ef1a287d-342a-4f76-8fdb-da0d6ea9f92b") ID2D1Transform : public ID2D1TransformNode { - + STDMETHOD(MapOutputRectToInputRects)( _In_ CONST D2D1_RECT_L *outputRect, _Out_writes_(inputRectsCount) D2D1_RECT_L *inputRects, - UINT32 inputRectsCount + UINT32 inputRectsCount ) CONST PURE; - + STDMETHOD(MapInputRectsToOutputRect)( _In_reads_(inputRectCount) CONST D2D1_RECT_L *inputRects, _In_reads_(inputRectCount) CONST D2D1_RECT_L *inputOpaqueSubRects, UINT32 inputRectCount, _Out_ D2D1_RECT_L *outputRect, - _Out_ D2D1_RECT_L *outputOpaqueSubRect + _Out_ D2D1_RECT_L *outputOpaqueSubRect ) PURE; - + STDMETHOD(MapInvalidRect)( UINT32 inputIndex, D2D1_RECT_L invalidInputRect, - _Out_ D2D1_RECT_L *invalidOutputRect + _Out_ D2D1_RECT_L *invalidOutputRect ) CONST PURE; }; // interface ID2D1Transform @@ -669,9 +669,9 @@ interface DX_DECLARE_INTERFACE("ef1a287d-342a-4f76-8fdb-da0d6ea9f92b") ID2D1Tran /// interface DX_DECLARE_INTERFACE("36bfdcb6-9739-435d-a30d-a653beff6a6f") ID2D1DrawTransform : public ID2D1Transform { - + STDMETHOD(SetDrawInfo)( - _In_ ID2D1DrawInfo *drawInfo + _In_ ID2D1DrawInfo *drawInfo ) PURE; }; // interface ID2D1DrawTransform @@ -681,16 +681,16 @@ interface DX_DECLARE_INTERFACE("36bfdcb6-9739-435d-a30d-a653beff6a6f") ID2D1Draw /// interface DX_DECLARE_INTERFACE("0d85573c-01e3-4f7d-bfd9-0d60608bf3c3") ID2D1ComputeTransform : public ID2D1Transform { - + STDMETHOD(SetComputeInfo)( - _In_ ID2D1ComputeInfo *computeInfo + _In_ ID2D1ComputeInfo *computeInfo ) PURE; - + STDMETHOD(CalculateThreadgroups)( _In_ CONST D2D1_RECT_L *outputRect, _Out_ UINT32 *dimensionX, _Out_ UINT32 *dimensionY, - _Out_ UINT32 *dimensionZ + _Out_ UINT32 *dimensionZ ) PURE; }; // interface ID2D1ComputeTransform @@ -700,10 +700,10 @@ interface DX_DECLARE_INTERFACE("0d85573c-01e3-4f7d-bfd9-0d60608bf3c3") ID2D1Comp /// interface DX_DECLARE_INTERFACE("0359dc30-95e6-4568-9055-27720d130e93") ID2D1AnalysisTransform : public IUnknown { - + STDMETHOD(ProcessAnalysisResults)( _In_reads_(analysisDataCount) CONST BYTE *analysisData, - UINT32 analysisDataCount + UINT32 analysisDataCount ) PURE; }; // interface ID2D1AnalysisTransform @@ -713,15 +713,15 @@ interface DX_DECLARE_INTERFACE("0359dc30-95e6-4568-9055-27720d130e93") ID2D1Anal /// interface DX_DECLARE_INTERFACE("db1800dd-0c34-4cf9-be90-31cc0a5653e1") ID2D1SourceTransform : public ID2D1Transform { - + STDMETHOD(SetRenderInfo)( - _In_ ID2D1RenderInfo *renderInfo + _In_ ID2D1RenderInfo *renderInfo ) PURE; - + STDMETHOD(Draw)( _In_ ID2D1Bitmap1 *target, _In_ CONST D2D1_RECT_L *drawRect, - D2D1_POINT_2U targetOrigin + D2D1_POINT_2U targetOrigin ) PURE; }; // interface ID2D1SourceTransform @@ -731,20 +731,20 @@ interface DX_DECLARE_INTERFACE("db1800dd-0c34-4cf9-be90-31cc0a5653e1") ID2D1Sour /// interface DX_DECLARE_INTERFACE("1a799d8a-69f7-4e4c-9fed-437ccc6684cc") ID2D1ConcreteTransform : public ID2D1TransformNode { - + /// /// Controls the output precision and channel-depth for this transform. /// STDMETHOD(SetOutputBuffer)( D2D1_BUFFER_PRECISION bufferPrecision, - D2D1_CHANNEL_DEPTH channelDepth + D2D1_CHANNEL_DEPTH channelDepth ) PURE; - + /// /// Controls whether the output of this transform is cached. /// STDMETHOD_(void, SetCached)( - BOOL isCached + BOOL isCached ) PURE; }; // interface ID2D1ConcreteTransform @@ -753,13 +753,13 @@ interface DX_DECLARE_INTERFACE("1a799d8a-69f7-4e4c-9fed-437ccc6684cc") ID2D1Conc /// interface DX_DECLARE_INTERFACE("63ac0b32-ba44-450f-8806-7f4ca1ff2f1b") ID2D1BlendTransform : public ID2D1ConcreteTransform { - + STDMETHOD_(void, SetDescription)( - _In_ CONST D2D1_BLEND_DESCRIPTION *description + _In_ CONST D2D1_BLEND_DESCRIPTION *description ) PURE; - + STDMETHOD_(void, GetDescription)( - _Out_ D2D1_BLEND_DESCRIPTION *description + _Out_ D2D1_BLEND_DESCRIPTION *description ) CONST PURE; }; // interface ID2D1BlendTransform @@ -768,18 +768,18 @@ interface DX_DECLARE_INTERFACE("63ac0b32-ba44-450f-8806-7f4ca1ff2f1b") ID2D1Blen /// interface DX_DECLARE_INTERFACE("4998735c-3a19-473c-9781-656847e3a347") ID2D1BorderTransform : public ID2D1ConcreteTransform { - + STDMETHOD_(void, SetExtendModeX)( - D2D1_EXTEND_MODE extendMode + D2D1_EXTEND_MODE extendMode ) PURE; - + STDMETHOD_(void, SetExtendModeY)( - D2D1_EXTEND_MODE extendMode + D2D1_EXTEND_MODE extendMode ) PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeX)( ) CONST PURE; - + STDMETHOD_(D2D1_EXTEND_MODE, GetExtendModeY)( ) CONST PURE; }; // interface ID2D1BorderTransform @@ -790,11 +790,11 @@ interface DX_DECLARE_INTERFACE("4998735c-3a19-473c-9781-656847e3a347") ID2D1Bord /// interface DX_DECLARE_INTERFACE("3fe6adea-7643-4f53-bd14-a0ce63f24042") ID2D1OffsetTransform : public ID2D1TransformNode { - + STDMETHOD_(void, SetOffset)( - D2D1_POINT_2L offset + D2D1_POINT_2L offset ) PURE; - + STDMETHOD_(D2D1_POINT_2L, GetOffset)( ) CONST PURE; }; // interface ID2D1OffsetTransform @@ -804,13 +804,13 @@ interface DX_DECLARE_INTERFACE("3fe6adea-7643-4f53-bd14-a0ce63f24042") ID2D1Offs /// interface DX_DECLARE_INTERFACE("90f732e2-5092-4606-a819-8651970baccd") ID2D1BoundsAdjustmentTransform : public ID2D1TransformNode { - + STDMETHOD_(void, SetOutputBounds)( - _In_ CONST D2D1_RECT_L *outputBounds + _In_ CONST D2D1_RECT_L *outputBounds ) PURE; - + STDMETHOD_(void, GetOutputBounds)( - _Out_ D2D1_RECT_L *outputBounds + _Out_ D2D1_RECT_L *outputBounds ) CONST PURE; }; // interface ID2D1BoundsAdjustmentTransform @@ -820,30 +820,30 @@ interface DX_DECLARE_INTERFACE("90f732e2-5092-4606-a819-8651970baccd") ID2D1Boun /// interface DX_DECLARE_INTERFACE("a248fd3f-3e6c-4e63-9f03-7f68ecc91db9") ID2D1EffectImpl : public IUnknown { - + /// /// Initialize the effect with a context and a transform graph. The effect must /// populate the transform graph with a topology and can update it later. /// STDMETHOD(Initialize)( _In_ ID2D1EffectContext *effectContext, - _In_ ID2D1TransformGraph *transformGraph + _In_ ID2D1TransformGraph *transformGraph ) PURE; - + /// /// Initialize the effect with a context and a transform graph. The effect must /// populate the transform graph with a topology and can update it later. /// STDMETHOD(PrepareForRender)( - D2D1_CHANGE_TYPE changeType + D2D1_CHANGE_TYPE changeType ) PURE; - + /// /// Sets a new transform graph to the effect. This happens when the number of /// inputs to the effect changes, if the effect support a variable number of inputs. /// STDMETHOD(SetGraph)( - _In_ ID2D1TransformGraph *transformGraph + _In_ ID2D1TransformGraph *transformGraph ) PURE; }; // interface ID2D1EffectImpl @@ -854,105 +854,105 @@ interface DX_DECLARE_INTERFACE("a248fd3f-3e6c-4e63-9f03-7f68ecc91db9") ID2D1Effe /// interface DX_DECLARE_INTERFACE("3d9f916b-27dc-4ad7-b4f1-64945340f563") ID2D1EffectContext : public IUnknown { - + STDMETHOD_(void, GetDpi)( _Out_ FLOAT *dpiX, - _Out_ FLOAT *dpiY + _Out_ FLOAT *dpiY ) CONST PURE; - + /// /// Create a new effect, the effect must either be built in or previously registered /// through ID2D1Factory1::RegisterEffect. /// STDMETHOD(CreateEffect)( _In_ REFCLSID effectId, - _COM_Outptr_ ID2D1Effect **effect + _COM_Outptr_ ID2D1Effect **effect ) PURE; - + STDMETHOD(GetMaximumSupportedFeatureLevel)( _In_reads_(featureLevelsCount) CONST D3D_FEATURE_LEVEL *featureLevels, UINT32 featureLevelsCount, - _Out_ D3D_FEATURE_LEVEL *maximumSupportedFeatureLevel + _Out_ D3D_FEATURE_LEVEL *maximumSupportedFeatureLevel ) CONST PURE; - + /// /// Create a transform node from the passed in effect. /// STDMETHOD(CreateTransformNodeFromEffect)( _In_ ID2D1Effect *effect, - _COM_Outptr_ ID2D1TransformNode **transformNode + _COM_Outptr_ ID2D1TransformNode **transformNode ) PURE; - + STDMETHOD(CreateBlendTransform)( UINT32 numInputs, _In_ CONST D2D1_BLEND_DESCRIPTION *blendDescription, - _COM_Outptr_ ID2D1BlendTransform **transform + _COM_Outptr_ ID2D1BlendTransform **transform ) PURE; - + STDMETHOD(CreateBorderTransform)( D2D1_EXTEND_MODE extendModeX, D2D1_EXTEND_MODE extendModeY, - _COM_Outptr_ ID2D1BorderTransform **transform + _COM_Outptr_ ID2D1BorderTransform **transform ) PURE; - + STDMETHOD(CreateOffsetTransform)( D2D1_POINT_2L offset, - _COM_Outptr_ ID2D1OffsetTransform **transform + _COM_Outptr_ ID2D1OffsetTransform **transform ) PURE; - + STDMETHOD(CreateBoundsAdjustmentTransform)( _In_ CONST D2D1_RECT_L *outputRectangle, - _COM_Outptr_ ID2D1BoundsAdjustmentTransform **transform + _COM_Outptr_ ID2D1BoundsAdjustmentTransform **transform ) PURE; - + STDMETHOD(LoadPixelShader)( REFGUID shaderId, _In_reads_(shaderBufferCount) CONST BYTE *shaderBuffer, - UINT32 shaderBufferCount + UINT32 shaderBufferCount ) PURE; - + STDMETHOD(LoadVertexShader)( REFGUID resourceId, _In_reads_(shaderBufferCount) CONST BYTE *shaderBuffer, - UINT32 shaderBufferCount + UINT32 shaderBufferCount ) PURE; - + STDMETHOD(LoadComputeShader)( REFGUID resourceId, _In_reads_(shaderBufferCount) CONST BYTE *shaderBuffer, - UINT32 shaderBufferCount + UINT32 shaderBufferCount ) PURE; - + STDMETHOD_(BOOL, IsShaderLoaded)( - REFGUID shaderId + REFGUID shaderId ) PURE; - + STDMETHOD(CreateResourceTexture)( _In_opt_ CONST GUID *resourceId, _In_ CONST D2D1_RESOURCE_TEXTURE_PROPERTIES *resourceTextureProperties, _In_reads_opt_(dataSize) CONST BYTE *data, _In_reads_opt_(resourceTextureProperties->dimensions - 1) CONST UINT32 *strides, UINT32 dataSize, - _COM_Outptr_ ID2D1ResourceTexture **resourceTexture + _COM_Outptr_ ID2D1ResourceTexture **resourceTexture ) PURE; - + STDMETHOD(FindResourceTexture)( _In_ CONST GUID *resourceId, - _COM_Outptr_ ID2D1ResourceTexture **resourceTexture + _COM_Outptr_ ID2D1ResourceTexture **resourceTexture ) PURE; - + STDMETHOD(CreateVertexBuffer)( _In_ CONST D2D1_VERTEX_BUFFER_PROPERTIES *vertexBufferProperties, _In_opt_ CONST GUID *resourceId, _In_opt_ CONST D2D1_CUSTOM_VERTEX_BUFFER_PROPERTIES *customVertexBufferProperties, - _COM_Outptr_ ID2D1VertexBuffer **buffer + _COM_Outptr_ ID2D1VertexBuffer **buffer ) PURE; - + STDMETHOD(FindVertexBuffer)( _In_ CONST GUID *resourceId, - _COM_Outptr_ ID2D1VertexBuffer **buffer + _COM_Outptr_ ID2D1VertexBuffer **buffer ) PURE; - + /// /// Creates a color context from a color space. If the space is Custom, the context /// is initialized from the profile/profileSize arguments. Otherwise the context is @@ -963,30 +963,30 @@ interface DX_DECLARE_INTERFACE("3d9f916b-27dc-4ad7-b4f1-64945340f563") ID2D1Effe D2D1_COLOR_SPACE space, _In_reads_opt_(profileSize) CONST BYTE *profile, UINT32 profileSize, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + STDMETHOD(CreateColorContextFromFilename)( _In_ PCWSTR filename, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + STDMETHOD(CreateColorContextFromWicColorContext)( _In_ IWICColorContext *wicColorContext, - _COM_Outptr_ ID2D1ColorContext **colorContext + _COM_Outptr_ ID2D1ColorContext **colorContext ) PURE; - + STDMETHOD(CheckFeatureSupport)( D2D1_FEATURE feature, _Out_writes_bytes_(featureSupportDataSize) void *featureSupportData, - UINT32 featureSupportDataSize + UINT32 featureSupportDataSize ) CONST PURE; - + /// /// Indicates whether the buffer precision is supported by D2D. /// STDMETHOD_(BOOL, IsBufferPrecisionSupported)( - D2D1_BUFFER_PRECISION bufferPrecision + D2D1_BUFFER_PRECISION bufferPrecision ) CONST PURE; }; // interface ID2D1EffectContext diff --git a/gfx/include/dxsdk/d2d1effectauthor_1.h b/gfx/include/dxsdk/d2d1effectauthor_1.h index 9ee6167f8f..0de668a535 100644 --- a/gfx/include/dxsdk/d2d1effectauthor_1.h +++ b/gfx/include/dxsdk/d2d1effectauthor_1.h @@ -31,7 +31,7 @@ EXTERN_C CONST IID IID_ID2D1EffectContext2; /// interface DX_DECLARE_INTERFACE("84ab595a-fc81-4546-bacd-e8ef4d8abe7a") ID2D1EffectContext1 : public ID2D1EffectContext { - + /// /// Creates a 3D lookup table for mapping a 3-channel input to a 3-channel output. /// The table data must be provided in 4-channel format. @@ -42,7 +42,7 @@ interface DX_DECLARE_INTERFACE("84ab595a-fc81-4546-bacd-e8ef4d8abe7a") ID2D1Effe _In_reads_(dataCount) CONST BYTE *data, UINT32 dataCount, _In_reads_(2) CONST UINT32 *strides, - _COM_Outptr_ ID2D1LookupTable3D **lookupTable + _COM_Outptr_ ID2D1LookupTable3D **lookupTable ) PURE; }; // interface ID2D1EffectContext1 @@ -55,23 +55,23 @@ interface DX_DECLARE_INTERFACE("84ab595a-fc81-4546-bacd-e8ef4d8abe7a") ID2D1Effe /// interface DX_DECLARE_INTERFACE("577ad2a0-9fc7-4dda-8b18-dab810140052") ID2D1EffectContext2 : public ID2D1EffectContext1 { - + /// /// Creates a color context from a DXGI color space type. It is only valid to use /// this with the Color Management Effect in 'Best' mode. /// STDMETHOD(CreateColorContextFromDxgiColorSpace)( DXGI_COLOR_SPACE_TYPE colorSpace, - _COM_Outptr_ ID2D1ColorContext1 **colorContext + _COM_Outptr_ ID2D1ColorContext1 **colorContext ) PURE; - + /// /// Creates a color context from a simple color profile. It is only valid to use /// this with the Color Management Effect in 'Best' mode. /// STDMETHOD(CreateColorContextFromSimpleColorProfile)( _In_ CONST D2D1_SIMPLE_COLOR_PROFILE *simpleProfile, - _COM_Outptr_ ID2D1ColorContext1 **colorContext + _COM_Outptr_ ID2D1ColorContext1 **colorContext ) PURE; }; // interface ID2D1EffectContext2 diff --git a/gfx/include/dxsdk/d2d1effecthelpers.h b/gfx/include/dxsdk/d2d1effecthelpers.h index 51598089f9..085a89d0ad 100644 --- a/gfx/include/dxsdk/d2d1effecthelpers.h +++ b/gfx/include/dxsdk/d2d1effecthelpers.h @@ -403,7 +403,7 @@ T GetType(T t) { return t; }; } #endif // #ifdef D2D1_SIMPLE_BINDING_MACROS - + /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d2d1effecthelpers.hlsli b/gfx/include/dxsdk/d2d1effecthelpers.hlsli index de523bf4ba..8ae3e6b18a 100644 --- a/gfx/include/dxsdk/d2d1effecthelpers.hlsli +++ b/gfx/include/dxsdk/d2d1effecthelpers.hlsli @@ -1,71 +1,71 @@ -//--------------------------------------------------------------------------- -// Copyright (c) Microsoft Corporation. All rights reserved. -// -// This file is automatically generated. Please do not edit it directly. -// -//--------------------------------------------------------------------------- - -// File contents: -// - Helpers methods for authoring D2D Effect shader code. -// These are located at the end of the file (D2DGetInput, etc.). -// - The top portion contains definitions and initialization required by the helpers. -// These elements are prefaced with "__D2D" and can be safely ignored. -// -// To use these helpers, the following values must be defined before inclusion: -// D2D_INPUT_COUNT - The number of texture inputs to the effect. -// D2D_INPUT[N]_SIMPLE or D2D_INPUT[N]_COMPLEX - How the effect will sample each input. (If unspecificed, defaults to _COMPLEX.) -// D2D_ENTRY - The name of the entry point being compiled. This will usually be defined on the command line at compilation time. -// -// The following values can be optionally defined: -// D2D_FUNCTION - Compile the entry point as an export function. This will usually be defined on the command line at compilation time. -// D2D_FULL_SHADER - Compile the entry point as a full shader. This will usually be defined on the command line at compilation time. -// D2D_FULL_SHADER_ONLY - Only compile the in-scope entry points to full shaders, never to export functions. -// - +//--------------------------------------------------------------------------- +// Copyright (c) Microsoft Corporation. All rights reserved. +// +// This file is automatically generated. Please do not edit it directly. +// +//--------------------------------------------------------------------------- + +// File contents: +// - Helpers methods for authoring D2D Effect shader code. +// These are located at the end of the file (D2DGetInput, etc.). +// - The top portion contains definitions and initialization required by the helpers. +// These elements are prefaced with "__D2D" and can be safely ignored. +// +// To use these helpers, the following values must be defined before inclusion: +// D2D_INPUT_COUNT - The number of texture inputs to the effect. +// D2D_INPUT[N]_SIMPLE or D2D_INPUT[N]_COMPLEX - How the effect will sample each input. (If unspecificed, defaults to _COMPLEX.) +// D2D_ENTRY - The name of the entry point being compiled. This will usually be defined on the command line at compilation time. +// +// The following values can be optionally defined: +// D2D_FUNCTION - Compile the entry point as an export function. This will usually be defined on the command line at compilation time. +// D2D_FULL_SHADER - Compile the entry point as a full shader. This will usually be defined on the command line at compilation time. +// D2D_FULL_SHADER_ONLY - Only compile the in-scope entry points to full shaders, never to export functions. +// + #define __D2D_DEFINE_PS_GLOBALS(inputIndex) \ Texture2D InputTexture##inputIndex : register(t##inputIndex); \ SamplerState InputSampler##inputIndex : register(s##inputIndex); \ // Define a texture and sampler pair for each D2D effect input. -#if (D2D_INPUT_COUNT >= 1) +#if (D2D_INPUT_COUNT >= 1) __D2D_DEFINE_PS_GLOBALS(0) #endif #if (D2D_INPUT_COUNT >= 2) __D2D_DEFINE_PS_GLOBALS(1) -#endif +#endif #if (D2D_INPUT_COUNT >= 3) __D2D_DEFINE_PS_GLOBALS(2) -#endif +#endif #if (D2D_INPUT_COUNT >= 4) __D2D_DEFINE_PS_GLOBALS(3) -#endif +#endif #if (D2D_INPUT_COUNT >= 5) __D2D_DEFINE_PS_GLOBALS(4) -#endif +#endif #if (D2D_INPUT_COUNT >= 6) __D2D_DEFINE_PS_GLOBALS(5) -#endif +#endif #if (D2D_INPUT_COUNT >= 7) __D2D_DEFINE_PS_GLOBALS(6) -#endif +#endif #if (D2D_INPUT_COUNT >= 8) __D2D_DEFINE_PS_GLOBALS(7) -#endif +#endif #define __D2D_MAXIMUM_INPUT_COUNT 8 -// Validate that all required shader information has been defined. +// Validate that all required shader information has been defined. #ifndef D2D_INPUT_COUNT -#error D2D_INPUT_COUNT is undefined. -#endif +#error D2D_INPUT_COUNT is undefined. +#endif #if (D2D_INPUT_COUNT > __D2D_MAXIMUM_INPUT_COUNT) #error D2D_INPUT_COUNT exceeds the maximum input count. #endif // Define global statics to hold the values needed by intrinsic methods. -// These values are initialized by the entry point wrapper before calling into the -// effect's shader implementation. +// These values are initialized by the entry point wrapper before calling into the +// effect's shader implementation. #if !defined(D2D_FUNCTION) || defined(D2D_REQUIRES_SCENE_POSITION) static float4 __d2dstatic_scenePos = float4(0, 0, 0, 0); #endif @@ -107,7 +107,7 @@ __D2D_DEFINE_INPUT_STATICS(7) #define __D2D_SCENE_POS float4 __d2dinput_scenePos : SCENE_POSITION #define __D2D_INIT_STATIC_SCENE_POS __d2dstatic_scenePos = __d2dinput_scenePos #else -#define __D2D_SCENE_POS float4 __d2dinput_scenePos : SCENE_POSITION, +#define __D2D_SCENE_POS float4 __d2dinput_scenePos : SCENE_POSITION, #define __D2D_INIT_STATIC_SCENE_POS __d2dstatic_scenePos = __d2dinput_scenePos; #endif #else @@ -135,8 +135,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT0_SIMPLE) #define __D2D_INPUT0 __D2D_SIMPLE_INPUT(0) #define __D2D_INIT_STATIC0 __D2D_INIT_SIMPLE_STATIC(0) -#define __D2D_GET_INPUT0 __d2dstatic_input0 -#else +#define __D2D_GET_INPUT0 __d2dstatic_input0 +#else #define __D2D_INPUT0 __D2D_COMPLEX_INPUT(0) #define __D2D_INIT_STATIC0 __D2D_INIT_COMPLEX_STATIC(0) #define __D2D_GET_INPUT0 __D2D_SAMPLE_INPUT(0) @@ -144,8 +144,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT1_SIMPLE) #define __D2D_INPUT1 __D2D_SIMPLE_INPUT(1) #define __D2D_INIT_STATIC1 __D2D_INIT_SIMPLE_STATIC(1) -#define __D2D_GET_INPUT1 __d2dstatic_input1 -#else +#define __D2D_GET_INPUT1 __d2dstatic_input1 +#else #define __D2D_INPUT1 __D2D_COMPLEX_INPUT(1) #define __D2D_INIT_STATIC1 __D2D_INIT_COMPLEX_STATIC(1) #define __D2D_GET_INPUT1 __D2D_SAMPLE_INPUT(1) @@ -153,8 +153,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT2_SIMPLE) #define __D2D_INPUT2 __D2D_SIMPLE_INPUT(2) #define __D2D_INIT_STATIC2 __D2D_INIT_SIMPLE_STATIC(2) -#define __D2D_GET_INPUT2 __d2dstatic_input2 -#else +#define __D2D_GET_INPUT2 __d2dstatic_input2 +#else #define __D2D_INPUT2 __D2D_COMPLEX_INPUT(2) #define __D2D_INIT_STATIC2 __D2D_INIT_COMPLEX_STATIC(2) #define __D2D_GET_INPUT2 __D2D_SAMPLE_INPUT(2) @@ -162,8 +162,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT3_SIMPLE) #define __D2D_INPUT3 __D2D_SIMPLE_INPUT(3) #define __D2D_INIT_STATIC3 __D2D_INIT_SIMPLE_STATIC(3) -#define __D2D_GET_INPUT3 __d2dstatic_input3 -#else +#define __D2D_GET_INPUT3 __d2dstatic_input3 +#else #define __D2D_INPUT3 __D2D_COMPLEX_INPUT(3) #define __D2D_INIT_STATIC3 __D2D_INIT_COMPLEX_STATIC(3) #define __D2D_GET_INPUT3 __D2D_SAMPLE_INPUT(3) @@ -171,8 +171,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT4_SIMPLE) #define __D2D_INPUT4 __D2D_SIMPLE_INPUT(4) #define __D2D_INIT_STATIC4 __D2D_INIT_SIMPLE_STATIC(4) -#define __D2D_GET_INPUT4 __d2dstatic_input4 -#else +#define __D2D_GET_INPUT4 __d2dstatic_input4 +#else #define __D2D_INPUT4 __D2D_COMPLEX_INPUT(4) #define __D2D_INIT_STATIC4 __D2D_INIT_COMPLEX_STATIC(4) #define __D2D_GET_INPUT4 __D2D_SAMPLE_INPUT(4) @@ -180,8 +180,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT5_SIMPLE) #define __D2D_INPUT5 __D2D_SIMPLE_INPUT(5) #define __D2D_INIT_STATIC5 __D2D_INIT_SIMPLE_STATIC(5) -#define __D2D_GET_INPUT5 __d2dstatic_input5 -#else +#define __D2D_GET_INPUT5 __d2dstatic_input5 +#else #define __D2D_INPUT5 __D2D_COMPLEX_INPUT(5) #define __D2D_INIT_STATIC5 __D2D_INIT_COMPLEX_STATIC(5) #define __D2D_GET_INPUT5 __D2D_SAMPLE_INPUT(5) @@ -189,8 +189,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT6_SIMPLE) #define __D2D_INPUT6 __D2D_SIMPLE_INPUT(6) #define __D2D_INIT_STATIC6 __D2D_INIT_SIMPLE_STATIC(6) -#define __D2D_GET_INPUT6 __d2dstatic_input6 -#else +#define __D2D_GET_INPUT6 __d2dstatic_input6 +#else #define __D2D_INPUT6 __D2D_COMPLEX_INPUT(6) #define __D2D_INIT_STATIC6 __D2D_INIT_COMPLEX_STATIC(6) #define __D2D_GET_INPUT6 __D2D_SAMPLE_INPUT(6) @@ -198,8 +198,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #if defined(D2D_INPUT7_SIMPLE) #define __D2D_INPUT7 __D2D_SIMPLE_INPUT(7) #define __D2D_INIT_STATIC7 __D2D_INIT_SIMPLE_STATIC(7) -#define __D2D_GET_INPUT7 __d2dstatic_input7 -#else +#define __D2D_GET_INPUT7 __d2dstatic_input7 +#else #define __D2D_INPUT7 __D2D_COMPLEX_INPUT(7) #define __D2D_INIT_STATIC7 __D2D_INIT_COMPLEX_STATIC(7) #define __D2D_GET_INPUT7 __D2D_SAMPLE_INPUT(7) @@ -208,7 +208,7 @@ __D2D_DEFINE_INPUT_STATICS(7) #define __D2D_INPUT8 __D2D_SIMPLE_INPUT(8) #define __D2D_INIT_STATIC8 __D2D_INIT_SIMPLE_STATIC(8) #define __D2D_GET_INPUT8 __d2dstatic_input8 -#else +#else #define __D2D_INPUT8 __D2D_COMPLEX_INPUT(8) #define __D2D_INIT_STATIC8 __D2D_INIT_COMPLEX_STATIC(8) #define __D2D_GET_INPUT8 __D2D_SAMPLE_INPUT(8) @@ -246,16 +246,16 @@ __D2D_DEFINE_INPUT_STATICS(7) #if !defined(CONCAT) #define CONCAT(str1, str2) str1##str2 -#endif +#endif // Rename the entry point target function so that the actual entry point can use the name. // This expansion is the same for both full shaders and functions. #define D2D_PS_ENTRY(name) float4 CONCAT(name, _Impl)() -// If neither D2D_FUNCTION or D2D_FULL_SHADER is defined, behave as if D2D_FULL_SHADER is defined. +// If neither D2D_FUNCTION or D2D_FULL_SHADER is defined, behave as if D2D_FULL_SHADER is defined. #if defined(D2D_FUNCTION) && !defined(D2D_FULL_SHADER_ONLY) - // Replaces simple samples with either static variable or an actual sample, + // Replaces simple samples with either static variable or an actual sample, // depending on whether the input is declared as simple or complex. #define D2DGetInput(index) __D2D_GET_INPUT##index @@ -264,11 +264,11 @@ __D2D_DEFINE_INPUT_STATICS(7) // D2D_ENTRY is a macro whose actual name resolves to the effect's target "entry point" function. float4 CONCAT(D2D_ENTRY, _Impl)(); - // This is the actual entry point definition, which forwards the call to the target function. - export float4 D2D_func_entry(__D2D_FUNCTION_INPUTS) - { - __D2D_INIT_STATICS; - return CONCAT(D2D_ENTRY, _Impl)(); + // This is the actual entry point definition, which forwards the call to the target function. + export float4 D2D_func_entry(__D2D_FUNCTION_INPUTS) + { + __D2D_INIT_STATICS; + return CONCAT(D2D_ENTRY, _Impl)(); } #endif @@ -283,11 +283,11 @@ __D2D_DEFINE_INPUT_STATICS(7) // D2D_ENTRY is a macro whose actual name resolves to the effect's target "entry point" function. float4 CONCAT(D2D_ENTRY, _Impl)(); - // This is the actual entry point definition, which forwards the call to the target function. + // This is the actual entry point definition, which forwards the call to the target function. float4 D2D_ENTRY (float4 pos : SV_POSITION, __D2D_FUNCTION_INPUTS) : SV_TARGET - { - __D2D_INIT_STATICS; - return CONCAT(D2D_ENTRY, _Impl)(); + { + __D2D_INIT_STATICS; + return CONCAT(D2D_ENTRY, _Impl)(); } #endif @@ -295,8 +295,8 @@ __D2D_DEFINE_INPUT_STATICS(7) #endif // D2D_FUNCTION //=============================================================== -// Along with D2DGetInput defined above, the following macros and -// methods define D2D intrinsics for use in effect shader code. +// Along with D2DGetInput defined above, the following macros and +// methods define D2D intrinsics for use in effect shader code. //=============================================================== #if !defined(D2D_FUNCTION) || defined(D2D_REQUIRES_SCENE_POSITION) @@ -306,8 +306,8 @@ inline float4 D2DGetScenePosition() } #endif -#define D2DGetInputCoordinate(index) __d2dstatic_uv##index - +#define D2DGetInputCoordinate(index) __d2dstatic_uv##index + #define D2DSampleInput(index, position) InputTexture##index.Sample(InputSampler##index, position) #define D2DSampleInputAtOffset(index, offset) InputTexture##index.Sample(InputSampler##index, __d2dstatic_uv##index.xy + offset * __d2dstatic_uv##index.zw) diff --git a/gfx/include/dxsdk/d2d1effects.h b/gfx/include/dxsdk/d2d1effects.h index 225119e921..fe3b45ef1f 100644 --- a/gfx/include/dxsdk/d2d1effects.h +++ b/gfx/include/dxsdk/d2d1effects.h @@ -12,12 +12,11 @@ #ifndef _D2D1_EFFECTS_ #define _D2D1_EFFECTS_ - /*#include */ /*#pragma region Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ - + // Built in effect CLSIDs DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6AA97485, 0x6354, 0x4cfc, 0x90, 0x8C, 0xE4, 0xA7, 0x4F, 0x62, 0xC9, 0x6C); DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xC2844D0B, 0x3D86, 0x46e7, 0x85, 0xBA, 0x52, 0x6C, 0x92, 0x40, 0xF3, 0xFB); @@ -110,19 +109,19 @@ typedef enum D2D1_BITMAPSOURCE_ORIENTATION /// typedef enum D2D1_GAUSSIANBLUR_PROP { - + /// /// Property Name: "StandardDeviation" /// Property Type: FLOAT /// D2D1_GAUSSIANBLUR_PROP_STANDARD_DEVIATION = 0, - + /// /// Property Name: "Optimization" /// Property Type: D2D1_GAUSSIANBLUR_OPTIMIZATION /// D2D1_GAUSSIANBLUR_PROP_OPTIMIZATION = 1, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE @@ -146,25 +145,25 @@ typedef enum D2D1_GAUSSIANBLUR_OPTIMIZATION /// typedef enum D2D1_DIRECTIONALBLUR_PROP { - + /// /// Property Name: "StandardDeviation" /// Property Type: FLOAT /// D2D1_DIRECTIONALBLUR_PROP_STANDARD_DEVIATION = 0, - + /// /// Property Name: "Angle" /// Property Type: FLOAT /// D2D1_DIRECTIONALBLUR_PROP_ANGLE = 1, - + /// /// Property Name: "Optimization" /// Property Type: D2D1_DIRECTIONALBLUR_OPTIMIZATION /// D2D1_DIRECTIONALBLUR_PROP_OPTIMIZATION = 2, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE @@ -188,19 +187,19 @@ typedef enum D2D1_DIRECTIONALBLUR_OPTIMIZATION /// typedef enum D2D1_SHADOW_PROP { - + /// /// Property Name: "BlurStandardDeviation" /// Property Type: FLOAT /// D2D1_SHADOW_PROP_BLUR_STANDARD_DEVIATION = 0, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_4F /// D2D1_SHADOW_PROP_COLOR = 1, - + /// /// Property Name: "Optimization" /// Property Type: D2D1_SHADOW_OPTIMIZATION @@ -224,7 +223,7 @@ typedef enum D2D1_SHADOW_OPTIMIZATION /// typedef enum D2D1_BLEND_PROP { - + /// /// Property Name: "Mode" /// Property Type: D2D1_BLEND_MODE @@ -271,7 +270,7 @@ typedef enum D2D1_BLEND_MODE /// typedef enum D2D1_SATURATION_PROP { - + /// /// Property Name: "Saturation" /// Property Type: FLOAT @@ -286,7 +285,7 @@ typedef enum D2D1_SATURATION_PROP /// typedef enum D2D1_HUEROTATION_PROP { - + /// /// Property Name: "Angle" /// Property Type: FLOAT @@ -301,19 +300,19 @@ typedef enum D2D1_HUEROTATION_PROP /// typedef enum D2D1_COLORMATRIX_PROP { - + /// /// Property Name: "ColorMatrix" /// Property Type: D2D1_MATRIX_5X4_F /// D2D1_COLORMATRIX_PROP_COLOR_MATRIX = 0, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_COLORMATRIX_ALPHA_MODE /// D2D1_COLORMATRIX_PROP_ALPHA_MODE = 1, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -336,37 +335,37 @@ typedef enum D2D1_COLORMATRIX_ALPHA_MODE /// typedef enum D2D1_BITMAPSOURCE_PROP { - + /// /// Property Name: "WicBitmapSource" /// Property Type: IUnknown * /// D2D1_BITMAPSOURCE_PROP_WIC_BITMAP_SOURCE = 0, - + /// /// Property Name: "Scale" /// Property Type: D2D1_VECTOR_2F /// D2D1_BITMAPSOURCE_PROP_SCALE = 1, - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_BITMAPSOURCE_INTERPOLATION_MODE /// D2D1_BITMAPSOURCE_PROP_INTERPOLATION_MODE = 2, - + /// /// Property Name: "EnableDPICorrection" /// Property Type: BOOL /// D2D1_BITMAPSOURCE_PROP_ENABLE_DPI_CORRECTION = 3, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_BITMAPSOURCE_ALPHA_MODE /// D2D1_BITMAPSOURCE_PROP_ALPHA_MODE = 4, - + /// /// Property Name: "Orientation" /// Property Type: D2D1_BITMAPSOURCE_ORIENTATION @@ -400,7 +399,7 @@ typedef enum D2D1_BITMAPSOURCE_ALPHA_MODE /// typedef enum D2D1_COMPOSITE_PROP { - + /// /// Property Name: "Mode" /// Property Type: D2D1_COMPOSITE_MODE @@ -415,19 +414,19 @@ typedef enum D2D1_COMPOSITE_PROP /// typedef enum D2D1_3DTRANSFORM_PROP { - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_3DTRANSFORM_INTERPOLATION_MODE /// D2D1_3DTRANSFORM_PROP_INTERPOLATION_MODE = 0, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_3DTRANSFORM_PROP_BORDER_MODE = 1, - + /// /// Property Name: "TransformMatrix" /// Property Type: D2D1_MATRIX_4X4_F @@ -453,49 +452,49 @@ typedef enum D2D1_3DTRANSFORM_INTERPOLATION_MODE /// typedef enum D2D1_3DPERSPECTIVETRANSFORM_PROP { - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE /// D2D1_3DPERSPECTIVETRANSFORM_PROP_INTERPOLATION_MODE = 0, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_3DPERSPECTIVETRANSFORM_PROP_BORDER_MODE = 1, - + /// /// Property Name: "Depth" /// Property Type: FLOAT /// D2D1_3DPERSPECTIVETRANSFORM_PROP_DEPTH = 2, - + /// /// Property Name: "PerspectiveOrigin" /// Property Type: D2D1_VECTOR_2F /// D2D1_3DPERSPECTIVETRANSFORM_PROP_PERSPECTIVE_ORIGIN = 3, - + /// /// Property Name: "LocalOffset" /// Property Type: D2D1_VECTOR_3F /// D2D1_3DPERSPECTIVETRANSFORM_PROP_LOCAL_OFFSET = 4, - + /// /// Property Name: "GlobalOffset" /// Property Type: D2D1_VECTOR_3F /// D2D1_3DPERSPECTIVETRANSFORM_PROP_GLOBAL_OFFSET = 5, - + /// /// Property Name: "RotationOrigin" /// Property Type: D2D1_VECTOR_3F /// D2D1_3DPERSPECTIVETRANSFORM_PROP_ROTATION_ORIGIN = 6, - + /// /// Property Name: "Rotation" /// Property Type: D2D1_VECTOR_3F @@ -521,25 +520,25 @@ typedef enum D2D1_3DPERSPECTIVETRANSFORM_INTERPOLATION_MODE /// typedef enum D2D1_2DAFFINETRANSFORM_PROP { - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE /// D2D1_2DAFFINETRANSFORM_PROP_INTERPOLATION_MODE = 0, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_2DAFFINETRANSFORM_PROP_BORDER_MODE = 1, - + /// /// Property Name: "TransformMatrix" /// Property Type: D2D1_MATRIX_3X2_F /// D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX = 2, - + /// /// Property Name: "Sharpness" /// Property Type: FLOAT @@ -566,19 +565,19 @@ typedef enum D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE /// typedef enum D2D1_DPICOMPENSATION_PROP { - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_DPICOMPENSATION_INTERPOLATION_MODE /// D2D1_DPICOMPENSATION_PROP_INTERPOLATION_MODE = 0, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_DPICOMPENSATION_PROP_BORDER_MODE = 1, - + /// /// Property Name: "InputDpi" /// Property Type: D2D1_VECTOR_2F @@ -605,31 +604,31 @@ typedef enum D2D1_DPICOMPENSATION_INTERPOLATION_MODE /// typedef enum D2D1_SCALE_PROP { - + /// /// Property Name: "Scale" /// Property Type: D2D1_VECTOR_2F /// D2D1_SCALE_PROP_SCALE = 0, - + /// /// Property Name: "CenterPoint" /// Property Type: D2D1_VECTOR_2F /// D2D1_SCALE_PROP_CENTER_POINT = 1, - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_SCALE_INTERPOLATION_MODE /// D2D1_SCALE_PROP_INTERPOLATION_MODE = 2, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_SCALE_PROP_BORDER_MODE = 3, - + /// /// Property Name: "Sharpness" /// Property Type: FLOAT @@ -656,43 +655,43 @@ typedef enum D2D1_SCALE_INTERPOLATION_MODE /// typedef enum D2D1_TURBULENCE_PROP { - + /// /// Property Name: "Offset" /// Property Type: D2D1_VECTOR_2F /// D2D1_TURBULENCE_PROP_OFFSET = 0, - + /// /// Property Name: "Size" /// Property Type: D2D1_VECTOR_2F /// D2D1_TURBULENCE_PROP_SIZE = 1, - + /// /// Property Name: "BaseFrequency" /// Property Type: D2D1_VECTOR_2F /// D2D1_TURBULENCE_PROP_BASE_FREQUENCY = 2, - + /// /// Property Name: "NumOctaves" /// Property Type: UINT32 /// D2D1_TURBULENCE_PROP_NUM_OCTAVES = 3, - + /// /// Property Name: "Seed" /// Property Type: INT32 /// D2D1_TURBULENCE_PROP_SEED = 4, - + /// /// Property Name: "Noise" /// Property Type: D2D1_TURBULENCE_NOISE /// D2D1_TURBULENCE_PROP_NOISE = 5, - + /// /// Property Name: "Stitchable" /// Property Type: BOOL @@ -715,19 +714,19 @@ typedef enum D2D1_TURBULENCE_NOISE /// typedef enum D2D1_DISPLACEMENTMAP_PROP { - + /// /// Property Name: "Scale" /// Property Type: FLOAT /// D2D1_DISPLACEMENTMAP_PROP_SCALE = 0, - + /// /// Property Name: "XChannelSelect" /// Property Type: D2D1_CHANNEL_SELECTOR /// D2D1_DISPLACEMENTMAP_PROP_X_CHANNEL_SELECT = 1, - + /// /// Property Name: "YChannelSelect" /// Property Type: D2D1_CHANNEL_SELECTOR @@ -742,37 +741,37 @@ typedef enum D2D1_DISPLACEMENTMAP_PROP /// typedef enum D2D1_COLORMANAGEMENT_PROP { - + /// /// Property Name: "SourceColorContext" /// Property Type: ID2D1ColorContext * /// D2D1_COLORMANAGEMENT_PROP_SOURCE_COLOR_CONTEXT = 0, - + /// /// Property Name: "SourceRenderingIntent" /// Property Type: D2D1_RENDERING_INTENT /// D2D1_COLORMANAGEMENT_PROP_SOURCE_RENDERING_INTENT = 1, - + /// /// Property Name: "DestinationColorContext" /// Property Type: ID2D1ColorContext * /// D2D1_COLORMANAGEMENT_PROP_DESTINATION_COLOR_CONTEXT = 2, - + /// /// Property Name: "DestinationRenderingIntent" /// Property Type: D2D1_RENDERING_INTENT /// D2D1_COLORMANAGEMENT_PROP_DESTINATION_RENDERING_INTENT = 3, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_COLORMANAGEMENT_ALPHA_MODE /// D2D1_COLORMANAGEMENT_PROP_ALPHA_MODE = 4, - + /// /// Property Name: "Quality" /// Property Type: D2D1_COLORMANAGEMENT_QUALITY @@ -817,19 +816,19 @@ typedef enum D2D1_COLORMANAGEMENT_RENDERING_INTENT /// typedef enum D2D1_HISTOGRAM_PROP { - + /// /// Property Name: "NumBins" /// Property Type: UINT32 /// D2D1_HISTOGRAM_PROP_NUM_BINS = 0, - + /// /// Property Name: "ChannelSelect" /// Property Type: D2D1_CHANNEL_SELECTOR /// D2D1_HISTOGRAM_PROP_CHANNEL_SELECT = 1, - + /// /// Property Name: "HistogramOutput" /// Property Type: (blob) @@ -844,43 +843,43 @@ typedef enum D2D1_HISTOGRAM_PROP /// typedef enum D2D1_POINTSPECULAR_PROP { - + /// /// Property Name: "LightPosition" /// Property Type: D2D1_VECTOR_3F /// D2D1_POINTSPECULAR_PROP_LIGHT_POSITION = 0, - + /// /// Property Name: "SpecularExponent" /// Property Type: FLOAT /// D2D1_POINTSPECULAR_PROP_SPECULAR_EXPONENT = 1, - + /// /// Property Name: "SpecularConstant" /// Property Type: FLOAT /// D2D1_POINTSPECULAR_PROP_SPECULAR_CONSTANT = 2, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_POINTSPECULAR_PROP_SURFACE_SCALE = 3, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_POINTSPECULAR_PROP_COLOR = 4, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_POINTSPECULAR_PROP_KERNEL_UNIT_LENGTH = 5, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_POINTSPECULAR_SCALE_MODE @@ -907,61 +906,61 @@ typedef enum D2D1_POINTSPECULAR_SCALE_MODE /// typedef enum D2D1_SPOTSPECULAR_PROP { - + /// /// Property Name: "LightPosition" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTSPECULAR_PROP_LIGHT_POSITION = 0, - + /// /// Property Name: "PointsAt" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTSPECULAR_PROP_POINTS_AT = 1, - + /// /// Property Name: "Focus" /// Property Type: FLOAT /// D2D1_SPOTSPECULAR_PROP_FOCUS = 2, - + /// /// Property Name: "LimitingConeAngle" /// Property Type: FLOAT /// D2D1_SPOTSPECULAR_PROP_LIMITING_CONE_ANGLE = 3, - + /// /// Property Name: "SpecularExponent" /// Property Type: FLOAT /// D2D1_SPOTSPECULAR_PROP_SPECULAR_EXPONENT = 4, - + /// /// Property Name: "SpecularConstant" /// Property Type: FLOAT /// D2D1_SPOTSPECULAR_PROP_SPECULAR_CONSTANT = 5, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_SPOTSPECULAR_PROP_SURFACE_SCALE = 6, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTSPECULAR_PROP_COLOR = 7, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_SPOTSPECULAR_PROP_KERNEL_UNIT_LENGTH = 8, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_SPOTSPECULAR_SCALE_MODE @@ -988,49 +987,49 @@ typedef enum D2D1_SPOTSPECULAR_SCALE_MODE /// typedef enum D2D1_DISTANTSPECULAR_PROP { - + /// /// Property Name: "Azimuth" /// Property Type: FLOAT /// D2D1_DISTANTSPECULAR_PROP_AZIMUTH = 0, - + /// /// Property Name: "Elevation" /// Property Type: FLOAT /// D2D1_DISTANTSPECULAR_PROP_ELEVATION = 1, - + /// /// Property Name: "SpecularExponent" /// Property Type: FLOAT /// D2D1_DISTANTSPECULAR_PROP_SPECULAR_EXPONENT = 2, - + /// /// Property Name: "SpecularConstant" /// Property Type: FLOAT /// D2D1_DISTANTSPECULAR_PROP_SPECULAR_CONSTANT = 3, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_DISTANTSPECULAR_PROP_SURFACE_SCALE = 4, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_DISTANTSPECULAR_PROP_COLOR = 5, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_DISTANTSPECULAR_PROP_KERNEL_UNIT_LENGTH = 6, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_DISTANTSPECULAR_SCALE_MODE @@ -1057,37 +1056,37 @@ typedef enum D2D1_DISTANTSPECULAR_SCALE_MODE /// typedef enum D2D1_POINTDIFFUSE_PROP { - + /// /// Property Name: "LightPosition" /// Property Type: D2D1_VECTOR_3F /// D2D1_POINTDIFFUSE_PROP_LIGHT_POSITION = 0, - + /// /// Property Name: "DiffuseConstant" /// Property Type: FLOAT /// D2D1_POINTDIFFUSE_PROP_DIFFUSE_CONSTANT = 1, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_POINTDIFFUSE_PROP_SURFACE_SCALE = 2, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_POINTDIFFUSE_PROP_COLOR = 3, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_POINTDIFFUSE_PROP_KERNEL_UNIT_LENGTH = 4, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_POINTDIFFUSE_SCALE_MODE @@ -1114,55 +1113,55 @@ typedef enum D2D1_POINTDIFFUSE_SCALE_MODE /// typedef enum D2D1_SPOTDIFFUSE_PROP { - + /// /// Property Name: "LightPosition" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTDIFFUSE_PROP_LIGHT_POSITION = 0, - + /// /// Property Name: "PointsAt" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTDIFFUSE_PROP_POINTS_AT = 1, - + /// /// Property Name: "Focus" /// Property Type: FLOAT /// D2D1_SPOTDIFFUSE_PROP_FOCUS = 2, - + /// /// Property Name: "LimitingConeAngle" /// Property Type: FLOAT /// D2D1_SPOTDIFFUSE_PROP_LIMITING_CONE_ANGLE = 3, - + /// /// Property Name: "DiffuseConstant" /// Property Type: FLOAT /// D2D1_SPOTDIFFUSE_PROP_DIFFUSE_CONSTANT = 4, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_SPOTDIFFUSE_PROP_SURFACE_SCALE = 5, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_SPOTDIFFUSE_PROP_COLOR = 6, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_SPOTDIFFUSE_PROP_KERNEL_UNIT_LENGTH = 7, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_SPOTDIFFUSE_SCALE_MODE @@ -1189,43 +1188,43 @@ typedef enum D2D1_SPOTDIFFUSE_SCALE_MODE /// typedef enum D2D1_DISTANTDIFFUSE_PROP { - + /// /// Property Name: "Azimuth" /// Property Type: FLOAT /// D2D1_DISTANTDIFFUSE_PROP_AZIMUTH = 0, - + /// /// Property Name: "Elevation" /// Property Type: FLOAT /// D2D1_DISTANTDIFFUSE_PROP_ELEVATION = 1, - + /// /// Property Name: "DiffuseConstant" /// Property Type: FLOAT /// D2D1_DISTANTDIFFUSE_PROP_DIFFUSE_CONSTANT = 2, - + /// /// Property Name: "SurfaceScale" /// Property Type: FLOAT /// D2D1_DISTANTDIFFUSE_PROP_SURFACE_SCALE = 3, - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_DISTANTDIFFUSE_PROP_COLOR = 4, - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_DISTANTDIFFUSE_PROP_KERNEL_UNIT_LENGTH = 5, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_DISTANTDIFFUSE_SCALE_MODE @@ -1252,7 +1251,7 @@ typedef enum D2D1_DISTANTDIFFUSE_SCALE_MODE /// typedef enum D2D1_FLOOD_PROP { - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_4F @@ -1267,79 +1266,79 @@ typedef enum D2D1_FLOOD_PROP /// typedef enum D2D1_LINEARTRANSFER_PROP { - + /// /// Property Name: "RedYIntercept" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_RED_Y_INTERCEPT = 0, - + /// /// Property Name: "RedSlope" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_RED_SLOPE = 1, - + /// /// Property Name: "RedDisable" /// Property Type: BOOL /// D2D1_LINEARTRANSFER_PROP_RED_DISABLE = 2, - + /// /// Property Name: "GreenYIntercept" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_GREEN_Y_INTERCEPT = 3, - + /// /// Property Name: "GreenSlope" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_GREEN_SLOPE = 4, - + /// /// Property Name: "GreenDisable" /// Property Type: BOOL /// D2D1_LINEARTRANSFER_PROP_GREEN_DISABLE = 5, - + /// /// Property Name: "BlueYIntercept" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_BLUE_Y_INTERCEPT = 6, - + /// /// Property Name: "BlueSlope" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_BLUE_SLOPE = 7, - + /// /// Property Name: "BlueDisable" /// Property Type: BOOL /// D2D1_LINEARTRANSFER_PROP_BLUE_DISABLE = 8, - + /// /// Property Name: "AlphaYIntercept" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_ALPHA_Y_INTERCEPT = 9, - + /// /// Property Name: "AlphaSlope" /// Property Type: FLOAT /// D2D1_LINEARTRANSFER_PROP_ALPHA_SLOPE = 10, - + /// /// Property Name: "AlphaDisable" /// Property Type: BOOL /// D2D1_LINEARTRANSFER_PROP_ALPHA_DISABLE = 11, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1354,103 +1353,103 @@ typedef enum D2D1_LINEARTRANSFER_PROP /// typedef enum D2D1_GAMMATRANSFER_PROP { - + /// /// Property Name: "RedAmplitude" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_RED_AMPLITUDE = 0, - + /// /// Property Name: "RedExponent" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_RED_EXPONENT = 1, - + /// /// Property Name: "RedOffset" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_RED_OFFSET = 2, - + /// /// Property Name: "RedDisable" /// Property Type: BOOL /// D2D1_GAMMATRANSFER_PROP_RED_DISABLE = 3, - + /// /// Property Name: "GreenAmplitude" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_GREEN_AMPLITUDE = 4, - + /// /// Property Name: "GreenExponent" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_GREEN_EXPONENT = 5, - + /// /// Property Name: "GreenOffset" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_GREEN_OFFSET = 6, - + /// /// Property Name: "GreenDisable" /// Property Type: BOOL /// D2D1_GAMMATRANSFER_PROP_GREEN_DISABLE = 7, - + /// /// Property Name: "BlueAmplitude" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_BLUE_AMPLITUDE = 8, - + /// /// Property Name: "BlueExponent" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_BLUE_EXPONENT = 9, - + /// /// Property Name: "BlueOffset" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_BLUE_OFFSET = 10, - + /// /// Property Name: "BlueDisable" /// Property Type: BOOL /// D2D1_GAMMATRANSFER_PROP_BLUE_DISABLE = 11, - + /// /// Property Name: "AlphaAmplitude" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_ALPHA_AMPLITUDE = 12, - + /// /// Property Name: "AlphaExponent" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_ALPHA_EXPONENT = 13, - + /// /// Property Name: "AlphaOffset" /// Property Type: FLOAT /// D2D1_GAMMATRANSFER_PROP_ALPHA_OFFSET = 14, - + /// /// Property Name: "AlphaDisable" /// Property Type: BOOL /// D2D1_GAMMATRANSFER_PROP_ALPHA_DISABLE = 15, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1465,55 +1464,55 @@ typedef enum D2D1_GAMMATRANSFER_PROP /// typedef enum D2D1_TABLETRANSFER_PROP { - + /// /// Property Name: "RedTable" /// Property Type: (blob) /// D2D1_TABLETRANSFER_PROP_RED_TABLE = 0, - + /// /// Property Name: "RedDisable" /// Property Type: BOOL /// D2D1_TABLETRANSFER_PROP_RED_DISABLE = 1, - + /// /// Property Name: "GreenTable" /// Property Type: (blob) /// D2D1_TABLETRANSFER_PROP_GREEN_TABLE = 2, - + /// /// Property Name: "GreenDisable" /// Property Type: BOOL /// D2D1_TABLETRANSFER_PROP_GREEN_DISABLE = 3, - + /// /// Property Name: "BlueTable" /// Property Type: (blob) /// D2D1_TABLETRANSFER_PROP_BLUE_TABLE = 4, - + /// /// Property Name: "BlueDisable" /// Property Type: BOOL /// D2D1_TABLETRANSFER_PROP_BLUE_DISABLE = 5, - + /// /// Property Name: "AlphaTable" /// Property Type: (blob) /// D2D1_TABLETRANSFER_PROP_ALPHA_TABLE = 6, - + /// /// Property Name: "AlphaDisable" /// Property Type: BOOL /// D2D1_TABLETRANSFER_PROP_ALPHA_DISABLE = 7, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1528,55 +1527,55 @@ typedef enum D2D1_TABLETRANSFER_PROP /// typedef enum D2D1_DISCRETETRANSFER_PROP { - + /// /// Property Name: "RedTable" /// Property Type: (blob) /// D2D1_DISCRETETRANSFER_PROP_RED_TABLE = 0, - + /// /// Property Name: "RedDisable" /// Property Type: BOOL /// D2D1_DISCRETETRANSFER_PROP_RED_DISABLE = 1, - + /// /// Property Name: "GreenTable" /// Property Type: (blob) /// D2D1_DISCRETETRANSFER_PROP_GREEN_TABLE = 2, - + /// /// Property Name: "GreenDisable" /// Property Type: BOOL /// D2D1_DISCRETETRANSFER_PROP_GREEN_DISABLE = 3, - + /// /// Property Name: "BlueTable" /// Property Type: (blob) /// D2D1_DISCRETETRANSFER_PROP_BLUE_TABLE = 4, - + /// /// Property Name: "BlueDisable" /// Property Type: BOOL /// D2D1_DISCRETETRANSFER_PROP_BLUE_DISABLE = 5, - + /// /// Property Name: "AlphaTable" /// Property Type: (blob) /// D2D1_DISCRETETRANSFER_PROP_ALPHA_TABLE = 6, - + /// /// Property Name: "AlphaDisable" /// Property Type: BOOL /// D2D1_DISCRETETRANSFER_PROP_ALPHA_DISABLE = 7, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1591,67 +1590,67 @@ typedef enum D2D1_DISCRETETRANSFER_PROP /// typedef enum D2D1_CONVOLVEMATRIX_PROP { - + /// /// Property Name: "KernelUnitLength" /// Property Type: D2D1_VECTOR_2F /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_UNIT_LENGTH = 0, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_CONVOLVEMATRIX_SCALE_MODE /// D2D1_CONVOLVEMATRIX_PROP_SCALE_MODE = 1, - + /// /// Property Name: "KernelSizeX" /// Property Type: UINT32 /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_SIZE_X = 2, - + /// /// Property Name: "KernelSizeY" /// Property Type: UINT32 /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_SIZE_Y = 3, - + /// /// Property Name: "KernelMatrix" /// Property Type: (blob) /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_MATRIX = 4, - + /// /// Property Name: "Divisor" /// Property Type: FLOAT /// D2D1_CONVOLVEMATRIX_PROP_DIVISOR = 5, - + /// /// Property Name: "Bias" /// Property Type: FLOAT /// D2D1_CONVOLVEMATRIX_PROP_BIAS = 6, - + /// /// Property Name: "KernelOffset" /// Property Type: D2D1_VECTOR_2F /// D2D1_CONVOLVEMATRIX_PROP_KERNEL_OFFSET = 7, - + /// /// Property Name: "PreserveAlpha" /// Property Type: BOOL /// D2D1_CONVOLVEMATRIX_PROP_PRESERVE_ALPHA = 8, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE /// D2D1_CONVOLVEMATRIX_PROP_BORDER_MODE = 9, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1678,13 +1677,13 @@ typedef enum D2D1_CONVOLVEMATRIX_SCALE_MODE /// typedef enum D2D1_BRIGHTNESS_PROP { - + /// /// Property Name: "WhitePoint" /// Property Type: D2D1_VECTOR_2F /// D2D1_BRIGHTNESS_PROP_WHITE_POINT = 0, - + /// /// Property Name: "BlackPoint" /// Property Type: D2D1_VECTOR_2F @@ -1699,13 +1698,13 @@ typedef enum D2D1_BRIGHTNESS_PROP /// typedef enum D2D1_ARITHMETICCOMPOSITE_PROP { - + /// /// Property Name: "Coefficients" /// Property Type: D2D1_VECTOR_4F /// D2D1_ARITHMETICCOMPOSITE_PROP_COEFFICIENTS = 0, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL @@ -1720,13 +1719,13 @@ typedef enum D2D1_ARITHMETICCOMPOSITE_PROP /// typedef enum D2D1_CROP_PROP { - + /// /// Property Name: "Rect" /// Property Type: D2D1_VECTOR_4F /// D2D1_CROP_PROP_RECT = 0, - + /// /// Property Name: "BorderMode" /// Property Type: D2D1_BORDER_MODE @@ -1741,13 +1740,13 @@ typedef enum D2D1_CROP_PROP /// typedef enum D2D1_BORDER_PROP { - + /// /// Property Name: "EdgeModeX" /// Property Type: D2D1_BORDER_EDGE_MODE /// D2D1_BORDER_PROP_EDGE_MODE_X = 0, - + /// /// Property Name: "EdgeModeY" /// Property Type: D2D1_BORDER_EDGE_MODE @@ -1774,19 +1773,19 @@ typedef enum D2D1_BORDER_EDGE_MODE /// typedef enum D2D1_MORPHOLOGY_PROP { - + /// /// Property Name: "Mode" /// Property Type: D2D1_MORPHOLOGY_MODE /// D2D1_MORPHOLOGY_PROP_MODE = 0, - + /// /// Property Name: "Width" /// Property Type: UINT32 /// D2D1_MORPHOLOGY_PROP_WIDTH = 1, - + /// /// Property Name: "Height" /// Property Type: UINT32 @@ -1809,7 +1808,7 @@ typedef enum D2D1_MORPHOLOGY_MODE /// typedef enum D2D1_TILE_PROP { - + /// /// Property Name: "Rect" /// Property Type: D2D1_VECTOR_4F @@ -1824,13 +1823,13 @@ typedef enum D2D1_TILE_PROP /// typedef enum D2D1_ATLAS_PROP { - + /// /// Property Name: "InputRect" /// Property Type: D2D1_VECTOR_4F /// D2D1_ATLAS_PROP_INPUT_RECT = 0, - + /// /// Property Name: "InputPaddingRect" /// Property Type: D2D1_VECTOR_4F @@ -1845,7 +1844,7 @@ typedef enum D2D1_ATLAS_PROP /// typedef enum D2D1_OPACITYMETADATA_PROP { - + /// /// Property Name: "InputOpaqueRect" /// Property Type: D2D1_VECTOR_4F diff --git a/gfx/include/dxsdk/d2d1effects_1.h b/gfx/include/dxsdk/d2d1effects_1.h index 083834338c..503beca0b7 100644 --- a/gfx/include/dxsdk/d2d1effects_1.h +++ b/gfx/include/dxsdk/d2d1effects_1.h @@ -16,12 +16,11 @@ #include #endif // #ifndef _D2D1_EFFECTS_ - /*#include */ /*#pragma region Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ - + // Built in effect CLSIDs DEFINE_GUID(CLSID_D2D1YCbCr, 0x99503cc1, 0x66c7, 0x45c9, 0xa8, 0x75, 0x8a, 0xd8, 0xa7, 0x91, 0x44, 0x01); @@ -30,19 +29,19 @@ DEFINE_GUID(CLSID_D2D1YCbCr, 0x99503cc1, 0x66c7, 0x45c9, 0xa8 /// typedef enum D2D1_YCBCR_PROP { - + /// /// Property Name: "ChromaSubsampling" /// Property Type: D2D1_YCBCR_CHROMA_SUBSAMPLING /// D2D1_YCBCR_PROP_CHROMA_SUBSAMPLING = 0, - + /// /// Property Name: "TransformMatrix" /// Property Type: D2D1_MATRIX_3X2_F /// D2D1_YCBCR_PROP_TRANSFORM_MATRIX = 1, - + /// /// Property Name: "InterpolationMode" /// Property Type: D2D1_YCBCR_INTERPOLATION_MODE diff --git a/gfx/include/dxsdk/d2d1effects_2.h b/gfx/include/dxsdk/d2d1effects_2.h index 64944ea15d..a3f6ea0dc0 100644 --- a/gfx/include/dxsdk/d2d1effects_2.h +++ b/gfx/include/dxsdk/d2d1effects_2.h @@ -16,12 +16,11 @@ #include #endif // #ifndef _D2D1_EFFECTS_1_ - /*#include */ /*#pragma region Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ - + // Built in effect CLSIDs DEFINE_GUID(CLSID_D2D1Contrast, 0xb648a78a, 0x0ed5, 0x4f80, 0xa9, 0x4a, 0x8e, 0x82, 0x5a, 0xca, 0x6b, 0x77); DEFINE_GUID(CLSID_D2D1RgbToHue, 0x23f3e5ec, 0x91e8, 0x4d3d, 0xad, 0x0a, 0xaf, 0xad, 0xc1, 0x00, 0x4a, 0xa1); @@ -55,13 +54,13 @@ DEFINE_GUID(CLSID_D2D1Tint, 0x36312b17, 0xf7dd, 0x4014, 0x91 /// typedef enum D2D1_CONTRAST_PROP { - + /// /// Property Name: "Contrast" /// Property Type: FLOAT /// D2D1_CONTRAST_PROP_CONTRAST = 0, - + /// /// Property Name: "ClampInput" /// Property Type: BOOL @@ -76,7 +75,7 @@ typedef enum D2D1_CONTRAST_PROP /// typedef enum D2D1_RGBTOHUE_PROP { - + /// /// Property Name: "OutputColorSpace" /// Property Type: D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE @@ -99,7 +98,7 @@ typedef enum D2D1_RGBTOHUE_OUTPUT_COLOR_SPACE /// typedef enum D2D1_HUETORGB_PROP { - + /// /// Property Name: "InputColorSpace" /// Property Type: D2D1_HUETORGB_INPUT_COLOR_SPACE @@ -122,25 +121,25 @@ typedef enum D2D1_HUETORGB_INPUT_COLOR_SPACE /// typedef enum D2D1_CHROMAKEY_PROP { - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_3F /// D2D1_CHROMAKEY_PROP_COLOR = 0, - + /// /// Property Name: "Tolerance" /// Property Type: FLOAT /// D2D1_CHROMAKEY_PROP_TOLERANCE = 1, - + /// /// Property Name: "InvertAlpha" /// Property Type: BOOL /// D2D1_CHROMAKEY_PROP_INVERT_ALPHA = 2, - + /// /// Property Name: "Feather" /// Property Type: BOOL @@ -155,13 +154,13 @@ typedef enum D2D1_CHROMAKEY_PROP /// typedef enum D2D1_EMBOSS_PROP { - + /// /// Property Name: "Height" /// Property Type: FLOAT /// D2D1_EMBOSS_PROP_HEIGHT = 0, - + /// /// Property Name: "Direction" /// Property Type: FLOAT @@ -176,7 +175,7 @@ typedef enum D2D1_EMBOSS_PROP /// typedef enum D2D1_EXPOSURE_PROP { - + /// /// Property Name: "ExposureValue" /// Property Type: FLOAT @@ -191,19 +190,19 @@ typedef enum D2D1_EXPOSURE_PROP /// typedef enum D2D1_POSTERIZE_PROP { - + /// /// Property Name: "RedValueCount" /// Property Type: UINT32 /// D2D1_POSTERIZE_PROP_RED_VALUE_COUNT = 0, - + /// /// Property Name: "GreenValueCount" /// Property Type: UINT32 /// D2D1_POSTERIZE_PROP_GREEN_VALUE_COUNT = 1, - + /// /// Property Name: "BlueValueCount" /// Property Type: UINT32 @@ -218,13 +217,13 @@ typedef enum D2D1_POSTERIZE_PROP /// typedef enum D2D1_SEPIA_PROP { - + /// /// Property Name: "Intensity" /// Property Type: FLOAT /// D2D1_SEPIA_PROP_INTENSITY = 0, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_ALPHA_MODE @@ -239,13 +238,13 @@ typedef enum D2D1_SEPIA_PROP /// typedef enum D2D1_SHARPEN_PROP { - + /// /// Property Name: "Sharpness" /// Property Type: FLOAT /// D2D1_SHARPEN_PROP_SHARPNESS = 0, - + /// /// Property Name: "Threshold" /// Property Type: FLOAT @@ -260,19 +259,19 @@ typedef enum D2D1_SHARPEN_PROP /// typedef enum D2D1_STRAIGHTEN_PROP { - + /// /// Property Name: "Angle" /// Property Type: FLOAT /// D2D1_STRAIGHTEN_PROP_ANGLE = 0, - + /// /// Property Name: "MaintainSize" /// Property Type: BOOL /// D2D1_STRAIGHTEN_PROP_MAINTAIN_SIZE = 1, - + /// /// Property Name: "ScaleMode" /// Property Type: D2D1_STRAIGHTEN_SCALE_MODE @@ -298,13 +297,13 @@ typedef enum D2D1_STRAIGHTEN_SCALE_MODE /// typedef enum D2D1_TEMPERATUREANDTINT_PROP { - + /// /// Property Name: "Temperature" /// Property Type: FLOAT /// D2D1_TEMPERATUREANDTINT_PROP_TEMPERATURE = 0, - + /// /// Property Name: "Tint" /// Property Type: FLOAT @@ -319,19 +318,19 @@ typedef enum D2D1_TEMPERATUREANDTINT_PROP /// typedef enum D2D1_VIGNETTE_PROP { - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_4F /// D2D1_VIGNETTE_PROP_COLOR = 0, - + /// /// Property Name: "TransitionSize" /// Property Type: FLOAT /// D2D1_VIGNETTE_PROP_TRANSITION_SIZE = 1, - + /// /// Property Name: "Strength" /// Property Type: FLOAT @@ -346,31 +345,31 @@ typedef enum D2D1_VIGNETTE_PROP /// typedef enum D2D1_EDGEDETECTION_PROP { - + /// /// Property Name: "Strength" /// Property Type: FLOAT /// D2D1_EDGEDETECTION_PROP_STRENGTH = 0, - + /// /// Property Name: "BlurRadius" /// Property Type: FLOAT /// D2D1_EDGEDETECTION_PROP_BLUR_RADIUS = 1, - + /// /// Property Name: "Mode" /// Property Type: D2D1_EDGEDETECTION_MODE /// D2D1_EDGEDETECTION_PROP_MODE = 2, - + /// /// Property Name: "OverlayEdges" /// Property Type: BOOL /// D2D1_EDGEDETECTION_PROP_OVERLAY_EDGES = 3, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_ALPHA_MODE @@ -393,31 +392,31 @@ typedef enum D2D1_EDGEDETECTION_MODE /// typedef enum D2D1_HIGHLIGHTSANDSHADOWS_PROP { - + /// /// Property Name: "Highlights" /// Property Type: FLOAT /// D2D1_HIGHLIGHTSANDSHADOWS_PROP_HIGHLIGHTS = 0, - + /// /// Property Name: "Shadows" /// Property Type: FLOAT /// D2D1_HIGHLIGHTSANDSHADOWS_PROP_SHADOWS = 1, - + /// /// Property Name: "Clarity" /// Property Type: FLOAT /// D2D1_HIGHLIGHTSANDSHADOWS_PROP_CLARITY = 2, - + /// /// Property Name: "InputGamma" /// Property Type: D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA /// D2D1_HIGHLIGHTSANDSHADOWS_PROP_INPUT_GAMMA = 3, - + /// /// Property Name: "MaskBlurRadius" /// Property Type: FLOAT @@ -440,13 +439,13 @@ typedef enum D2D1_HIGHLIGHTSANDSHADOWS_INPUT_GAMMA /// typedef enum D2D1_LOOKUPTABLE3D_PROP { - + /// /// Property Name: "Lut" /// Property Type: IUnknown * /// D2D1_LOOKUPTABLE3D_PROP_LUT = 0, - + /// /// Property Name: "AlphaMode" /// Property Type: D2D1_ALPHA_MODE @@ -463,7 +462,7 @@ typedef enum D2D1_LOOKUPTABLE3D_PROP /// typedef enum D2D1_OPACITY_PROP { - + /// /// Property Name: "Opacity" /// Property Type: FLOAT @@ -478,7 +477,7 @@ typedef enum D2D1_OPACITY_PROP /// typedef enum D2D1_CROSSFADE_PROP { - + /// /// Property Name: "Weight" /// Property Type: FLOAT @@ -493,13 +492,13 @@ typedef enum D2D1_CROSSFADE_PROP /// typedef enum D2D1_TINT_PROP { - + /// /// Property Name: "Color" /// Property Type: D2D1_VECTOR_4F /// D2D1_TINT_PROP_COLOR = 0, - + /// /// Property Name: "ClampOutput" /// Property Type: BOOL diff --git a/gfx/include/dxsdk/d2d1helper.h b/gfx/include/dxsdk/d2d1helper.h index 4012cc90ad..8cba8fae8e 100644 --- a/gfx/include/dxsdk/d2d1helper.h +++ b/gfx/include/dxsdk/d2d1helper.h @@ -26,7 +26,7 @@ namespace D2D1 // // Forward declared IdentityMatrix function to allow matrix class to use // these constructors. - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE D2D1_MATRIX_3X2_F @@ -380,7 +380,7 @@ namespace D2D1 // // PixelFormat - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE D2D1_PIXEL_FORMAT @@ -399,7 +399,7 @@ namespace D2D1 // // Bitmaps - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE D2D1_BITMAP_PROPERTIES @@ -420,7 +420,7 @@ namespace D2D1 // // Render Targets - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE D2D1_RENDER_TARGET_PROPERTIES @@ -665,7 +665,7 @@ namespace D2D1 // // Construct a color, note that the alpha value from the "rgb" component // is never used. - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE ColorF( @@ -751,7 +751,7 @@ namespace D2D1 // // Creates an uninitialized matrix - // + // COM_DECLSPEC_NOTHROW D2D1FORCEINLINE Matrix3x2F( diff --git a/gfx/include/dxsdk/d2d1svg.h b/gfx/include/dxsdk/d2d1svg.h index 6abb0b9777..8946593be5 100644 --- a/gfx/include/dxsdk/d2d1svg.h +++ b/gfx/include/dxsdk/d2d1svg.h @@ -29,39 +29,39 @@ typedef interface ID2D1SvgElement ID2D1SvgElement; /// typedef enum D2D1_SVG_PAINT_TYPE { - + /// /// The fill or stroke is not rendered. /// D2D1_SVG_PAINT_TYPE_NONE = 0, - + /// /// A solid color is rendered. /// D2D1_SVG_PAINT_TYPE_COLOR = 1, - + /// /// The current color is rendered. /// D2D1_SVG_PAINT_TYPE_CURRENT_COLOR = 2, - + /// /// A paint server, defined by another element in the SVG document, is used. /// D2D1_SVG_PAINT_TYPE_URI = 3, - + /// /// A paint server, defined by another element in the SVG document, is used. If the /// paint server reference is invalid, fall back to D2D1_SVG_PAINT_TYPE_NONE. /// D2D1_SVG_PAINT_TYPE_URI_NONE = 4, - + /// /// A paint server, defined by another element in the SVG document, is used. If the /// paint server reference is invalid, fall back to D2D1_SVG_PAINT_TYPE_COLOR. /// D2D1_SVG_PAINT_TYPE_URI_COLOR = 5, - + /// /// A paint server, defined by another element in the SVG document, is used. If the /// paint server reference is invalid, fall back to @@ -77,12 +77,12 @@ typedef enum D2D1_SVG_PAINT_TYPE /// typedef enum D2D1_SVG_LENGTH_UNITS { - + /// /// The length is unitless. /// D2D1_SVG_LENGTH_UNITS_NUMBER = 0, - + /// /// The length is a percentage value. /// @@ -96,12 +96,12 @@ typedef enum D2D1_SVG_LENGTH_UNITS /// typedef enum D2D1_SVG_DISPLAY { - + /// /// The element uses the default display behavior. /// D2D1_SVG_DISPLAY_INLINE = 0, - + /// /// The element and all children are not rendered directly. /// @@ -115,12 +115,12 @@ typedef enum D2D1_SVG_DISPLAY /// typedef enum D2D1_SVG_VISIBILITY { - + /// /// The element is visible. /// D2D1_SVG_VISIBILITY_VISIBLE = 0, - + /// /// The element is invisible. /// @@ -134,12 +134,12 @@ typedef enum D2D1_SVG_VISIBILITY /// typedef enum D2D1_SVG_OVERFLOW { - + /// /// The element is not clipped to its viewport. /// D2D1_SVG_OVERFLOW_VISIBLE = 0, - + /// /// The element is clipped to its viewport. /// @@ -153,17 +153,17 @@ typedef enum D2D1_SVG_OVERFLOW /// typedef enum D2D1_SVG_LINE_CAP { - + /// /// The property is set to SVG's 'butt' value. /// D2D1_SVG_LINE_CAP_BUTT = D2D1_CAP_STYLE_FLAT, - + /// /// The property is set to SVG's 'square' value. /// D2D1_SVG_LINE_CAP_SQUARE = D2D1_CAP_STYLE_SQUARE, - + /// /// The property is set to SVG's 'round' value. /// @@ -177,18 +177,18 @@ typedef enum D2D1_SVG_LINE_CAP /// typedef enum D2D1_SVG_LINE_JOIN { - + /// /// The property is set to SVG's 'bevel' value. /// D2D1_SVG_LINE_JOIN_BEVEL = D2D1_LINE_JOIN_BEVEL, - + /// /// The property is set to SVG's 'miter' value. Note that this is equivalent to /// D2D1_LINE_JOIN_MITER_OR_BEVEL, not D2D1_LINE_JOIN_MITER. /// D2D1_SVG_LINE_JOIN_MITER = D2D1_LINE_JOIN_MITER_OR_BEVEL, - + /// /// \ The property is set to SVG's 'round' value. /// @@ -202,52 +202,52 @@ typedef enum D2D1_SVG_LINE_JOIN /// typedef enum D2D1_SVG_ASPECT_ALIGN { - + /// /// The alignment is set to SVG's 'none' value. /// D2D1_SVG_ASPECT_ALIGN_NONE = 0, - + /// /// The alignment is set to SVG's 'xMinYMin' value. /// D2D1_SVG_ASPECT_ALIGN_X_MIN_Y_MIN = 1, - + /// /// The alignment is set to SVG's 'xMidYMin' value. /// D2D1_SVG_ASPECT_ALIGN_X_MID_Y_MIN = 2, - + /// /// The alignment is set to SVG's 'xMaxYMin' value. /// D2D1_SVG_ASPECT_ALIGN_X_MAX_Y_MIN = 3, - + /// /// The alignment is set to SVG's 'xMinYMid' value. /// D2D1_SVG_ASPECT_ALIGN_X_MIN_Y_MID = 4, - + /// /// The alignment is set to SVG's 'xMidYMid' value. /// D2D1_SVG_ASPECT_ALIGN_X_MID_Y_MID = 5, - + /// /// The alignment is set to SVG's 'xMaxYMid' value. /// D2D1_SVG_ASPECT_ALIGN_X_MAX_Y_MID = 6, - + /// /// The alignment is set to SVG's 'xMinYMax' value. /// D2D1_SVG_ASPECT_ALIGN_X_MIN_Y_MAX = 7, - + /// /// The alignment is set to SVG's 'xMidYMax' value. /// D2D1_SVG_ASPECT_ALIGN_X_MID_Y_MAX = 8, - + /// /// The alignment is set to SVG's 'xMaxYMax' value. /// @@ -261,13 +261,13 @@ typedef enum D2D1_SVG_ASPECT_ALIGN /// typedef enum D2D1_SVG_ASPECT_SCALING { - + /// /// Scale the viewBox up as much as possible such that the entire viewBox is visible /// within the viewport. /// D2D1_SVG_ASPECT_SCALING_MEET = 0, - + /// /// Scale the viewBox down as much as possible such that the entire viewport is /// covered by the viewBox. @@ -285,110 +285,110 @@ typedef enum D2D1_SVG_ASPECT_SCALING /// typedef enum D2D1_SVG_PATH_COMMAND { - + /// /// Closes the current subpath. Uses no segment data. /// D2D1_SVG_PATH_COMMAND_CLOSE_PATH = 0, - + /// /// Starts a new subpath at the coordinate (x y). Uses 2 floats of segment data. /// D2D1_SVG_PATH_COMMAND_MOVE_ABSOLUTE = 1, - + /// /// Starts a new subpath at the coordinate (x y). Uses 2 floats of segment data. /// D2D1_SVG_PATH_COMMAND_MOVE_RELATIVE = 2, - + /// /// Draws a line to the coordinate (x y). Uses 2 floats of segment data. /// D2D1_SVG_PATH_COMMAND_LINE_ABSOLUTE = 3, - + /// /// Draws a line to the coordinate (x y). Uses 2 floats of segment data. /// D2D1_SVG_PATH_COMMAND_LINE_RELATIVE = 4, - + /// /// Draws a cubic Bezier curve (x1 y1 x2 y2 x y). The curve ends at (x, y) and is /// defined by the two control points (x1, y1) and (x2, y2). Uses 6 floats of /// segment data. /// D2D1_SVG_PATH_COMMAND_CUBIC_ABSOLUTE = 5, - + /// /// Draws a cubic Bezier curve (x1 y1 x2 y2 x y). The curve ends at (x, y) and is /// defined by the two control points (x1, y1) and (x2, y2). Uses 6 floats of /// segment data. /// D2D1_SVG_PATH_COMMAND_CUBIC_RELATIVE = 6, - + /// /// Draws a quadratic Bezier curve (x1 y1 x y). The curve ends at (x, y) and is /// defined by the control point (x1 y1). Uses 4 floats of segment data. /// D2D1_SVG_PATH_COMMAND_QUADRADIC_ABSOLUTE = 7, - + /// /// Draws a quadratic Bezier curve (x1 y1 x y). The curve ends at (x, y) and is /// defined by the control point (x1 y1). Uses 4 floats of segment data. /// D2D1_SVG_PATH_COMMAND_QUADRADIC_RELATIVE = 8, - + /// /// Draws an elliptical arc (rx ry x-axis-rotation large-arc-flag sweep-flag x y). /// The curve ends at (x, y) and is defined by the arc parameters. The two flags are /// considered set if their values are non-zero. Uses 7 floats of segment data. /// D2D1_SVG_PATH_COMMAND_ARC_ABSOLUTE = 9, - + /// /// Draws an elliptical arc (rx ry x-axis-rotation large-arc-flag sweep-flag x y). /// The curve ends at (x, y) and is defined by the arc parameters. The two flags are /// considered set if their values are non-zero. Uses 7 floats of segment data. /// D2D1_SVG_PATH_COMMAND_ARC_RELATIVE = 10, - + /// /// Draws a horizontal line to the coordinate (x). Uses 1 float of segment data. /// D2D1_SVG_PATH_COMMAND_HORIZONTAL_ABSOLUTE = 11, - + /// /// Draws a horizontal line to the coordinate (x). Uses 1 float of segment data. /// D2D1_SVG_PATH_COMMAND_HORIZONTAL_RELATIVE = 12, - + /// /// Draws a vertical line to the coordinate (y). Uses 1 float of segment data. /// D2D1_SVG_PATH_COMMAND_VERTICAL_ABSOLUTE = 13, - + /// /// Draws a vertical line to the coordinate (y). Uses 1 float of segment data. /// D2D1_SVG_PATH_COMMAND_VERTICAL_RELATIVE = 14, - + /// /// Draws a smooth cubic Bezier curve (x2 y2 x y). The curve ends at (x, y) and is /// defined by the control point (x2, y2). Uses 4 floats of segment data. /// D2D1_SVG_PATH_COMMAND_CUBIC_SMOOTH_ABSOLUTE = 15, - + /// /// Draws a smooth cubic Bezier curve (x2 y2 x y). The curve ends at (x, y) and is /// defined by the control point (x2, y2). Uses 4 floats of segment data. /// D2D1_SVG_PATH_COMMAND_CUBIC_SMOOTH_RELATIVE = 16, - + /// /// Draws a smooth quadratic Bezier curve ending at (x, y). Uses 2 floats of segment /// data. /// D2D1_SVG_PATH_COMMAND_QUADRADIC_SMOOTH_ABSOLUTE = 17, - + /// /// Draws a smooth quadratic Bezier curve ending at (x, y). Uses 2 floats of segment /// data. @@ -403,12 +403,12 @@ typedef enum D2D1_SVG_PATH_COMMAND /// typedef enum D2D1_SVG_UNIT_TYPE { - + /// /// The property is set to SVG's 'userSpaceOnUse' value. /// D2D1_SVG_UNIT_TYPE_USER_SPACE_ON_USE = 0, - + /// /// The property is set to SVG's 'objectBoundingBox' value. /// @@ -422,16 +422,16 @@ typedef enum D2D1_SVG_UNIT_TYPE /// typedef enum D2D1_SVG_ATTRIBUTE_STRING_TYPE { - + /// /// The attribute is a string in the same form as it would appear in the SVG XML. - /// + /// /// Note that when getting values of this type, the value returned may not exactly /// match the value that was set. Instead, the output value is a normalized version /// of the value. For example, an input color of 'red' may be output as '#FF0000'. /// D2D1_SVG_ATTRIBUTE_STRING_TYPE_SVG = 0, - + /// /// The attribute is an element ID. /// @@ -445,72 +445,72 @@ typedef enum D2D1_SVG_ATTRIBUTE_STRING_TYPE /// typedef enum D2D1_SVG_ATTRIBUTE_POD_TYPE { - + /// /// The attribute is a FLOAT. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_FLOAT = 0, - + /// /// The attribute is a D2D1_COLOR_F. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_COLOR = 1, - + /// /// The attribute is a D2D1_FILL_MODE. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_FILL_MODE = 2, - + /// /// The attribute is a D2D1_SVG_DISPLAY. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_DISPLAY = 3, - + /// /// The attribute is a D2D1_SVG_OVERFLOW. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_OVERFLOW = 4, - + /// /// The attribute is a D2D1_SVG_LINE_CAP. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_CAP = 5, - + /// /// The attribute is a D2D1_SVG_LINE_JOIN. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_JOIN = 6, - + /// /// The attribute is a D2D1_SVG_VISIBILITY. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_VISIBILITY = 7, - + /// /// The attribute is a D2D1_MATRIX_3X2_F. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_MATRIX = 8, - + /// /// The attribute is a D2D1_SVG_UNIT_TYPE. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_UNIT_TYPE = 9, - + /// /// The attribute is a D2D1_EXTEND_MODE. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_EXTEND_MODE = 10, - + /// /// The attribute is a D2D1_SVG_PRESERVE_ASPECT_RATIO. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_PRESERVE_ASPECT_RATIO = 11, - + /// /// The attribute is a D2D1_SVG_VIEWBOX. /// D2D1_SVG_ATTRIBUTE_POD_TYPE_VIEWBOX = 12, - + /// /// The attribute is a D2D1_SVG_LENGTH. /// @@ -534,19 +534,19 @@ typedef struct D2D1_SVG_LENGTH /// typedef struct D2D1_SVG_PRESERVE_ASPECT_RATIO { - + /// /// Sets the 'defer' portion of the preserveAspectRatio settings. This field only /// has an effect on an 'image' element that references another SVG document. As /// this is not currently supported, the field has no impact on rendering. /// BOOL defer; - + /// /// Sets the align portion of the preserveAspectRatio settings. /// D2D1_SVG_ASPECT_ALIGN align; - + /// /// Sets the meetOrSlice portion of the preserveAspectRatio settings. /// @@ -583,21 +583,21 @@ EXTERN_C CONST IID IID_ID2D1SvgDocument; /// interface DX_DECLARE_INTERFACE("c9cdb0dd-f8c9-4e70-b7c2-301c80292c5e") ID2D1SvgAttribute : public ID2D1Resource { - + /// /// Returns the element on which this attribute is set. Returns null if the /// attribute is not set on any element. /// STDMETHOD_(void, GetElement)( - _Outptr_result_maybenull_ ID2D1SvgElement **element + _Outptr_result_maybenull_ ID2D1SvgElement **element ) PURE; - + /// /// Creates a clone of this attribute value. On creation, the cloned attribute is /// not set on any element. /// STDMETHOD(Clone)( - _COM_Outptr_ ID2D1SvgAttribute **attribute + _COM_Outptr_ ID2D1SvgAttribute **attribute ) PURE; }; // interface ID2D1SvgAttribute @@ -606,53 +606,53 @@ interface DX_DECLARE_INTERFACE("c9cdb0dd-f8c9-4e70-b7c2-301c80292c5e") ID2D1SvgA /// interface DX_DECLARE_INTERFACE("d59bab0a-68a2-455b-a5dc-9eb2854e2490") ID2D1SvgPaint : public ID2D1SvgAttribute { - + /// /// Sets the paint type. /// STDMETHOD(SetPaintType)( - D2D1_SVG_PAINT_TYPE paintType + D2D1_SVG_PAINT_TYPE paintType ) PURE; - + /// /// Gets the paint type. /// STDMETHOD_(D2D1_SVG_PAINT_TYPE, GetPaintType)( ) PURE; - + /// /// Sets the paint color that is used if the paint type is /// D2D1_SVG_PAINT_TYPE_COLOR. /// STDMETHOD(SetColor)( - _In_ CONST D2D1_COLOR_F *color + _In_ CONST D2D1_COLOR_F *color ) PURE; - + /// /// Gets the paint color that is used if the paint type is /// D2D1_SVG_PAINT_TYPE_COLOR. /// STDMETHOD_(void, GetColor)( - _Out_ D2D1_COLOR_F *color + _Out_ D2D1_COLOR_F *color ) PURE; - + /// /// Sets the element id which acts as the paint server. This id is used if the paint /// type is D2D1_SVG_PAINT_TYPE_URI. /// STDMETHOD(SetId)( - _In_ PCWSTR id + _In_ PCWSTR id ) PURE; - + /// /// Gets the element id which acts as the paint server. This id is used if the paint /// type is D2D1_SVG_PAINT_TYPE_URI. /// STDMETHOD(GetId)( _Out_writes_(idCount) PWSTR id, - UINT32 idCount + UINT32 idCount ) PURE; - + /// /// Gets the string length of the element id which acts as the paint server. This id /// is used if the paint type is D2D1_SVG_PAINT_TYPE_URI. The returned string length @@ -660,7 +660,7 @@ interface DX_DECLARE_INTERFACE("d59bab0a-68a2-455b-a5dc-9eb2854e2490") ID2D1SvgP /// STDMETHOD_(UINT32, GetIdLength)( ) PURE; - + /// /// Sets the paint color that is used if the paint type is /// D2D1_SVG_PAINT_TYPE_COLOR. @@ -668,8 +668,8 @@ interface DX_DECLARE_INTERFACE("d59bab0a-68a2-455b-a5dc-9eb2854e2490") ID2D1SvgP COM_DECLSPEC_NOTHROW HRESULT SetColor( - CONST D2D1_COLOR_F &color - ) + CONST D2D1_COLOR_F &color + ) { return SetColor(&color); } @@ -680,15 +680,15 @@ interface DX_DECLARE_INTERFACE("d59bab0a-68a2-455b-a5dc-9eb2854e2490") ID2D1SvgP /// interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgStrokeDashArray : public ID2D1SvgAttribute { - + /// /// Removes dashes from the end of the array. /// /// Specifies how many dashes to remove. STDMETHOD(RemoveDashesAtEnd)( - UINT32 dashesCount + UINT32 dashesCount ) PURE; - + /// /// Updates the array. Existing dashes not updated by this method are preserved. The /// array is resized larger if necessary to accomodate the new dashes. @@ -700,9 +700,9 @@ interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgS STDMETHOD(UpdateDashes)( _In_reads_(dashesCount) CONST FLOAT *dashes, UINT32 dashesCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Updates the array. Existing dashes not updated by this method are preserved. The /// array is resized larger if necessary to accomodate the new dashes. @@ -714,9 +714,9 @@ interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgS STDMETHOD(UpdateDashes)( _In_reads_(dashesCount) CONST D2D1_SVG_LENGTH *dashes, UINT32 dashesCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets dashes from the array. /// @@ -726,9 +726,9 @@ interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgS STDMETHOD(GetDashes)( _Out_writes_(dashesCount) FLOAT *dashes, UINT32 dashesCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets dashes from the array. /// @@ -738,9 +738,9 @@ interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgS STDMETHOD(GetDashes)( _Out_writes_(dashesCount) D2D1_SVG_LENGTH *dashes, UINT32 dashesCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets the number of the dashes in the array. /// @@ -753,15 +753,15 @@ interface DX_DECLARE_INTERFACE("f1c0ca52-92a3-4f00-b4ce-f35691efd9d9") ID2D1SvgS /// interface DX_DECLARE_INTERFACE("9dbe4c0d-3572-4dd9-9825-5530813bb712") ID2D1SvgPointCollection : public ID2D1SvgAttribute { - + /// /// Removes points from the end of the array. /// /// Specifies how many points to remove. STDMETHOD(RemovePointsAtEnd)( - UINT32 pointsCount + UINT32 pointsCount ) PURE; - + /// /// Updates the points array. Existing points not updated by this method are /// preserved. The array is resized larger if necessary to accomodate the new @@ -774,9 +774,9 @@ interface DX_DECLARE_INTERFACE("9dbe4c0d-3572-4dd9-9825-5530813bb712") ID2D1SvgP STDMETHOD(UpdatePoints)( _In_reads_(pointsCount) CONST D2D1_POINT_2F *points, UINT32 pointsCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets points from the points array. /// @@ -786,9 +786,9 @@ interface DX_DECLARE_INTERFACE("9dbe4c0d-3572-4dd9-9825-5530813bb712") ID2D1SvgP STDMETHOD(GetPoints)( _Out_writes_(pointsCount) D2D1_POINT_2F *points, UINT32 pointsCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets the number of points in the array. /// @@ -799,7 +799,7 @@ interface DX_DECLARE_INTERFACE("9dbe4c0d-3572-4dd9-9825-5530813bb712") ID2D1SvgP /// /// Interface describing SVG path data. Path data can be set as the 'd' attribute on /// a 'path' element. -/// +/// /// The path data set is factored into two arrays. The segment data array stores all /// numbers and the commands array stores the set of commands. Unlike the string /// data set in the d attribute, each command in this representation uses a fixed @@ -810,15 +810,15 @@ interface DX_DECLARE_INTERFACE("9dbe4c0d-3572-4dd9-9825-5530813bb712") ID2D1SvgP /// interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgPathData : public ID2D1SvgAttribute { - + /// /// Removes data from the end of the segment data array. /// /// Specifies how much data to remove. STDMETHOD(RemoveSegmentDataAtEnd)( - UINT32 dataCount + UINT32 dataCount ) PURE; - + /// /// Updates the segment data array. Existing segment data not updated by this method /// are preserved. The array is resized larger if necessary to accomodate the new @@ -831,9 +831,9 @@ interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgP STDMETHOD(UpdateSegmentData)( _In_reads_(dataCount) CONST FLOAT *data, UINT32 dataCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets data from the segment data array. /// @@ -844,23 +844,23 @@ interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgP STDMETHOD(GetSegmentData)( _Out_writes_(dataCount) FLOAT *data, UINT32 dataCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets the size of the segment data array. /// STDMETHOD_(UINT32, GetSegmentDataCount)( ) PURE; - + /// /// Removes commands from the end of the commands array. /// /// Specifies how many commands to remove. STDMETHOD(RemoveCommandsAtEnd)( - UINT32 commandsCount + UINT32 commandsCount ) PURE; - + /// /// Updates the commands array. Existing commands not updated by this method are /// preserved. The array is resized larger if necessary to accomodate the new @@ -873,9 +873,9 @@ interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgP STDMETHOD(UpdateCommands)( _In_reads_(commandsCount) CONST D2D1_SVG_PATH_COMMAND *commands, UINT32 commandsCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets commands from the commands array. /// @@ -885,21 +885,21 @@ interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgP STDMETHOD(GetCommands)( _Out_writes_(commandsCount) D2D1_SVG_PATH_COMMAND *commands, UINT32 commandsCount, - UINT32 startIndex = 0 + UINT32 startIndex = 0 ) PURE; - + /// /// Gets the size of the commands array. /// STDMETHOD_(UINT32, GetCommandsCount)( ) PURE; - + /// /// Creates a path geometry object representing the path data. /// STDMETHOD(CreatePathGeometry)( D2D1_FILL_MODE fillMode, - _COM_Outptr_ ID2D1PathGeometry1 **pathGeometry + _COM_Outptr_ ID2D1PathGeometry1 **pathGeometry ) PURE; }; // interface ID2D1SvgPathData @@ -908,64 +908,64 @@ interface DX_DECLARE_INTERFACE("c095e4f4-bb98-43d6-9745-4d1b84ec9888") ID2D1SvgP /// interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgElement : public ID2D1Resource { - + /// /// Gets the document that contains this element. Returns null if the element has /// been removed from the tree. /// STDMETHOD_(void, GetDocument)( - _Outptr_result_maybenull_ ID2D1SvgDocument **document + _Outptr_result_maybenull_ ID2D1SvgDocument **document ) PURE; - + /// /// Gets the tag name. /// STDMETHOD(GetTagName)( _Out_writes_(nameCount) PWSTR name, - UINT32 nameCount + UINT32 nameCount ) PURE; - + /// /// Gets the string length of the tag name. The returned string length does not /// include room for the null terminator. /// STDMETHOD_(UINT32, GetTagNameLength)( ) PURE; - + /// /// Returns TRUE if this element represents text content, e.g. the content of a /// 'title' or 'desc' element. Text content does not have a tag name. /// STDMETHOD_(BOOL, IsTextContent)( ) PURE; - + /// /// Gets the parent element. /// STDMETHOD_(void, GetParent)( - _Outptr_result_maybenull_ ID2D1SvgElement **parent + _Outptr_result_maybenull_ ID2D1SvgElement **parent ) PURE; - + /// /// Returns whether this element has children. /// STDMETHOD_(BOOL, HasChildren)( ) PURE; - + /// /// Gets the first child of this element. /// STDMETHOD_(void, GetFirstChild)( - _Outptr_result_maybenull_ ID2D1SvgElement **child + _Outptr_result_maybenull_ ID2D1SvgElement **child ) PURE; - + /// /// Gets the last child of this element. /// STDMETHOD_(void, GetLastChild)( - _Outptr_result_maybenull_ ID2D1SvgElement **child + _Outptr_result_maybenull_ ID2D1SvgElement **child ) PURE; - + /// /// Gets the previous sibling of the referenceChild element. /// @@ -976,9 +976,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// child, the output is null. STDMETHOD(GetPreviousChild)( _In_ ID2D1SvgElement *referenceChild, - _COM_Outptr_result_maybenull_ ID2D1SvgElement **previousChild + _COM_Outptr_result_maybenull_ ID2D1SvgElement **previousChild ) PURE; - + /// /// Gets the next sibling of the referenceChild element. /// @@ -989,9 +989,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// output is null. STDMETHOD(GetNextChild)( _In_ ID2D1SvgElement *referenceChild, - _COM_Outptr_result_maybenull_ ID2D1SvgElement **nextChild + _COM_Outptr_result_maybenull_ ID2D1SvgElement **nextChild ) PURE; - + /// /// Inserts newChild as a child of this element, before the referenceChild element. /// If the newChild element already has a parent, it is removed from this parent as @@ -1006,9 +1006,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// STDMETHOD(InsertChildBefore)( _In_ ID2D1SvgElement *newChild, - _In_opt_ ID2D1SvgElement *referenceChild = NULL + _In_opt_ ID2D1SvgElement *referenceChild = NULL ) PURE; - + /// /// Appends newChild to the list of children. If the newChild element already has a /// parent, it is removed from this parent as part of the append operation. Returns @@ -1017,9 +1017,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// /// The element to be appended. STDMETHOD(AppendChild)( - _In_ ID2D1SvgElement *newChild + _In_ ID2D1SvgElement *newChild ) PURE; - + /// /// Replaces the oldChild element with the newChild. This operation removes the /// oldChild from the tree. If the newChild element already has a parent, it is @@ -1032,9 +1032,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// must be an immediate child of this element. STDMETHOD(ReplaceChild)( _In_ ID2D1SvgElement *newChild, - _In_ ID2D1SvgElement *oldChild + _In_ ID2D1SvgElement *oldChild ) PURE; - + /// /// Removes the oldChild from the tree. Children of oldChild remain children of /// oldChild. @@ -1042,9 +1042,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// The child element to be removed. The oldChild element /// must be an immediate child of this element. STDMETHOD(RemoveChild)( - _In_ ID2D1SvgElement *oldChild + _In_ ID2D1SvgElement *oldChild ) PURE; - + /// /// Creates an element from a tag name. The element is appended to the list of /// children. Returns an error if this element cannot accept children of the @@ -1055,9 +1055,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// The new child element. STDMETHOD(CreateChild)( _In_ PCWSTR tagName, - _COM_Outptr_ ID2D1SvgElement **newChild + _COM_Outptr_ ID2D1SvgElement **newChild ) PURE; - + /// /// Returns true if the attribute is explicitly set on the element or if it is /// present within an inline style. Returns FALSE if the attribute is not a valid @@ -1068,9 +1068,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// value. STDMETHOD_(BOOL, IsAttributeSpecified)( _In_ PCWSTR name, - _Out_opt_ BOOL *inherited = NULL + _Out_opt_ BOOL *inherited = NULL ) PURE; - + /// /// Returns the number of specified attributes on this element. Attributes are only /// considered specified if they are explicitly set on the element or present within @@ -1080,7 +1080,7 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// STDMETHOD_(UINT32, GetSpecifiedAttributeCount)( ) PURE; - + /// /// Gets the name of the specified attribute at the given index. /// @@ -1092,9 +1092,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE UINT32 index, _Out_writes_(nameCount) PWSTR name, UINT32 nameCount, - _Out_opt_ BOOL *inherited = NULL + _Out_opt_ BOOL *inherited = NULL ) PURE; - + /// /// Gets the string length of the name of the specified attribute at the given /// index. The output string length does not include room for the null terminator. @@ -1107,41 +1107,41 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE STDMETHOD(GetSpecifiedAttributeNameLength)( UINT32 index, _Out_ UINT32 *nameLength, - _Out_opt_ BOOL *inherited = NULL + _Out_opt_ BOOL *inherited = NULL ) PURE; - + /// /// Removes the attribute from this element. Also removes this attribute from within /// an inline style if present. Returns an error if the attribute name is not valid /// on this element. /// STDMETHOD(RemoveAttribute)( - _In_ PCWSTR name + _In_ PCWSTR name ) PURE; - + /// /// Sets the value of a text content element. /// STDMETHOD(SetTextValue)( _In_reads_(nameCount) CONST WCHAR *name, - UINT32 nameCount + UINT32 nameCount ) PURE; - + /// /// Gets the value of a text content element. /// STDMETHOD(GetTextValue)( _Out_writes_(nameCount) PWSTR name, - UINT32 nameCount + UINT32 nameCount ) PURE; - + /// /// Gets the length of the text content value. The returned string length does not /// include room for the null terminator. /// STDMETHOD_(UINT32, GetTextValueLength)( ) PURE; - + /// /// Sets an attribute of this element using a string. Returns an error if the /// attribute name is not valid on this element. Returns an error if the attribute @@ -1150,9 +1150,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE STDMETHOD(SetAttributeValue)( _In_ PCWSTR name, D2D1_SVG_ATTRIBUTE_STRING_TYPE type, - _In_ PCWSTR value + _In_ PCWSTR value ) PURE; - + /// /// Gets an attribute of this element as a string. Returns an error if the attribute /// is not specified. Returns an error if the attribute name is not valid on this @@ -1163,9 +1163,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE _In_ PCWSTR name, D2D1_SVG_ATTRIBUTE_STRING_TYPE type, _Out_writes_(valueCount) PWSTR value, - UINT32 valueCount + UINT32 valueCount ) PURE; - + /// /// Gets the string length of an attribute of this element. The returned string /// length does not include room for the null terminator. Returns an error if the @@ -1176,9 +1176,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE STDMETHOD(GetAttributeValueLength)( _In_ PCWSTR name, D2D1_SVG_ATTRIBUTE_STRING_TYPE type, - _Out_ UINT32 *valueLength + _Out_ UINT32 *valueLength ) PURE; - + /// /// Sets an attribute of this element using a POD type. Returns an error if the /// attribute name is not valid on this element. Returns an error if the attribute @@ -1188,9 +1188,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE _In_ PCWSTR name, D2D1_SVG_ATTRIBUTE_POD_TYPE type, _In_reads_bytes_(valueSizeInBytes) CONST void *value, - UINT32 valueSizeInBytes + UINT32 valueSizeInBytes ) PURE; - + /// /// Gets an attribute of this element as a POD type. Returns an error if the /// attribute is not specified. Returns an error if the attribute name is not valid @@ -1201,9 +1201,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE _In_ PCWSTR name, D2D1_SVG_ATTRIBUTE_POD_TYPE type, _Out_writes_bytes_(valueSizeInBytes) void *value, - UINT32 valueSizeInBytes + UINT32 valueSizeInBytes ) PURE; - + /// /// Sets an attribute of this element using an interface. Returns an error if the /// attribute name is not valid on this element. Returns an error if the attribute @@ -1213,9 +1213,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE /// STDMETHOD(SetAttributeValue)( _In_ PCWSTR name, - _In_ ID2D1SvgAttribute *value + _In_ ID2D1SvgAttribute *value ) PURE; - + /// /// Gets an attribute of this element as an interface type. Returns an error if the /// attribute is not specified. Returns an error if the attribute name is not valid @@ -1226,9 +1226,9 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE STDMETHOD(GetAttributeValue)( _In_ PCWSTR name, _In_ REFIID riid, - _COM_Outptr_result_maybenull_ void **value + _COM_Outptr_result_maybenull_ void **value ) PURE; - + /// /// Sets an attribute of this element using a float. /// @@ -1236,12 +1236,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - FLOAT value - ) + FLOAT value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_FLOAT, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a float. /// @@ -1249,12 +1249,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ FLOAT *value - ) + _Out_ FLOAT *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_FLOAT, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a color. /// @@ -1262,12 +1262,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - CONST D2D1_COLOR_F &value - ) + CONST D2D1_COLOR_F &value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_COLOR, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a color. /// @@ -1275,12 +1275,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_COLOR_F *value - ) + _Out_ D2D1_COLOR_F *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_COLOR, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a fill mode. This method can be used to set /// the value of the 'fill-rule' or 'clip-rule' properties. @@ -1289,12 +1289,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_FILL_MODE value - ) + D2D1_FILL_MODE value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_FILL_MODE, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a fill mode. This method can be used to get /// the value of the 'fill-rule' or 'clip-rule' properties. @@ -1303,12 +1303,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_FILL_MODE *value - ) + _Out_ D2D1_FILL_MODE *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_FILL_MODE, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a display value. This method can be used to /// set the value of the 'display' property. @@ -1317,12 +1317,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_DISPLAY value - ) + D2D1_SVG_DISPLAY value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_DISPLAY, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a display value. This method can be used to /// get the value of the 'display' property. @@ -1331,12 +1331,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_DISPLAY *value - ) + _Out_ D2D1_SVG_DISPLAY *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_DISPLAY, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as an overflow value. This method can be used /// to set the value of the 'overflow' property. @@ -1345,12 +1345,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_OVERFLOW value - ) + D2D1_SVG_OVERFLOW value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_OVERFLOW, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as an overflow value. This method can be used /// to get the value of the 'overflow' property. @@ -1359,12 +1359,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_OVERFLOW *value - ) + _Out_ D2D1_SVG_OVERFLOW *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_OVERFLOW, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a line join value. This method can be used /// to set the value of the 'stroke-linejoin' property. @@ -1373,12 +1373,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_LINE_JOIN value - ) + D2D1_SVG_LINE_JOIN value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_JOIN, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a line join value. This method can be used /// to get the value of the 'stroke-linejoin' property. @@ -1387,12 +1387,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_LINE_JOIN *value - ) + _Out_ D2D1_SVG_LINE_JOIN *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_JOIN, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a line cap value. This method can be used /// to set the value of the 'stroke-linecap' property. @@ -1401,12 +1401,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_LINE_CAP value - ) + D2D1_SVG_LINE_CAP value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_CAP, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a line cap value. This method can be used /// to get the value of the 'stroke-linecap' property. @@ -1415,12 +1415,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_LINE_CAP *value - ) + _Out_ D2D1_SVG_LINE_CAP *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LINE_CAP, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a visibility value. This method can be used /// to set the value of the 'visibility' property. @@ -1429,12 +1429,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_VISIBILITY value - ) + D2D1_SVG_VISIBILITY value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_VISIBILITY, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a visibility value. This method can be used /// to get the value of the 'visibility' property. @@ -1443,12 +1443,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_VISIBILITY *value - ) + _Out_ D2D1_SVG_VISIBILITY *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_VISIBILITY, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a matrix value. This method can be used to /// set the value of a 'transform' or 'gradientTransform' attribute. @@ -1457,12 +1457,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - CONST D2D1_MATRIX_3X2_F &value - ) + CONST D2D1_MATRIX_3X2_F &value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_MATRIX, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a matrix value. This method can be used to /// get the value of a 'transform' or 'gradientTransform' attribute. @@ -1471,12 +1471,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_MATRIX_3X2_F *value - ) + _Out_ D2D1_MATRIX_3X2_F *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_MATRIX, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a unit type value. This method can be used /// to set the value of a 'gradientUnits' or 'clipPathUnits' attribute. @@ -1485,12 +1485,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_SVG_UNIT_TYPE value - ) + D2D1_SVG_UNIT_TYPE value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_UNIT_TYPE, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a unit type value. This method can be used /// to get the value of a 'gradientUnits' or 'clipPathUnits' attribute. @@ -1499,12 +1499,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_UNIT_TYPE *value - ) + _Out_ D2D1_SVG_UNIT_TYPE *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_UNIT_TYPE, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as an extend mode value. This method can be /// used to set the value of a 'spreadMethod' attribute. @@ -1513,12 +1513,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - D2D1_EXTEND_MODE value - ) + D2D1_EXTEND_MODE value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_EXTEND_MODE, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a extend mode value. This method can be /// used to get the value of a 'spreadMethod' attribute. @@ -1527,12 +1527,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_EXTEND_MODE *value - ) + _Out_ D2D1_EXTEND_MODE *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_EXTEND_MODE, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a preserve aspect ratio value. This method /// can be used to set the value of a 'preserveAspectRatio' attribute. @@ -1541,12 +1541,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - CONST D2D1_SVG_PRESERVE_ASPECT_RATIO &value - ) + CONST D2D1_SVG_PRESERVE_ASPECT_RATIO &value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_PRESERVE_ASPECT_RATIO, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as a preserve aspect ratio value. This method /// can be used to get the value of a 'preserveAspectRatio' attribute. @@ -1555,12 +1555,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_PRESERVE_ASPECT_RATIO *value - ) + _Out_ D2D1_SVG_PRESERVE_ASPECT_RATIO *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_PRESERVE_ASPECT_RATIO, value, sizeof(*value)); } - + /// /// Sets an attribute of this element as a length value. /// @@ -1568,12 +1568,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT SetAttributeValue( _In_ PCWSTR name, - CONST D2D1_SVG_LENGTH &value - ) + CONST D2D1_SVG_LENGTH &value + ) { return SetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LENGTH, &value, sizeof(value)); } - + /// /// Gets an attribute of this element as length value. /// @@ -1581,12 +1581,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _Out_ D2D1_SVG_LENGTH *value - ) + _Out_ D2D1_SVG_LENGTH *value + ) { return GetAttributeValue(name, D2D1_SVG_ATTRIBUTE_POD_TYPE_LENGTH, value, sizeof(*value)); } - + /// /// Gets an attribute of this element. /// @@ -1594,12 +1594,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _COM_Outptr_result_maybenull_ ID2D1SvgAttribute **value - ) + _COM_Outptr_result_maybenull_ ID2D1SvgAttribute **value + ) { return GetAttributeValue(name, IID_ID2D1SvgAttribute, reinterpret_cast(value)); } - + /// /// Gets an attribute of this element as a paint. This method can be used to get the /// value of the 'fill' or 'stroke' properties. @@ -1608,12 +1608,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _COM_Outptr_result_maybenull_ ID2D1SvgPaint **value - ) + _COM_Outptr_result_maybenull_ ID2D1SvgPaint **value + ) { return GetAttributeValue(name, IID_ID2D1SvgPaint, reinterpret_cast(value)); } - + /// /// Gets an attribute of this element as a stroke dash array. This method can be /// used to get the value of the 'stroke-dasharray' property. @@ -1622,12 +1622,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _COM_Outptr_result_maybenull_ ID2D1SvgStrokeDashArray **value - ) + _COM_Outptr_result_maybenull_ ID2D1SvgStrokeDashArray **value + ) { return GetAttributeValue(name, IID_ID2D1SvgStrokeDashArray, reinterpret_cast(value)); } - + /// /// Gets an attribute of this element as points. This method can be used to get the /// value of the 'points' attribute on a 'polygon' or 'polyline' element. @@ -1636,12 +1636,12 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _COM_Outptr_result_maybenull_ ID2D1SvgPointCollection **value - ) + _COM_Outptr_result_maybenull_ ID2D1SvgPointCollection **value + ) { return GetAttributeValue(name, IID_ID2D1SvgPointCollection, reinterpret_cast(value)); } - + /// /// Gets an attribute of this element as path data. This method can be used to get /// the value of the 'd' attribute on a 'path' element. @@ -1650,8 +1650,8 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE HRESULT GetAttributeValue( _In_ PCWSTR name, - _COM_Outptr_result_maybenull_ ID2D1SvgPathData **value - ) + _COM_Outptr_result_maybenull_ ID2D1SvgPathData **value + ) { return GetAttributeValue(name, IID_ID2D1SvgPathData, reinterpret_cast(value)); } @@ -1659,44 +1659,44 @@ interface DX_DECLARE_INTERFACE("ac7b67a6-183e-49c1-a823-0ebe40b0db29") ID2D1SvgE interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgDocument : public ID2D1Resource { - + /// /// Sets the size of the initial viewport. /// STDMETHOD(SetViewportSize)( - D2D1_SIZE_F viewportSize + D2D1_SIZE_F viewportSize ) PURE; - + /// /// Returns the size of the initial viewport. /// STDMETHOD_(D2D1_SIZE_F, GetViewportSize)( ) CONST PURE; - + /// /// Sets the root element of the document. The root element must be an 'svg' /// element. If the element already exists within an svg tree, it is first removed. /// STDMETHOD(SetRoot)( - _In_opt_ ID2D1SvgElement *root + _In_opt_ ID2D1SvgElement *root ) PURE; - + /// /// Gets the root element of the document. /// STDMETHOD_(void, GetRoot)( - _Outptr_result_maybenull_ ID2D1SvgElement **root + _Outptr_result_maybenull_ ID2D1SvgElement **root ) PURE; - + /// /// Gets the SVG element with the specified ID. If the element cannot be found, the /// returned element will be null. /// STDMETHOD(FindElementById)( _In_ PCWSTR id, - _COM_Outptr_result_maybenull_ ID2D1SvgElement **svgElement + _COM_Outptr_result_maybenull_ ID2D1SvgElement **svgElement ) PURE; - + /// /// Serializes an element and its subtree to XML. The output XML is encoded as /// UTF-8. @@ -1707,9 +1707,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD /// serialized. STDMETHOD(Serialize)( _In_ IStream *outputXmlStream, - _In_opt_ ID2D1SvgElement *subtree = NULL + _In_opt_ ID2D1SvgElement *subtree = NULL ) PURE; - + /// /// Deserializes a subtree from the stream. The stream must have only one root /// element, but that root element need not be an 'svg' element. The output element @@ -1720,9 +1720,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD /// The root of the subtree. STDMETHOD(Deserialize)( _In_ IStream *inputXmlStream, - _COM_Outptr_ ID2D1SvgElement **subtree + _COM_Outptr_ ID2D1SvgElement **subtree ) PURE; - + /// /// Creates a paint object which can be used to set the 'fill' or 'stroke' /// properties. @@ -1735,9 +1735,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD D2D1_SVG_PAINT_TYPE paintType, _In_opt_ CONST D2D1_COLOR_F *color, _In_opt_ PCWSTR id, - _COM_Outptr_ ID2D1SvgPaint **paint + _COM_Outptr_ ID2D1SvgPaint **paint ) PURE; - + /// /// Creates a dash array object which can be used to set the 'stroke-dasharray' /// property. @@ -1745,9 +1745,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD STDMETHOD(CreateStrokeDashArray)( _In_reads_opt_(dashesCount) CONST D2D1_SVG_LENGTH *dashes, UINT32 dashesCount, - _COM_Outptr_ ID2D1SvgStrokeDashArray **strokeDashArray + _COM_Outptr_ ID2D1SvgStrokeDashArray **strokeDashArray ) PURE; - + /// /// Creates a points object which can be used to set a 'points' attribute on a /// 'polygon' or 'polyline' element. @@ -1755,9 +1755,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD STDMETHOD(CreatePointCollection)( _In_reads_opt_(pointsCount) CONST D2D1_POINT_2F *points, UINT32 pointsCount, - _COM_Outptr_ ID2D1SvgPointCollection **pointCollection + _COM_Outptr_ ID2D1SvgPointCollection **pointCollection ) PURE; - + /// /// Creates a path data object which can be used to set a 'd' attribute on a 'path' /// element. @@ -1767,9 +1767,9 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD UINT32 segmentDataCount, _In_reads_opt_(commandsCount) CONST D2D1_SVG_PATH_COMMAND *commands, UINT32 commandsCount, - _COM_Outptr_ ID2D1SvgPathData **pathData + _COM_Outptr_ ID2D1SvgPathData **pathData ) PURE; - + /// /// Creates a paint object which can be used to set the 'fill' or 'stroke' /// properties. @@ -1784,8 +1784,8 @@ interface DX_DECLARE_INTERFACE("86b88e4d-afa4-4d7b-88e4-68a51c4a0aec") ID2D1SvgD D2D1_SVG_PAINT_TYPE paintType, CONST D2D1_COLOR_F &color, _In_opt_ PCWSTR id, - _COM_Outptr_ ID2D1SvgPaint **paint - ) + _COM_Outptr_ ID2D1SvgPaint **paint + ) { return CreatePaint(paintType, &color, id, paint); } diff --git a/gfx/include/dxsdk/d2derr.h b/gfx/include/dxsdk/d2derr.h index de94ec53f8..02fcd4425f 100644 --- a/gfx/include/dxsdk/d2derr.h +++ b/gfx/include/dxsdk/d2derr.h @@ -200,19 +200,19 @@ // // A text client drawing effect object is of the wrong type -// +// #define D2DERR_TEXT_EFFECT_IS_WRONG_TYPE MAKE_D2DHR_ERR(0x01B) // -// The application is holding a reference to the IDWriteTextRenderer interface -// after the corresponding DrawText or DrawTextLayout call has returned. The +// The application is holding a reference to the IDWriteTextRenderer interface +// after the corresponding DrawText or DrawTextLayout call has returned. The // IDWriteTextRenderer instance will be zombied. -// +// #define D2DERR_TEXT_RENDERER_NOT_RELEASED MAKE_D2DHR_ERR(0x01C) // // The requested size is larger than the guaranteed supported texture size. -// +// #define D2DERR_EXCEEDS_MAX_BITMAP_SIZE MAKE_D2DHR_ERR(0x01D) #else /*D2DERR_WRONG_STATE*/ diff --git a/gfx/include/dxsdk/d3d10.h b/gfx/include/dxsdk/d3d10.h index 145b1ff336..bcfd281a76 100644 --- a/gfx/include/dxsdk/d3d10.h +++ b/gfx/include/dxsdk/d3d10.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D10DeviceChild_FWD_DEFINED__ #define __ID3D10DeviceChild_FWD_DEFINED__ @@ -192,10 +192,10 @@ typedef interface ID3D10Multithread ID3D10Multithread; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d10_0000_0000 */ -/* [local] */ +/* [local] */ #ifndef _D3D10_CONSTANTS #define _D3D10_CONSTANTS @@ -603,7 +603,7 @@ extern "C"{ #define MAKE_D3D10_HRESULT( code ) MAKE_HRESULT( 1, _FACD3D10, code ) #define MAKE_D3D10_STATUS( code ) MAKE_HRESULT( 0, _FACD3D10, code ) /* Direct3D errors are now found in winerror.h */ -typedef +typedef enum D3D10_INPUT_CLASSIFICATION { D3D10_INPUT_PER_VERTEX_DATA = 0, @@ -623,7 +623,7 @@ typedef struct D3D10_INPUT_ELEMENT_DESC UINT InstanceDataStepRate; } D3D10_INPUT_ELEMENT_DESC; -typedef +typedef enum D3D10_FILL_MODE { D3D10_FILL_WIREFRAME = 2, @@ -634,7 +634,7 @@ typedef D3D_PRIMITIVE_TOPOLOGY D3D10_PRIMITIVE_TOPOLOGY; typedef D3D_PRIMITIVE D3D10_PRIMITIVE; -typedef +typedef enum D3D10_CULL_MODE { D3D10_CULL_NONE = 1, @@ -661,7 +661,7 @@ typedef struct D3D10_VIEWPORT FLOAT MaxDepth; } D3D10_VIEWPORT; -typedef +typedef enum D3D10_RESOURCE_DIMENSION { D3D10_RESOURCE_DIMENSION_UNKNOWN = 0, @@ -673,7 +673,7 @@ enum D3D10_RESOURCE_DIMENSION typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION; -typedef +typedef enum D3D10_DSV_DIMENSION { D3D10_DSV_DIMENSION_UNKNOWN = 0, @@ -685,7 +685,7 @@ enum D3D10_DSV_DIMENSION D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY = 6 } D3D10_DSV_DIMENSION; -typedef +typedef enum D3D10_RTV_DIMENSION { D3D10_RTV_DIMENSION_UNKNOWN = 0, @@ -699,7 +699,7 @@ enum D3D10_RTV_DIMENSION D3D10_RTV_DIMENSION_TEXTURE3D = 8 } D3D10_RTV_DIMENSION; -typedef +typedef enum D3D10_USAGE { D3D10_USAGE_DEFAULT = 0, @@ -708,7 +708,7 @@ enum D3D10_USAGE D3D10_USAGE_STAGING = 3 } D3D10_USAGE; -typedef +typedef enum D3D10_BIND_FLAG { D3D10_BIND_VERTEX_BUFFER = 0x1L, @@ -720,14 +720,14 @@ enum D3D10_BIND_FLAG D3D10_BIND_DEPTH_STENCIL = 0x40L } D3D10_BIND_FLAG; -typedef +typedef enum D3D10_CPU_ACCESS_FLAG { D3D10_CPU_ACCESS_WRITE = 0x10000L, D3D10_CPU_ACCESS_READ = 0x20000L } D3D10_CPU_ACCESS_FLAG; -typedef +typedef enum D3D10_RESOURCE_MISC_FLAG { D3D10_RESOURCE_MISC_GENERATE_MIPS = 0x1L, @@ -737,7 +737,7 @@ enum D3D10_RESOURCE_MISC_FLAG D3D10_RESOURCE_MISC_GDI_COMPATIBLE = 0x20L } D3D10_RESOURCE_MISC_FLAG; -typedef +typedef enum D3D10_MAP { D3D10_MAP_READ = 1, @@ -747,19 +747,19 @@ enum D3D10_MAP D3D10_MAP_WRITE_NO_OVERWRITE = 5 } D3D10_MAP; -typedef +typedef enum D3D10_MAP_FLAG { D3D10_MAP_FLAG_DO_NOT_WAIT = 0x100000L } D3D10_MAP_FLAG; -typedef +typedef enum D3D10_RAISE_FLAG { D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1L } D3D10_RAISE_FLAG; -typedef +typedef enum D3D10_CLEAR_FLAG { D3D10_CLEAR_DEPTH = 0x1L, @@ -785,93 +785,92 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0000_v0_0_s_ifspec; #define __ID3D10DeviceChild_INTERFACE_DEFINED__ /* interface ID3D10DeviceChild */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10DeviceChild; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C00-342C-4106-A19F-4F2704F689F0") ID3D10DeviceChild : public IUnknown { public: - virtual void STDMETHODCALLTYPE GetDevice( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDevice( + /* [annotation] */ _Out_ ID3D10Device **ppDevice) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10DeviceChildVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10DeviceChild * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10DeviceChild * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10DeviceChild * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D10DeviceChildVtbl; @@ -880,30 +879,28 @@ EXTERN_C const IID IID_ID3D10DeviceChild; CONST_VTBL struct ID3D10DeviceChildVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10DeviceChild_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10DeviceChild_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10DeviceChild_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10DeviceChild_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10DeviceChild_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10DeviceChild_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10DeviceChild_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -912,9 +909,9 @@ EXTERN_C const IID IID_ID3D10DeviceChild; #endif /* __ID3D10DeviceChild_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0001 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_COMPARISON_FUNC { D3D10_COMPARISON_NEVER = 1, @@ -927,14 +924,14 @@ enum D3D10_COMPARISON_FUNC D3D10_COMPARISON_ALWAYS = 8 } D3D10_COMPARISON_FUNC; -typedef +typedef enum D3D10_DEPTH_WRITE_MASK { D3D10_DEPTH_WRITE_MASK_ZERO = 0, D3D10_DEPTH_WRITE_MASK_ALL = 1 } D3D10_DEPTH_WRITE_MASK; -typedef +typedef enum D3D10_STENCIL_OP { D3D10_STENCIL_OP_KEEP = 1, @@ -974,76 +971,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0001_v0_0_s_ifspec; #define __ID3D10DepthStencilState_INTERFACE_DEFINED__ /* interface ID3D10DepthStencilState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10DepthStencilState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("2B4B1CC8-A4AD-41f8-8322-CA86FC3EC675") ID3D10DepthStencilState : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_DEPTH_STENCIL_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10DepthStencilStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10DepthStencilState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10DepthStencilState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10DepthStencilState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_DEPTH_STENCIL_DESC *pDesc); - + END_INTERFACE } ID3D10DepthStencilStateVtbl; @@ -1052,33 +1048,31 @@ EXTERN_C const IID IID_ID3D10DepthStencilState; CONST_VTBL struct ID3D10DepthStencilStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10DepthStencilState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10DepthStencilState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10DepthStencilState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10DepthStencilState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10DepthStencilState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10DepthStencilState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10DepthStencilState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10DepthStencilState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1087,9 +1081,9 @@ EXTERN_C const IID IID_ID3D10DepthStencilState; #endif /* __ID3D10DepthStencilState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_BLEND { D3D10_BLEND_ZERO = 1, @@ -1111,7 +1105,7 @@ enum D3D10_BLEND D3D10_BLEND_INV_SRC1_ALPHA = 19 } D3D10_BLEND; -typedef +typedef enum D3D10_BLEND_OP { D3D10_BLEND_OP_ADD = 1, @@ -1121,14 +1115,14 @@ enum D3D10_BLEND_OP D3D10_BLEND_OP_MAX = 5 } D3D10_BLEND_OP; -typedef +typedef enum D3D10_COLOR_WRITE_ENABLE { D3D10_COLOR_WRITE_ENABLE_RED = 1, D3D10_COLOR_WRITE_ENABLE_GREEN = 2, D3D10_COLOR_WRITE_ENABLE_BLUE = 4, D3D10_COLOR_WRITE_ENABLE_ALPHA = 8, - D3D10_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D10_COLOR_WRITE_ENABLE_RED | D3D10_COLOR_WRITE_ENABLE_GREEN ) | D3D10_COLOR_WRITE_ENABLE_BLUE ) | D3D10_COLOR_WRITE_ENABLE_ALPHA ) + D3D10_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D10_COLOR_WRITE_ENABLE_RED | D3D10_COLOR_WRITE_ENABLE_GREEN ) | D3D10_COLOR_WRITE_ENABLE_BLUE ) | D3D10_COLOR_WRITE_ENABLE_ALPHA ) } D3D10_COLOR_WRITE_ENABLE; typedef struct D3D10_BLEND_DESC @@ -1151,76 +1145,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0002_v0_0_s_ifspec; #define __ID3D10BlendState_INTERFACE_DEFINED__ /* interface ID3D10BlendState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10BlendState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("EDAD8D19-8A35-4d6d-8566-2EA276CDE161") ID3D10BlendState : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_BLEND_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10BlendStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10BlendState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10BlendState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10BlendState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10BlendState * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10BlendState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_BLEND_DESC *pDesc); - + END_INTERFACE } ID3D10BlendStateVtbl; @@ -1229,33 +1222,31 @@ EXTERN_C const IID IID_ID3D10BlendState; CONST_VTBL struct ID3D10BlendStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10BlendState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10BlendState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10BlendState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10BlendState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10BlendState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10BlendState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10BlendState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10BlendState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1264,7 +1255,7 @@ EXTERN_C const IID IID_ID3D10BlendState; #endif /* __ID3D10BlendState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0003 */ -/* [local] */ +/* [local] */ typedef struct D3D10_RASTERIZER_DESC { @@ -1287,76 +1278,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0003_v0_0_s_ifspec; #define __ID3D10RasterizerState_INTERFACE_DEFINED__ /* interface ID3D10RasterizerState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10RasterizerState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("A2A07292-89AF-4345-BE2E-C53D9FBB6E9F") ID3D10RasterizerState : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_RASTERIZER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10RasterizerStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10RasterizerState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10RasterizerState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10RasterizerState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RASTERIZER_DESC *pDesc); - + END_INTERFACE } ID3D10RasterizerStateVtbl; @@ -1365,33 +1355,31 @@ EXTERN_C const IID IID_ID3D10RasterizerState; CONST_VTBL struct ID3D10RasterizerStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10RasterizerState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10RasterizerState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10RasterizerState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10RasterizerState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10RasterizerState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10RasterizerState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10RasterizerState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10RasterizerState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1400,7 +1388,7 @@ EXTERN_C const IID IID_ID3D10RasterizerState; #endif /* __ID3D10RasterizerState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0004 */ -/* [local] */ +/* [local] */ #if !defined( D3D10_NO_HELPERS ) && defined( __cplusplus ) inline UINT D3D10CalcSubresource( UINT MipSlice, UINT ArraySlice, UINT MipLevels ) @@ -1420,90 +1408,89 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0004_v0_0_s_ifspec; #define __ID3D10Resource_INTERFACE_DEFINED__ /* interface ID3D10Resource */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Resource; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C01-342C-4106-A19F-4F2704F689F0") ID3D10Resource : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetType( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetType( + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType) = 0; - - virtual void STDMETHODCALLTYPE SetEvictionPriority( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetEvictionPriority( + /* [annotation] */ _In_ UINT EvictionPriority) = 0; - + virtual UINT STDMETHODCALLTYPE GetEvictionPriority( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10ResourceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Resource * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Resource * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Resource * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D10Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D10Resource * This); - + END_INTERFACE } ID3D10ResourceVtbl; @@ -1512,39 +1499,37 @@ EXTERN_C const IID IID_ID3D10Resource; CONST_VTBL struct ID3D10ResourceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Resource_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Resource_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Resource_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Resource_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Resource_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Resource_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Resource_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Resource_GetType(This,rType) \ - ( (This)->lpVtbl -> GetType(This,rType) ) + ( (This)->lpVtbl -> GetType(This,rType) ) #define ID3D10Resource_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D10Resource_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #endif /* COBJMACROS */ @@ -1553,7 +1538,7 @@ EXTERN_C const IID IID_ID3D10Resource; #endif /* __ID3D10Resource_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0005 */ -/* [local] */ +/* [local] */ typedef struct D3D10_BUFFER_DESC { @@ -1597,111 +1582,110 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0005_v0_0_s_ifspec; #define __ID3D10Buffer_INTERFACE_DEFINED__ /* interface ID3D10Buffer */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Buffer; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C02-342C-4106-A19F-4F2704F689F0") ID3D10Buffer : public ID3D10Resource { public: - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ void **ppData) = 0; - + virtual void STDMETHODCALLTYPE Unmap( void) = 0; - - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_BUFFER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10BufferVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Buffer * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Buffer * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Buffer * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D10Buffer * This); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ void **ppData); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D10Buffer * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Buffer * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_BUFFER_DESC *pDesc); - + END_INTERFACE } ID3D10BufferVtbl; @@ -1710,48 +1694,46 @@ EXTERN_C const IID IID_ID3D10Buffer; CONST_VTBL struct ID3D10BufferVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Buffer_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Buffer_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Buffer_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Buffer_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Buffer_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Buffer_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Buffer_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Buffer_GetType(This,rType) \ - ( (This)->lpVtbl -> GetType(This,rType) ) + ( (This)->lpVtbl -> GetType(This,rType) ) #define ID3D10Buffer_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D10Buffer_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D10Buffer_Map(This,MapType,MapFlags,ppData) \ - ( (This)->lpVtbl -> Map(This,MapType,MapFlags,ppData) ) + ( (This)->lpVtbl -> Map(This,MapType,MapFlags,ppData) ) #define ID3D10Buffer_Unmap(This) \ - ( (This)->lpVtbl -> Unmap(This) ) + ( (This)->lpVtbl -> Unmap(This) ) #define ID3D10Buffer_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1760,7 +1742,7 @@ EXTERN_C const IID IID_ID3D10Buffer; #endif /* __ID3D10Buffer_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0006 */ -/* [local] */ +/* [local] */ typedef struct D3D10_TEXTURE1D_DESC { @@ -1813,119 +1795,118 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0006_v0_0_s_ifspec; #define __ID3D10Texture1D_INTERFACE_DEFINED__ /* interface ID3D10Texture1D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Texture1D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C03-342C-4106-A19F-4F2704F689F0") ID3D10Texture1D : public ID3D10Resource { public: - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ void **ppData) = 0; - - virtual void STDMETHODCALLTYPE Unmap( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Unmap( + /* [annotation] */ _In_ UINT Subresource) = 0; - - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_TEXTURE1D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10Texture1DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Texture1D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Texture1D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Texture1D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D10Texture1D * This); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ void **ppData); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_TEXTURE1D_DESC *pDesc); - + END_INTERFACE } ID3D10Texture1DVtbl; @@ -1934,48 +1915,46 @@ EXTERN_C const IID IID_ID3D10Texture1D; CONST_VTBL struct ID3D10Texture1DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Texture1D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Texture1D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Texture1D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Texture1D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Texture1D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Texture1D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Texture1D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Texture1D_GetType(This,rType) \ - ( (This)->lpVtbl -> GetType(This,rType) ) + ( (This)->lpVtbl -> GetType(This,rType) ) #define ID3D10Texture1D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D10Texture1D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D10Texture1D_Map(This,Subresource,MapType,MapFlags,ppData) \ - ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,ppData) ) + ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,ppData) ) #define ID3D10Texture1D_Unmap(This,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,Subresource) ) #define ID3D10Texture1D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1984,7 +1963,7 @@ EXTERN_C const IID IID_ID3D10Texture1D; #endif /* __ID3D10Texture1D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0007 */ -/* [local] */ +/* [local] */ typedef struct D3D10_TEXTURE2D_DESC { @@ -2050,119 +2029,118 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0007_v0_0_s_ifspec; #define __ID3D10Texture2D_INTERFACE_DEFINED__ /* interface ID3D10Texture2D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Texture2D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C04-342C-4106-A19F-4F2704F689F0") ID3D10Texture2D : public ID3D10Resource { public: - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_MAPPED_TEXTURE2D *pMappedTex2D) = 0; - - virtual void STDMETHODCALLTYPE Unmap( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Unmap( + /* [annotation] */ _In_ UINT Subresource) = 0; - - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_TEXTURE2D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10Texture2DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Texture2D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Texture2D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Texture2D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D10Texture2D * This); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_MAPPED_TEXTURE2D *pMappedTex2D); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_TEXTURE2D_DESC *pDesc); - + END_INTERFACE } ID3D10Texture2DVtbl; @@ -2171,48 +2149,46 @@ EXTERN_C const IID IID_ID3D10Texture2D; CONST_VTBL struct ID3D10Texture2DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Texture2D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Texture2D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Texture2D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Texture2D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Texture2D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Texture2D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Texture2D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Texture2D_GetType(This,rType) \ - ( (This)->lpVtbl -> GetType(This,rType) ) + ( (This)->lpVtbl -> GetType(This,rType) ) #define ID3D10Texture2D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D10Texture2D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D10Texture2D_Map(This,Subresource,MapType,MapFlags,pMappedTex2D) \ - ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,pMappedTex2D) ) + ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,pMappedTex2D) ) #define ID3D10Texture2D_Unmap(This,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,Subresource) ) #define ID3D10Texture2D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2221,7 +2197,7 @@ EXTERN_C const IID IID_ID3D10Texture2D; #endif /* __ID3D10Texture2D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0008 */ -/* [local] */ +/* [local] */ typedef struct D3D10_TEXTURE3D_DESC { @@ -2283,119 +2259,118 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0008_v0_0_s_ifspec; #define __ID3D10Texture3D_INTERFACE_DEFINED__ /* interface ID3D10Texture3D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Texture3D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C05-342C-4106-A19F-4F2704F689F0") ID3D10Texture3D : public ID3D10Resource { public: - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_MAPPED_TEXTURE3D *pMappedTex3D) = 0; - - virtual void STDMETHODCALLTYPE Unmap( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Unmap( + /* [annotation] */ _In_ UINT Subresource) = 0; - - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_TEXTURE3D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10Texture3DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Texture3D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Texture3D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Texture3D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RESOURCE_DIMENSION *rType); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D10Texture3D * This); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_MAPPED_TEXTURE3D *pMappedTex3D); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_TEXTURE3D_DESC *pDesc); - + END_INTERFACE } ID3D10Texture3DVtbl; @@ -2404,48 +2379,46 @@ EXTERN_C const IID IID_ID3D10Texture3D; CONST_VTBL struct ID3D10Texture3DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Texture3D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Texture3D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Texture3D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Texture3D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Texture3D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Texture3D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Texture3D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Texture3D_GetType(This,rType) \ - ( (This)->lpVtbl -> GetType(This,rType) ) + ( (This)->lpVtbl -> GetType(This,rType) ) #define ID3D10Texture3D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D10Texture3D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D10Texture3D_Map(This,Subresource,MapType,MapFlags,pMappedTex3D) \ - ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,pMappedTex3D) ) + ( (This)->lpVtbl -> Map(This,Subresource,MapType,MapFlags,pMappedTex3D) ) #define ID3D10Texture3D_Unmap(This,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,Subresource) ) #define ID3D10Texture3D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2454,9 +2427,9 @@ EXTERN_C const IID IID_ID3D10Texture3D; #endif /* __ID3D10Texture3D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0009 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_TEXTURECUBE_FACE { D3D10_TEXTURECUBE_FACE_POSITIVE_X = 0, @@ -2474,76 +2447,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0009_v0_0_s_ifspec; #define __ID3D10View_INTERFACE_DEFINED__ /* interface ID3D10View */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10View; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("C902B03F-60A7-49BA-9936-2A3AB37A7E33") ID3D10View : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetResource( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetResource( + /* [annotation] */ _Out_ ID3D10Resource **ppResource) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10ViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10View * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10View * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10View * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10View * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D10View * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Resource **ppResource); - + END_INTERFACE } ID3D10ViewVtbl; @@ -2552,33 +2524,31 @@ EXTERN_C const IID IID_ID3D10View; CONST_VTBL struct ID3D10ViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10View_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10View_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10View_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10View_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10View_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10View_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10View_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10View_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #endif /* COBJMACROS */ @@ -2587,16 +2557,16 @@ EXTERN_C const IID IID_ID3D10View; #endif /* __ID3D10View_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0010 */ -/* [local] */ +/* [local] */ typedef struct D3D10_BUFFER_SRV { - union + union { UINT FirstElement; UINT ElementOffset; } ; - union + union { UINT NumElements; UINT ElementWidth; @@ -2658,7 +2628,7 @@ typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC { DXGI_FORMAT Format; D3D10_SRV_DIMENSION ViewDimension; - union + union { D3D10_BUFFER_SRV Buffer; D3D10_TEX1D_SRV Texture1D; @@ -2679,81 +2649,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0010_v0_0_s_ifspec; #define __ID3D10ShaderResourceView_INTERFACE_DEFINED__ /* interface ID3D10ShaderResourceView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10ShaderResourceView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C07-342C-4106-A19F-4F2704F689F0") ID3D10ShaderResourceView : public ID3D10View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10ShaderResourceViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10ShaderResourceView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10ShaderResourceView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10ShaderResourceView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D10ShaderResourceViewVtbl; @@ -2762,36 +2731,34 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView; CONST_VTBL struct ID3D10ShaderResourceViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10ShaderResourceView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10ShaderResourceView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10ShaderResourceView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10ShaderResourceView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10ShaderResourceView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10ShaderResourceView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10ShaderResourceView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10ShaderResourceView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D10ShaderResourceView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2800,16 +2767,16 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView; #endif /* __ID3D10ShaderResourceView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0011 */ -/* [local] */ +/* [local] */ typedef struct D3D10_BUFFER_RTV { - union + union { UINT FirstElement; UINT ElementOffset; } ; - union + union { UINT NumElements; UINT ElementWidth; @@ -2862,7 +2829,7 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC { DXGI_FORMAT Format; D3D10_RTV_DIMENSION ViewDimension; - union + union { D3D10_BUFFER_RTV Buffer; D3D10_TEX1D_RTV Texture1D; @@ -2882,81 +2849,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0011_v0_0_s_ifspec; #define __ID3D10RenderTargetView_INTERFACE_DEFINED__ /* interface ID3D10RenderTargetView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10RenderTargetView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C08-342C-4106-A19F-4F2704F689F0") ID3D10RenderTargetView : public ID3D10View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_RENDER_TARGET_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10RenderTargetViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10RenderTargetView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10RenderTargetView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10RenderTargetView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_RENDER_TARGET_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D10RenderTargetViewVtbl; @@ -2965,36 +2931,34 @@ EXTERN_C const IID IID_ID3D10RenderTargetView; CONST_VTBL struct ID3D10RenderTargetViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10RenderTargetView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10RenderTargetView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10RenderTargetView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10RenderTargetView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10RenderTargetView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10RenderTargetView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10RenderTargetView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10RenderTargetView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D10RenderTargetView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3003,7 +2967,7 @@ EXTERN_C const IID IID_ID3D10RenderTargetView; #endif /* __ID3D10RenderTargetView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0012 */ -/* [local] */ +/* [local] */ typedef struct D3D10_TEX1D_DSV { @@ -3044,7 +3008,7 @@ typedef struct D3D10_DEPTH_STENCIL_VIEW_DESC { DXGI_FORMAT Format; D3D10_DSV_DIMENSION ViewDimension; - union + union { D3D10_TEX1D_DSV Texture1D; D3D10_TEX1D_ARRAY_DSV Texture1DArray; @@ -3062,81 +3026,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0012_v0_0_s_ifspec; #define __ID3D10DepthStencilView_INTERFACE_DEFINED__ /* interface ID3D10DepthStencilView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10DepthStencilView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C09-342C-4106-A19F-4F2704F689F0") ID3D10DepthStencilView : public ID3D10View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10DepthStencilViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10DepthStencilView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10DepthStencilView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10DepthStencilView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D10DepthStencilViewVtbl; @@ -3145,36 +3108,34 @@ EXTERN_C const IID IID_ID3D10DepthStencilView; CONST_VTBL struct ID3D10DepthStencilViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10DepthStencilView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10DepthStencilView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10DepthStencilView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10DepthStencilView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10DepthStencilView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10DepthStencilView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10DepthStencilView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10DepthStencilView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D10DepthStencilView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3186,67 +3147,66 @@ EXTERN_C const IID IID_ID3D10DepthStencilView; #define __ID3D10VertexShader_INTERFACE_DEFINED__ /* interface ID3D10VertexShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10VertexShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0A-342C-4106-A19F-4F2704F689F0") ID3D10VertexShader : public ID3D10DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D10VertexShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10VertexShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10VertexShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10VertexShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10VertexShader * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D10VertexShaderVtbl; @@ -3255,30 +3215,28 @@ EXTERN_C const IID IID_ID3D10VertexShader; CONST_VTBL struct ID3D10VertexShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10VertexShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10VertexShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10VertexShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10VertexShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10VertexShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10VertexShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10VertexShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -3290,67 +3248,66 @@ EXTERN_C const IID IID_ID3D10VertexShader; #define __ID3D10GeometryShader_INTERFACE_DEFINED__ /* interface ID3D10GeometryShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10GeometryShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6316BE88-54CD-4040-AB44-20461BC81F68") ID3D10GeometryShader : public ID3D10DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D10GeometryShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10GeometryShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10GeometryShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10GeometryShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D10GeometryShaderVtbl; @@ -3359,30 +3316,28 @@ EXTERN_C const IID IID_ID3D10GeometryShader; CONST_VTBL struct ID3D10GeometryShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10GeometryShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10GeometryShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10GeometryShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10GeometryShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10GeometryShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10GeometryShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10GeometryShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -3394,67 +3349,66 @@ EXTERN_C const IID IID_ID3D10GeometryShader; #define __ID3D10PixelShader_INTERFACE_DEFINED__ /* interface ID3D10PixelShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10PixelShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("4968B601-9D00-4cde-8346-8E7F675819B6") ID3D10PixelShader : public ID3D10DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D10PixelShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10PixelShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10PixelShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10PixelShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10PixelShader * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D10PixelShaderVtbl; @@ -3463,30 +3417,28 @@ EXTERN_C const IID IID_ID3D10PixelShader; CONST_VTBL struct ID3D10PixelShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10PixelShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10PixelShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10PixelShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10PixelShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10PixelShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10PixelShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10PixelShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -3498,67 +3450,66 @@ EXTERN_C const IID IID_ID3D10PixelShader; #define __ID3D10InputLayout_INTERFACE_DEFINED__ /* interface ID3D10InputLayout */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10InputLayout; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0B-342C-4106-A19F-4F2704F689F0") ID3D10InputLayout : public ID3D10DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D10InputLayoutVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10InputLayout * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10InputLayout * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10InputLayout * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10InputLayout * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D10InputLayoutVtbl; @@ -3567,30 +3518,28 @@ EXTERN_C const IID IID_ID3D10InputLayout; CONST_VTBL struct ID3D10InputLayoutVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10InputLayout_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10InputLayout_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10InputLayout_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10InputLayout_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10InputLayout_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10InputLayout_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10InputLayout_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -3599,9 +3548,9 @@ EXTERN_C const IID IID_ID3D10InputLayout; #endif /* __ID3D10InputLayout_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0017 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_FILTER { D3D10_FILTER_MIN_MAG_MIP_POINT = 0, @@ -3625,7 +3574,7 @@ enum D3D10_FILTER D3D10_FILTER_TEXT_1BIT = 0x80000000 } D3D10_FILTER; -typedef +typedef enum D3D10_FILTER_TYPE { D3D10_FILTER_TYPE_POINT = 0, @@ -3651,33 +3600,33 @@ enum D3D10_FILTER_TYPE ( ( bComparison ) ? D3D10_COMPARISON_FILTERING_BIT : 0 ) | \ ( ( ( min ) & D3D10_FILTER_TYPE_MASK ) << D3D10_MIN_FILTER_SHIFT ) | \ ( ( ( mag ) & D3D10_FILTER_TYPE_MASK ) << D3D10_MAG_FILTER_SHIFT ) | \ - ( ( ( mip ) & D3D10_FILTER_TYPE_MASK ) << D3D10_MIP_FILTER_SHIFT ) ) ) + ( ( ( mip ) & D3D10_FILTER_TYPE_MASK ) << D3D10_MIP_FILTER_SHIFT ) ) ) #define D3D10_ENCODE_ANISOTROPIC_FILTER( bComparison ) \ ( ( D3D10_FILTER ) ( \ D3D10_ANISOTROPIC_FILTERING_BIT | \ D3D10_ENCODE_BASIC_FILTER( D3D10_FILTER_TYPE_LINEAR, \ D3D10_FILTER_TYPE_LINEAR, \ D3D10_FILTER_TYPE_LINEAR, \ - bComparison ) ) ) + bComparison ) ) ) #define D3D10_DECODE_MIN_FILTER( d3d10Filter ) \ ( ( D3D10_FILTER_TYPE ) \ - ( ( ( d3d10Filter ) >> D3D10_MIN_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) + ( ( ( d3d10Filter ) >> D3D10_MIN_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) #define D3D10_DECODE_MAG_FILTER( d3d10Filter ) \ ( ( D3D10_FILTER_TYPE ) \ - ( ( ( d3d10Filter ) >> D3D10_MAG_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) + ( ( ( d3d10Filter ) >> D3D10_MAG_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) #define D3D10_DECODE_MIP_FILTER( d3d10Filter ) \ ( ( D3D10_FILTER_TYPE ) \ - ( ( ( d3d10Filter ) >> D3D10_MIP_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) + ( ( ( d3d10Filter ) >> D3D10_MIP_FILTER_SHIFT ) & D3D10_FILTER_TYPE_MASK ) ) #define D3D10_DECODE_IS_COMPARISON_FILTER( d3d10Filter ) \ - ( ( d3d10Filter ) & D3D10_COMPARISON_FILTERING_BIT ) + ( ( d3d10Filter ) & D3D10_COMPARISON_FILTERING_BIT ) #define D3D10_DECODE_IS_ANISOTROPIC_FILTER( d3d10Filter ) \ ( ( ( d3d10Filter ) & D3D10_ANISOTROPIC_FILTERING_BIT ) && \ ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIN_FILTER( d3d10Filter ) ) && \ ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MAG_FILTER( d3d10Filter ) ) && \ - ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIP_FILTER( d3d10Filter ) ) ) + ( D3D10_FILTER_TYPE_LINEAR == D3D10_DECODE_MIP_FILTER( d3d10Filter ) ) ) #define D3D10_DECODE_IS_TEXT_1BIT_FILTER( d3d10Filter ) \ - ( ( d3d10Filter ) == D3D10_TEXT_1BIT_BIT ) -typedef + ( ( d3d10Filter ) == D3D10_TEXT_1BIT_BIT ) +typedef enum D3D10_TEXTURE_ADDRESS_MODE { D3D10_TEXTURE_ADDRESS_WRAP = 1, @@ -3708,76 +3657,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0017_v0_0_s_ifspec; #define __ID3D10SamplerState_INTERFACE_DEFINED__ /* interface ID3D10SamplerState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10SamplerState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0C-342C-4106-A19F-4F2704F689F0") ID3D10SamplerState : public ID3D10DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_SAMPLER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10SamplerStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10SamplerState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10SamplerState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10SamplerState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10SamplerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10SamplerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_SAMPLER_DESC *pDesc); - + END_INTERFACE } ID3D10SamplerStateVtbl; @@ -3786,33 +3734,31 @@ EXTERN_C const IID IID_ID3D10SamplerState; CONST_VTBL struct ID3D10SamplerStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10SamplerState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10SamplerState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10SamplerState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10SamplerState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10SamplerState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10SamplerState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10SamplerState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10SamplerState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3821,9 +3767,9 @@ EXTERN_C const IID IID_ID3D10SamplerState; #endif /* __ID3D10SamplerState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0018 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_FORMAT_SUPPORT { D3D10_FORMAT_SUPPORT_BUFFER = 0x1, @@ -3860,99 +3806,98 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0018_v0_0_s_ifspec; #define __ID3D10Asynchronous_INTERFACE_DEFINED__ /* interface ID3D10Asynchronous */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Asynchronous; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0D-342C-4106-A19F-4F2704F689F0") ID3D10Asynchronous : public ID3D10DeviceChild { public: virtual void STDMETHODCALLTYPE Begin( void) = 0; - + virtual void STDMETHODCALLTYPE End( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetData( + /* [annotation] */ _Out_writes_bytes_opt_(DataSize) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags) = 0; - + virtual UINT STDMETHODCALLTYPE GetDataSize( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10AsynchronousVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Asynchronous * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Asynchronous * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Asynchronous * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D10Asynchronous * This); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D10Asynchronous * This); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D10Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(DataSize) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D10Asynchronous * This); - + END_INTERFACE } ID3D10AsynchronousVtbl; @@ -3961,42 +3906,40 @@ EXTERN_C const IID IID_ID3D10Asynchronous; CONST_VTBL struct ID3D10AsynchronousVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Asynchronous_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Asynchronous_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Asynchronous_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Asynchronous_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Asynchronous_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Asynchronous_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Asynchronous_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Asynchronous_Begin(This) \ - ( (This)->lpVtbl -> Begin(This) ) + ( (This)->lpVtbl -> Begin(This) ) #define ID3D10Asynchronous_End(This) \ - ( (This)->lpVtbl -> End(This) ) + ( (This)->lpVtbl -> End(This) ) #define ID3D10Asynchronous_GetData(This,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) #define ID3D10Asynchronous_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #endif /* COBJMACROS */ @@ -4005,15 +3948,15 @@ EXTERN_C const IID IID_ID3D10Asynchronous; #endif /* __ID3D10Asynchronous_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0019 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_ASYNC_GETDATA_FLAG { D3D10_ASYNC_GETDATA_DONOTFLUSH = 0x1 } D3D10_ASYNC_GETDATA_FLAG; -typedef +typedef enum D3D10_QUERY { D3D10_QUERY_EVENT = 0, @@ -4023,10 +3966,10 @@ enum D3D10_QUERY D3D10_QUERY_PIPELINE_STATISTICS = ( D3D10_QUERY_TIMESTAMP_DISJOINT + 1 ) , D3D10_QUERY_OCCLUSION_PREDICATE = ( D3D10_QUERY_PIPELINE_STATISTICS + 1 ) , D3D10_QUERY_SO_STATISTICS = ( D3D10_QUERY_OCCLUSION_PREDICATE + 1 ) , - D3D10_QUERY_SO_OVERFLOW_PREDICATE = ( D3D10_QUERY_SO_STATISTICS + 1 ) + D3D10_QUERY_SO_OVERFLOW_PREDICATE = ( D3D10_QUERY_SO_STATISTICS + 1 ) } D3D10_QUERY; -typedef +typedef enum D3D10_QUERY_MISC_FLAG { D3D10_QUERY_MISC_PREDICATEHINT = 0x1 @@ -4045,94 +3988,93 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0019_v0_0_s_ifspec; #define __ID3D10Query_INTERFACE_DEFINED__ /* interface ID3D10Query */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Query; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0E-342C-4106-A19F-4F2704F689F0") ID3D10Query : public ID3D10Asynchronous { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_QUERY_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10QueryVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Query * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Query * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Query * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D10Query * This); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D10Query * This); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(DataSize) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D10Query * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Query * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_QUERY_DESC *pDesc); - + END_INTERFACE } ID3D10QueryVtbl; @@ -4141,45 +4083,43 @@ EXTERN_C const IID IID_ID3D10Query; CONST_VTBL struct ID3D10QueryVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Query_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Query_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Query_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Query_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Query_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Query_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Query_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Query_Begin(This) \ - ( (This)->lpVtbl -> Begin(This) ) + ( (This)->lpVtbl -> Begin(This) ) #define ID3D10Query_End(This) \ - ( (This)->lpVtbl -> End(This) ) + ( (This)->lpVtbl -> End(This) ) #define ID3D10Query_GetData(This,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) #define ID3D10Query_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D10Query_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -4191,90 +4131,89 @@ EXTERN_C const IID IID_ID3D10Query; #define __ID3D10Predicate_INTERFACE_DEFINED__ /* interface ID3D10Predicate */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Predicate; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C10-342C-4106-A19F-4F2704F689F0") ID3D10Predicate : public ID3D10Query { public: }; - - + #else /* C style interface */ typedef struct ID3D10PredicateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Predicate * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Predicate * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Predicate * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D10Predicate * This); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D10Predicate * This); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(DataSize) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D10Predicate * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Predicate * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_QUERY_DESC *pDesc); - + END_INTERFACE } ID3D10PredicateVtbl; @@ -4283,45 +4222,43 @@ EXTERN_C const IID IID_ID3D10Predicate; CONST_VTBL struct ID3D10PredicateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Predicate_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Predicate_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Predicate_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Predicate_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Predicate_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Predicate_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Predicate_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Predicate_Begin(This) \ - ( (This)->lpVtbl -> Begin(This) ) + ( (This)->lpVtbl -> Begin(This) ) #define ID3D10Predicate_End(This) \ - ( (This)->lpVtbl -> End(This) ) + ( (This)->lpVtbl -> End(This) ) #define ID3D10Predicate_GetData(This,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) #define ID3D10Predicate_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D10Predicate_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -4330,7 +4267,7 @@ EXTERN_C const IID IID_ID3D10Predicate; #endif /* __ID3D10Predicate_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0021 */ -/* [local] */ +/* [local] */ typedef struct D3D10_QUERY_DATA_TIMESTAMP_DISJOINT { @@ -4356,7 +4293,7 @@ typedef struct D3D10_QUERY_DATA_SO_STATISTICS UINT64 PrimitivesStorageNeeded; } D3D10_QUERY_DATA_SO_STATISTICS; -typedef +typedef enum D3D10_COUNTER { D3D10_COUNTER_GPU_IDLE = 0, @@ -4380,13 +4317,13 @@ enum D3D10_COUNTER D3D10_COUNTER_DEVICE_DEPENDENT_0 = 0x40000000 } D3D10_COUNTER; -typedef +typedef enum D3D10_COUNTER_TYPE { D3D10_COUNTER_TYPE_FLOAT32 = 0, D3D10_COUNTER_TYPE_UINT16 = ( D3D10_COUNTER_TYPE_FLOAT32 + 1 ) , D3D10_COUNTER_TYPE_UINT32 = ( D3D10_COUNTER_TYPE_UINT16 + 1 ) , - D3D10_COUNTER_TYPE_UINT64 = ( D3D10_COUNTER_TYPE_UINT32 + 1 ) + D3D10_COUNTER_TYPE_UINT64 = ( D3D10_COUNTER_TYPE_UINT32 + 1 ) } D3D10_COUNTER_TYPE; typedef struct D3D10_COUNTER_DESC @@ -4409,94 +4346,93 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0021_v0_0_s_ifspec; #define __ID3D10Counter_INTERFACE_DEFINED__ /* interface ID3D10Counter */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Counter; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C11-342C-4106-A19F-4F2704F689F0") ID3D10Counter : public ID3D10Asynchronous { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D10_COUNTER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10CounterVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Counter * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Counter * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Counter * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D10Counter * This); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D10Counter * This); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(DataSize) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D10Counter * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10Counter * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_DESC *pDesc); - + END_INTERFACE } ID3D10CounterVtbl; @@ -4505,45 +4441,43 @@ EXTERN_C const IID IID_ID3D10Counter; CONST_VTBL struct ID3D10CounterVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Counter_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Counter_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Counter_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Counter_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10Counter_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Counter_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Counter_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Counter_Begin(This) \ - ( (This)->lpVtbl -> Begin(This) ) + ( (This)->lpVtbl -> Begin(This) ) #define ID3D10Counter_End(This) \ - ( (This)->lpVtbl -> End(This) ) + ( (This)->lpVtbl -> End(This) ) #define ID3D10Counter_GetData(This,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pData,DataSize,GetDataFlags) ) #define ID3D10Counter_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D10Counter_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -4555,1486 +4489,1485 @@ EXTERN_C const IID IID_ID3D10Counter; #define __ID3D10Device_INTERFACE_DEFINED__ /* interface ID3D10Device */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Device; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C0F-342C-4106-A19F-4F2704F689F0") ID3D10Device : public IUnknown { public: - virtual void STDMETHODCALLTYPE VSSetConstantBuffers( - /* [annotation] */ + virtual void STDMETHODCALLTYPE VSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE PSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE PSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetShader( + /* [annotation] */ _In_opt_ ID3D10PixelShader *pPixelShader) = 0; - - virtual void STDMETHODCALLTYPE PSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE VSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetShader( + /* [annotation] */ _In_opt_ ID3D10VertexShader *pVertexShader) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexed( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawIndexed( + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation) = 0; - - virtual void STDMETHODCALLTYPE Draw( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Draw( + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation) = 0; - - virtual void STDMETHODCALLTYPE PSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE IASetInputLayout( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetInputLayout( + /* [annotation] */ _In_opt_ ID3D10InputLayout *pInputLayout) = 0; - - virtual void STDMETHODCALLTYPE IASetVertexBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetVertexBuffers( + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets) = 0; - - virtual void STDMETHODCALLTYPE IASetIndexBuffer( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetIndexBuffer( + /* [annotation] */ _In_opt_ ID3D10Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexedInstanced( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawIndexedInstanced( + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE DrawInstanced( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawInstanced( + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE GSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE GSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetShader( + /* [annotation] */ _In_opt_ ID3D10GeometryShader *pShader) = 0; - - virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( + /* [annotation] */ _In_ D3D10_PRIMITIVE_TOPOLOGY Topology) = 0; - - virtual void STDMETHODCALLTYPE VSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE VSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE SetPredication( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetPredication( + /* [annotation] */ _In_opt_ ID3D10Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue) = 0; - - virtual void STDMETHODCALLTYPE GSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE GSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE OMSetRenderTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetRenderTargets( + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10DepthStencilView *pDepthStencilView) = 0; - - virtual void STDMETHODCALLTYPE OMSetBlendState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetBlendState( + /* [annotation] */ _In_opt_ ID3D10BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask) = 0; - - virtual void STDMETHODCALLTYPE OMSetDepthStencilState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetDepthStencilState( + /* [annotation] */ _In_opt_ ID3D10DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef) = 0; - - virtual void STDMETHODCALLTYPE SOSetTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SOSetTargets( + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets) = 0; - + virtual void STDMETHODCALLTYPE DrawAuto( void) = 0; - - virtual void STDMETHODCALLTYPE RSSetState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetState( + /* [annotation] */ _In_opt_ ID3D10RasterizerState *pRasterizerState) = 0; - - virtual void STDMETHODCALLTYPE RSSetViewports( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetViewports( + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D10_VIEWPORT *pViewports) = 0; - - virtual void STDMETHODCALLTYPE RSSetScissorRects( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetScissorRects( + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D10_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE CopySubresourceRegion( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopySubresourceRegion( + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pSrcBox) = 0; - - virtual void STDMETHODCALLTYPE CopyResource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopyResource( + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource) = 0; - - virtual void STDMETHODCALLTYPE UpdateSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE UpdateSubresource( + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch) = 0; - - virtual void STDMETHODCALLTYPE ClearRenderTargetView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearRenderTargetView( + /* [annotation] */ _In_ ID3D10RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]) = 0; - - virtual void STDMETHODCALLTYPE ClearDepthStencilView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearDepthStencilView( + /* [annotation] */ _In_ ID3D10DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil) = 0; - - virtual void STDMETHODCALLTYPE GenerateMips( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GenerateMips( + /* [annotation] */ _In_ ID3D10ShaderResourceView *pShaderResourceView) = 0; - - virtual void STDMETHODCALLTYPE ResolveSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ResolveSubresource( + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format) = 0; - - virtual void STDMETHODCALLTYPE VSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE PSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE PSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetShader( + /* [annotation] */ _Out_ ID3D10PixelShader **ppPixelShader) = 0; - - virtual void STDMETHODCALLTYPE PSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE VSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetShader( + /* [annotation] */ _Out_ ID3D10VertexShader **ppVertexShader) = 0; - - virtual void STDMETHODCALLTYPE PSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE IAGetInputLayout( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetInputLayout( + /* [annotation] */ _Out_ ID3D10InputLayout **ppInputLayout) = 0; - - virtual void STDMETHODCALLTYPE IAGetVertexBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetVertexBuffers( + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets) = 0; - - virtual void STDMETHODCALLTYPE IAGetIndexBuffer( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetIndexBuffer( + /* [annotation] */ _Out_opt_ ID3D10Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset) = 0; - - virtual void STDMETHODCALLTYPE GSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE GSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetShader( + /* [annotation] */ _Out_ ID3D10GeometryShader **ppGeometryShader) = 0; - - virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology( + /* [annotation] */ _Out_ D3D10_PRIMITIVE_TOPOLOGY *pTopology) = 0; - - virtual void STDMETHODCALLTYPE VSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE VSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE GetPredication( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetPredication( + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue) = 0; - - virtual void STDMETHODCALLTYPE GSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE GSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE OMGetRenderTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetRenderTargets( + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView) = 0; - - virtual void STDMETHODCALLTYPE OMGetBlendState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetBlendState( + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask) = 0; - - virtual void STDMETHODCALLTYPE OMGetDepthStencilState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetDepthStencilState( + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef) = 0; - - virtual void STDMETHODCALLTYPE SOGetTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SOGetTargets( + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppSOTargets, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets) = 0; - - virtual void STDMETHODCALLTYPE RSGetState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetState( + /* [annotation] */ _Out_ ID3D10RasterizerState **ppRasterizerState) = 0; - - virtual void STDMETHODCALLTYPE RSGetViewports( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetViewports( + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumViewports) D3D10_VIEWPORT *pViewports) = 0; - - virtual void STDMETHODCALLTYPE RSGetScissorRects( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetScissorRects( + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumRects) D3D10_RECT *pRects) = 0; - + virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetExceptionMode( + + virtual HRESULT STDMETHODCALLTYPE SetExceptionMode( UINT RaiseFlags) = 0; - + virtual UINT STDMETHODCALLTYPE GetExceptionMode( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData) = 0; - + virtual void STDMETHODCALLTYPE ClearState( void) = 0; - + virtual void STDMETHODCALLTYPE Flush( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateBuffer( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateBuffer( + /* [annotation] */ _In_ const D3D10_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Buffer **ppBuffer) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture1D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture1D( + /* [annotation] */ _In_ const D3D10_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture1D **ppTexture1D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture2D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture2D( + /* [annotation] */ _In_ const D3D10_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture2D **ppTexture2D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture3D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture3D( + /* [annotation] */ _In_ const D3D10_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture3D **ppTexture3D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView( + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10ShaderResourceView **ppSRView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView( + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RenderTargetView **ppRTView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView( + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateInputLayout( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateInputLayout( + /* [annotation] */ _In_reads_(NumElements) const D3D10_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10InputLayout **ppInputLayout) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVertexShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVertexShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10VertexShader **ppVertexShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D10_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_SINGLE_BUFFER_COMPONENT_LIMIT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputStreamStride, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreatePixelShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreatePixelShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10PixelShader **ppPixelShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateBlendState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateBlendState( + /* [annotation] */ _In_ const D3D10_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState( + /* [annotation] */ _In_ const D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState( + /* [annotation] */ _In_ const D3D10_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RasterizerState **ppRasterizerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSamplerState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSamplerState( + /* [annotation] */ _In_ const D3D10_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10SamplerState **ppSamplerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateQuery( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateQuery( + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Query **ppQuery) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreatePredicate( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreatePredicate( + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCounter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateCounter( + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Counter **ppCounter) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels) = 0; - - virtual void STDMETHODCALLTYPE CheckCounterInfo( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CheckCounterInfo( + /* [annotation] */ _Out_ D3D10_COUNTER_INFO *pCounterInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckCounter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckCounter( + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength) = 0; - + virtual UINT STDMETHODCALLTYPE GetCreationFlags( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedResource( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE OpenSharedResource( + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ void **ppResource) = 0; - - virtual void STDMETHODCALLTYPE SetTextFilterSize( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetTextFilterSize( + /* [annotation] */ _In_ UINT Width, - /* [annotation] */ + /* [annotation] */ _In_ UINT Height) = 0; - - virtual void STDMETHODCALLTYPE GetTextFilterSize( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetTextFilterSize( + /* [annotation] */ _Out_opt_ UINT *pWidth, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pHeight) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10DeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Device * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Device * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Device * This); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10PixelShader *pPixelShader); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10VertexShader *pVertexShader); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10GeometryShader *pShader); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D10Device * This); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D10_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D10_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10PixelShader **ppPixelShader); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10VertexShader **ppVertexShader); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10GeometryShader **ppGeometryShader); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppSOTargets, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumViewports) D3D10_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumRects) D3D10_RECT *pRects); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D10Device * This); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D10Device * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D10Device * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D10Device * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D10Device * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D10_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D10_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_SINGLE_BUFFER_COMPONENT_LIMIT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputStreamStride, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D10Device * This); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ void **ppResource); - - void ( STDMETHODCALLTYPE *SetTextFilterSize )( + + void ( STDMETHODCALLTYPE *SetTextFilterSize )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Width, - /* [annotation] */ + /* [annotation] */ _In_ UINT Height); - - void ( STDMETHODCALLTYPE *GetTextFilterSize )( + + void ( STDMETHODCALLTYPE *GetTextFilterSize )( ID3D10Device * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pWidth, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pHeight); - + END_INTERFACE } ID3D10DeviceVtbl; @@ -6043,303 +5976,301 @@ EXTERN_C const IID IID_ID3D10Device; CONST_VTBL struct ID3D10DeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Device_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Device_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Device_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Device_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_PSSetShader(This,pPixelShader) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) ) #define ID3D10Device_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_VSSetShader(This,pVertexShader) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) ) #define ID3D10Device_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D10Device_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D10Device_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D10Device_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D10Device_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D10Device_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D10Device_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D10Device_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_GSSetShader(This,pShader) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader) ) #define ID3D10Device_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D10Device_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D10Device_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D10Device_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D10Device_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D10Device_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D10Device_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D10Device_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D10Device_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D10Device_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D10Device_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D10Device_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D10Device_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D10Device_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D10Device_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D10Device_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D10Device_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D10Device_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_PSGetShader(This,ppPixelShader) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) ) #define ID3D10Device_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_VSGetShader(This,ppVertexShader) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) ) #define ID3D10Device_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D10Device_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D10Device_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D10Device_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device_GSGetShader(This,ppGeometryShader) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) ) #define ID3D10Device_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D10Device_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D10Device_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D10Device_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D10Device_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D10Device_SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D10Device_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D10Device_RSGetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) ) #define ID3D10Device_RSGetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) ) #define ID3D10Device_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D10Device_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D10Device_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D10Device_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Device_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Device_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Device_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D10Device_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D10Device_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D10Device_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D10Device_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D10Device_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D10Device_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D10Device_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D10Device_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D10Device_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D10Device_CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) ) #define ID3D10Device_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) ) #define ID3D10Device_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) ) #define ID3D10Device_CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) ) #define ID3D10Device_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D10Device_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D10Device_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D10Device_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D10Device_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D10Device_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D10Device_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D10Device_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D10Device_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D10Device_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D10Device_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D10Device_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D10Device_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D10Device_SetTextFilterSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetTextFilterSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetTextFilterSize(This,Width,Height) ) #define ID3D10Device_GetTextFilterSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetTextFilterSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetTextFilterSize(This,pWidth,pHeight) ) #endif /* COBJMACROS */ @@ -6348,7 +6279,7 @@ EXTERN_C const IID IID_ID3D10Device; #endif /* __ID3D10Device_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0023 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ @@ -6363,61 +6294,60 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_0000_0023_v0_0_s_ifspec; #define __ID3D10Multithread_INTERFACE_DEFINED__ /* interface ID3D10Multithread */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Multithread; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4E00-342C-4106-A19F-4F2704F689F0") ID3D10Multithread : public IUnknown { public: virtual void STDMETHODCALLTYPE Enter( void) = 0; - + virtual void STDMETHODCALLTYPE Leave( void) = 0; - - virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected( + /* [annotation] */ _In_ BOOL bMTProtect) = 0; - + virtual BOOL STDMETHODCALLTYPE GetMultithreadProtected( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10MultithreadVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Multithread * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Multithread * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Multithread * This); - - void ( STDMETHODCALLTYPE *Enter )( + + void ( STDMETHODCALLTYPE *Enter )( ID3D10Multithread * This); - - void ( STDMETHODCALLTYPE *Leave )( + + void ( STDMETHODCALLTYPE *Leave )( ID3D10Multithread * This); - - BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )( + + BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )( ID3D10Multithread * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMTProtect); - - BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )( + + BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )( ID3D10Multithread * This); - + END_INTERFACE } ID3D10MultithreadVtbl; @@ -6426,30 +6356,28 @@ EXTERN_C const IID IID_ID3D10Multithread; CONST_VTBL struct ID3D10MultithreadVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Multithread_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Multithread_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Multithread_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Multithread_Enter(This) \ - ( (This)->lpVtbl -> Enter(This) ) + ( (This)->lpVtbl -> Enter(This) ) #define ID3D10Multithread_Leave(This) \ - ( (This)->lpVtbl -> Leave(This) ) + ( (This)->lpVtbl -> Leave(This) ) #define ID3D10Multithread_SetMultithreadProtected(This,bMTProtect) \ - ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) ) + ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) ) #define ID3D10Multithread_GetMultithreadProtected(This) \ - ( (This)->lpVtbl -> GetMultithreadProtected(This) ) + ( (This)->lpVtbl -> GetMultithreadProtected(This) ) #endif /* COBJMACROS */ @@ -6458,14 +6386,14 @@ EXTERN_C const IID IID_ID3D10Multithread; #endif /* __ID3D10Multithread_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_0000_0024 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ /*#pragma endregion*/ /*#pragma region Desktop Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)*/ -typedef +typedef enum D3D10_CREATE_DEVICE_FLAG { D3D10_CREATE_DEVICE_SINGLETHREADED = 0x1, @@ -6481,12 +6409,12 @@ enum D3D10_CREATE_DEVICE_FLAG #define D3D10_SDK_VERSION ( 29 ) -#if !defined( D3D10_IGNORE_SDK_LAYERS ) -#include "d3d10sdklayers.h" -#endif -#include "d3d10misc.h" -#include "d3d10shader.h" -#include "d3d10effect.h" +#if !defined( D3D10_IGNORE_SDK_LAYERS ) +#include "d3d10sdklayers.h" +#endif +#include "d3d10misc.h" +#include "d3d10shader.h" +#include "d3d10effect.h" /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ DEFINE_GUID(IID_ID3D10DeviceChild,0x9B7E4C00,0x342C,0x4106,0xA1,0x9F,0x4F,0x27,0x04,0xF6,0x89,0xF0); diff --git a/gfx/include/dxsdk/d3d10_1.h b/gfx/include/dxsdk/d3d10_1.h index c4f984ca6e..4154389270 100644 --- a/gfx/include/dxsdk/d3d10_1.h +++ b/gfx/include/dxsdk/d3d10_1.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D10BlendState1_FWD_DEFINED__ #define __ID3D10BlendState1_FWD_DEFINED__ @@ -64,10 +64,10 @@ typedef interface ID3D10Device1 ID3D10Device1; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d10_1_0000_0000 */ -/* [local] */ +/* [local] */ #if defined( __d3d10_h__ ) && !defined( D3D10_ARBITRARY_HEADER_ORDERING ) #error d3d10.h is included before d3d10_1.h, and it will confuse tools that honor SAL annotations. \ @@ -121,7 +121,7 @@ If possibly targeting d3d10.1, include d3d10_1.h instead of d3d10.h, or ensure d /*#pragma region Desktop Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)*/ -typedef +typedef enum D3D10_FEATURE_LEVEL1 { D3D10_FEATURE_LEVEL_10_0 = 0xa000, @@ -157,81 +157,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_1_0000_0000_v0_0_s_ifspec; #define __ID3D10BlendState1_INTERFACE_DEFINED__ /* interface ID3D10BlendState1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10BlendState1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("EDAD8D99-8A35-4d6d-8566-2EA276CDE161") ID3D10BlendState1 : public ID3D10BlendState { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D10_BLEND_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10BlendState1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10BlendState1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10BlendState1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10BlendState1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_BLEND_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D10BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_BLEND_DESC1 *pDesc); - + END_INTERFACE } ID3D10BlendState1Vtbl; @@ -240,36 +239,34 @@ EXTERN_C const IID IID_ID3D10BlendState1; CONST_VTBL struct ID3D10BlendState1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10BlendState1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10BlendState1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10BlendState1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10BlendState1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10BlendState1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10BlendState1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10BlendState1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10BlendState1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D10BlendState1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -278,7 +275,7 @@ EXTERN_C const IID IID_ID3D10BlendState1; #endif /* __ID3D10BlendState1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_1_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct D3D10_TEXCUBE_ARRAY_SRV1 { @@ -294,7 +291,7 @@ typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC1 { DXGI_FORMAT Format; D3D10_SRV_DIMENSION1 ViewDimension; - union + union { D3D10_BUFFER_SRV Buffer; D3D10_TEX1D_SRV Texture1D; @@ -316,86 +313,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_1_0000_0001_v0_0_s_ifspec; #define __ID3D10ShaderResourceView1_INTERFACE_DEFINED__ /* interface ID3D10ShaderResourceView1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10ShaderResourceView1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C87-342C-4106-A19F-4F2704F689F0") ID3D10ShaderResourceView1 : public ID3D10ShaderResourceView { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10ShaderResourceView1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10ShaderResourceView1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10ShaderResourceView1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10ShaderResourceView1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D10ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc); - + END_INTERFACE } ID3D10ShaderResourceView1Vtbl; @@ -404,39 +400,37 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView1; CONST_VTBL struct ID3D10ShaderResourceView1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10ShaderResourceView1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10ShaderResourceView1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10ShaderResourceView1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10ShaderResourceView1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D10ShaderResourceView1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10ShaderResourceView1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10ShaderResourceView1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10ShaderResourceView1_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D10ShaderResourceView1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D10ShaderResourceView1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -445,9 +439,9 @@ EXTERN_C const IID IID_ID3D10ShaderResourceView1; #endif /* __ID3D10ShaderResourceView1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_1_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D10_STANDARD_MULTISAMPLE_QUALITY_LEVELS { D3D10_STANDARD_MULTISAMPLE_PATTERN = 0xffffffff, @@ -461,844 +455,843 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10_1_0000_0002_v0_0_s_ifspec; #define __ID3D10Device1_INTERFACE_DEFINED__ /* interface ID3D10Device1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Device1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4C8F-342C-4106-A19F-4F2704F689F0") ID3D10Device1 : public ID3D10Device { public: - virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView1( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView1( + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10ShaderResourceView1 **ppSRView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateBlendState1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateBlendState1( + /* [annotation] */ _In_ const D3D10_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState1 **ppBlendState) = 0; - + virtual D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE GetFeatureLevel( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10Device1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Device1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Device1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Device1 * This); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10PixelShader *pPixelShader); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10VertexShader *pVertexShader); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10GeometryShader *pShader); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D10SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D10RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D10Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D10Device1 * This); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D10RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D10_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D10_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10PixelShader **ppPixelShader); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10VertexShader **ppVertexShader); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10GeometryShader **ppGeometryShader); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D10SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D10RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D10Buffer **ppSOTargets, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumViewports) D3D10_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D10_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *NumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*NumRects) D3D10_RECT *pRects); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D10Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D10Device1 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D10Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D10Device1 * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D10Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D10_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _Out_ ID3D10Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D10_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D10_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D10_SO_SINGLE_BUFFER_COMPONENT_LIMIT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputStreamStride, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D10_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D10Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ void **ppResource); - - void ( STDMETHODCALLTYPE *SetTextFilterSize )( + + void ( STDMETHODCALLTYPE *SetTextFilterSize )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Width, - /* [annotation] */ + /* [annotation] */ _In_ UINT Height); - - void ( STDMETHODCALLTYPE *GetTextFilterSize )( + + void ( STDMETHODCALLTYPE *GetTextFilterSize )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pWidth, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pHeight); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D10Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D10_SHADER_RESOURCE_VIEW_DESC1 *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10ShaderResourceView1 **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D10Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D10_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3D10BlendState1 **ppBlendState); - - D3D10_FEATURE_LEVEL1 ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D10_FEATURE_LEVEL1 ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D10Device1 * This); - + END_INTERFACE } ID3D10Device1Vtbl; @@ -1307,312 +1300,310 @@ EXTERN_C const IID IID_ID3D10Device1; CONST_VTBL struct ID3D10Device1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Device1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Device1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Device1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Device1_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_PSSetShader(This,pPixelShader) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader) ) #define ID3D10Device1_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_VSSetShader(This,pVertexShader) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader) ) #define ID3D10Device1_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D10Device1_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D10Device1_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D10Device1_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D10Device1_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D10Device1_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D10Device1_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D10Device1_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_GSSetShader(This,pShader) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader) ) #define ID3D10Device1_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D10Device1_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D10Device1_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D10Device1_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D10Device1_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D10Device1_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D10Device1_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D10Device1_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D10Device1_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D10Device1_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D10Device1_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D10Device1_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D10Device1_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D10Device1_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D10Device1_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D10Device1_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D10Device1_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D10Device1_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_PSGetShader(This,ppPixelShader) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader) ) #define ID3D10Device1_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_VSGetShader(This,ppVertexShader) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader) ) #define ID3D10Device1_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D10Device1_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D10Device1_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D10Device1_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D10Device1_GSGetShader(This,ppGeometryShader) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader) ) #define ID3D10Device1_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D10Device1_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D10Device1_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D10Device1_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D10Device1_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D10Device1_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D10Device1_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D10Device1_SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D10Device1_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D10Device1_RSGetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,NumViewports,pViewports) ) #define ID3D10Device1_RSGetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,NumRects,pRects) ) #define ID3D10Device1_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D10Device1_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D10Device1_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D10Device1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D10Device1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D10Device1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D10Device1_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D10Device1_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D10Device1_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D10Device1_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D10Device1_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D10Device1_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D10Device1_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D10Device1_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D10Device1_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D10Device1_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D10Device1_CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,ppVertexShader) ) #define ID3D10Device1_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,ppGeometryShader) ) #define ID3D10Device1_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,OutputStreamStride,ppGeometryShader) ) #define ID3D10Device1_CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,ppPixelShader) ) #define ID3D10Device1_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D10Device1_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D10Device1_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D10Device1_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D10Device1_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D10Device1_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D10Device1_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D10Device1_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D10Device1_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D10Device1_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D10Device1_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D10Device1_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D10Device1_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D10Device1_SetTextFilterSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetTextFilterSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetTextFilterSize(This,Width,Height) ) #define ID3D10Device1_GetTextFilterSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetTextFilterSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetTextFilterSize(This,pWidth,pHeight) ) #define ID3D10Device1_CreateShaderResourceView1(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc,ppSRView) ) #define ID3D10Device1_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D10Device1_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #endif /* COBJMACROS */ @@ -1621,11 +1612,11 @@ EXTERN_C const IID IID_ID3D10Device1; #endif /* __ID3D10Device1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10_1_0000_0003 */ -/* [local] */ +/* [local] */ #define D3D10_1_SDK_VERSION ( ( 0 + 0x20 ) ) -#include "d3d10_1shader.h" +#include "d3d10_1shader.h" /////////////////////////////////////////////////////////////////////////// // D3D10CreateDevice1 @@ -1653,14 +1644,14 @@ EXTERN_C const IID IID_ID3D10Device1; // Pointer to returned interface. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver // D3D10CreateDevice1 // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D10_CREATE_DEVICE1)(IDXGIAdapter *, +typedef HRESULT (WINAPI* PFN_D3D10_CREATE_DEVICE1)(IDXGIAdapter *, D3D10_DRIVER_TYPE, HMODULE, UINT, D3D10_FEATURE_LEVEL1, UINT, ID3D10Device1**); HRESULT WINAPI D3D10CreateDevice1( @@ -1677,7 +1668,7 @@ HRESULT WINAPI D3D10CreateDevice1( // ------------------------------ // // ppAdapter -// If NULL, D3D10CreateDevice1 will choose the primary adapter and +// If NULL, D3D10CreateDevice1 will choose the primary adapter and // create a new instance from a temporarily created IDXGIFactory. // If non-NULL, D3D10CreateDevice1 will register the appropriate // device, if necessary (via IDXGIAdapter::RegisterDrver), before @@ -1704,7 +1695,7 @@ HRESULT WINAPI D3D10CreateDevice1( // Pointer to returned interface. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver @@ -1712,7 +1703,7 @@ HRESULT WINAPI D3D10CreateDevice1( // IDXGIFactory::CreateSwapChain // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN1)(IDXGIAdapter *, +typedef HRESULT (WINAPI* PFN_D3D10_CREATE_DEVICE_AND_SWAP_CHAIN1)(IDXGIAdapter *, D3D10_DRIVER_TYPE, HMODULE, UINT, D3D10_FEATURE_LEVEL1, UINT, DXGI_SWAP_CHAIN_DESC *, IDXGISwapChain **, ID3D10Device1 **); HRESULT WINAPI D3D10CreateDeviceAndSwapChain1( diff --git a/gfx/include/dxsdk/d3d10_1shader.h b/gfx/include/dxsdk/d3d10_1shader.h index b7db6fbc25..ad6f957055 100644 --- a/gfx/include/dxsdk/d3d10_1shader.h +++ b/gfx/include/dxsdk/d3d10_1shader.h @@ -188,7 +188,7 @@ typedef struct _D3D10_SHADER_DEBUG_INST_INFO // up to two outputs per instruction D3D10_SHADER_DEBUG_OUTPUTREG_INFO pOutputs[2]; - + // index into the list of tokens for this instruction's token UINT TokenId; @@ -251,7 +251,7 @@ typedef interface ID3D10ShaderReflection1 ID3D10ShaderReflection1; typedef interface ID3D10ShaderReflection1 *LPD3D10SHADERREFLECTION1; // {C3457783-A846-47CE-9520-CEA6F66E7447} -DEFINE_GUID(IID_ID3D10ShaderReflection1, +DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, 0xce, 0xa6, 0xf6, 0x6e, 0x74, 0x47); #undef INTERFACE @@ -264,12 +264,12 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_SHADER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ UINT ResourceIndex, _Out_ D3D10_SHADER_INPUT_BIND_DESC *pDesc) PURE; - + STDMETHOD(GetInputParameterDesc)(THIS_ UINT ParameterIndex, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; STDMETHOD(GetOutputParameterDesc)(THIS_ UINT ParameterIndex, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) STDMETHOD(GetMovcInstructionCount)(THIS_ _Out_ UINT* pCount) PURE; STDMETHOD(GetConversionInstructionCount)(THIS_ _Out_ UINT* pCount) PURE; STDMETHOD(GetBitwiseInstructionCount)(THIS_ _Out_ UINT* pCount) PURE; - + STDMETHOD(GetGSInputPrimitive)(THIS_ _Out_ D3D10_PRIMITIVE* pPrim) PURE; STDMETHOD(IsLevel9Shader)(THIS_ _Out_ BOOL* pbLevel9Shader) PURE; STDMETHOD(IsSampleFrequencyShader)(THIS_ _Out_ BOOL* pbSampleFrequency) PURE; @@ -298,5 +298,5 @@ extern "C" { #ifdef __cplusplus } #endif //__cplusplus - + #endif //__D3D10_1SHADER_H__ diff --git a/gfx/include/dxsdk/d3d10effect.h b/gfx/include/dxsdk/d3d10effect.h index 8bfc8afb11..539a0b3c68 100644 --- a/gfx/include/dxsdk/d3d10effect.h +++ b/gfx/include/dxsdk/d3d10effect.h @@ -34,7 +34,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES { - + D3D10_DST_SO_BUFFERS=1, // Single-value state (atomical gets/sets) D3D10_DST_OM_RENDER_TARGETS, // Single-value state (atomical gets/sets) D3D10_DST_OM_DEPTH_STENCIL_STATE, // Single-value state @@ -43,7 +43,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES D3D10_DST_VS, // Single-value state D3D10_DST_VS_SAMPLERS, // Count: D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT D3D10_DST_VS_SHADER_RESOURCES, // Count: D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - D3D10_DST_VS_CONSTANT_BUFFERS, // Count: + D3D10_DST_VS_CONSTANT_BUFFERS, // Count: D3D10_DST_GS, // Single-value state D3D10_DST_GS_SAMPLERS, // Count: D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT @@ -54,7 +54,7 @@ typedef enum _D3D10_DEVICE_STATE_TYPES D3D10_DST_PS_SAMPLERS, // Count: D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT D3D10_DST_PS_SHADER_RESOURCES, // Count: D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT D3D10_DST_PS_CONSTANT_BUFFERS, // Count: D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - + D3D10_DST_IA_VERTEX_BUFFERS, // Count: D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT D3D10_DST_IA_INDEX_BUFFER, // Single-value state D3D10_DST_IA_INPUT_LAYOUT, // Single-value state @@ -84,32 +84,32 @@ typedef struct _D3D10_STATE_BLOCK_MASK BYTE VSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; BYTE VSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; BYTE VSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; - + BYTE GS; BYTE GSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; BYTE GSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; BYTE GSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; - + BYTE PS; BYTE PSSamplers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT)]; BYTE PSShaderResources[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT)]; BYTE PSConstantBuffers[D3D10_BYTES_FROM_BITS(D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT)]; - + BYTE IAVertexBuffers[D3D10_BYTES_FROM_BITS(D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT)]; BYTE IAIndexBuffer; BYTE IAInputLayout; BYTE IAPrimitiveTopology; - + BYTE OMRenderTargets; BYTE OMDepthStencilState; BYTE OMBlendState; - + BYTE RSViewports; BYTE RSScissorRects; BYTE RSRasterizerState; - + BYTE SOBuffers; - + BYTE Predication; } D3D10_STATE_BLOCK_MASK; @@ -121,7 +121,7 @@ typedef interface ID3D10StateBlock ID3D10StateBlock; typedef interface ID3D10StateBlock *LPD3D10STATEBLOCK; // {0803425A-57F5-4dd6-9465-A87570834A08} -DEFINE_GUID(IID_ID3D10StateBlock, +DEFINE_GUID(IID_ID3D10StateBlock, 0x803425a, 0x57f5, 0x4dd6, 0x94, 0x65, 0xa8, 0x75, 0x70, 0x83, 0x4a, 0x8); #undef INTERFACE @@ -132,7 +132,7 @@ DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; - + STDMETHOD(Capture)(THIS) PURE; STDMETHOD(Apply)(THIS) PURE; STDMETHOD(ReleaseAllDeviceObjects)(THIS) PURE; @@ -162,8 +162,8 @@ extern "C" { // // UINT RangeStart, RangeLength, Entry // The specific bit or range of bits for a given state type to operate on. -// Consult the comments for D3D10_DEVICE_STATE_TYPES and -// D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for +// Consult the comments for D3D10_DEVICE_STATE_TYPES and +// D3D10_STATE_BLOCK_MASK for information on the valid bit ranges for // each state. // //---------------------------------------------------------------------------- @@ -269,21 +269,21 @@ HRESULT WINAPI D3D10CreateStateBlock(_In_ ID3D10Device *pDevice, _In_ D3D10_STAT typedef struct _D3D10_EFFECT_TYPE_DESC { - LPCSTR TypeName; // Name of the type + LPCSTR TypeName; // Name of the type // (e.g. "float4" or "MyStruct") D3D10_SHADER_VARIABLE_CLASS Class; // (e.g. scalar, vector, object, etc.) D3D10_SHADER_VARIABLE_TYPE Type; // (e.g. float, texture, vertexshader, etc.) - + UINT Elements; // Number of elements in this type - // (0 if not an array) + // (0 if not an array) UINT Members; // Number of members // (0 if not a structure) UINT Rows; // Number of rows in this type // (0 if not a numeric primitive) UINT Columns; // Number of columns in this type // (0 if not a numeric primitive) - + UINT PackedSize; // Number of bytes required to represent // this data type, when tightly packed UINT UnpackedSize; // Number of bytes occupied by this data @@ -296,7 +296,7 @@ typedef interface ID3D10EffectType ID3D10EffectType; typedef interface ID3D10EffectType *LPD3D10EFFECTTYPE; // {4E9E1DDC-CD9D-4772-A837-00180B9B88FD} -DEFINE_GUID(IID_ID3D10EffectType, +DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x0, 0x18, 0xb, 0x9b, 0x88, 0xfd); #undef INTERFACE @@ -325,12 +325,12 @@ DECLARE_INTERFACE(ID3D10EffectType) typedef struct _D3D10_EFFECT_VARIABLE_DESC { - LPCSTR Name; // Name of this variable, annotation, + LPCSTR Name; // Name of this variable, annotation, // or structure member LPCSTR Semantic; // Semantic string of this variable - // or structure member (NULL for + // or structure member (NULL for // annotations or if not present) - + UINT Flags; // D3D10_EFFECT_VARIABLE_* flags UINT Annotations; // Number of annotations on this variable // (always 0 for annotations) @@ -348,7 +348,7 @@ typedef interface ID3D10EffectVariable ID3D10EffectVariable; typedef interface ID3D10EffectVariable *LPD3D10EFFECTVARIABLE; // {AE897105-00E6-45bf-BB8E-281DD6DB8E1B} -DEFINE_GUID(IID_ID3D10EffectVariable, +DEFINE_GUID(IID_ID3D10EffectVariable, 0xae897105, 0xe6, 0x45bf, 0xbb, 0x8e, 0x28, 0x1d, 0xd6, 0xdb, 0x8e, 0x1b); #undef INTERFACE @@ -374,18 +374,18 @@ DECLARE_INTERFACE(ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -399,7 +399,7 @@ DECLARE_INTERFACE(ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; }; @@ -412,7 +412,7 @@ typedef interface ID3D10EffectScalarVariable ID3D10EffectScalarVariable; typedef interface ID3D10EffectScalarVariable *LPD3D10EFFECTSCALARVARIABLE; // {00E48F7B-D2C8-49e8-A86C-022DEE53431F} -DEFINE_GUID(IID_ID3D10EffectScalarVariable, +DEFINE_GUID(IID_ID3D10EffectScalarVariable, 0xe48f7b, 0xd2c8, 0x49e8, 0xa8, 0x6c, 0x2, 0x2d, 0xee, 0x53, 0x43, 0x1f); #undef INTERFACE @@ -423,18 +423,18 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -448,25 +448,25 @@ DECLARE_INTERFACE_(ID3D10EffectScalarVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; - + STDMETHOD(SetFloat)(THIS_ float Value) PURE; - STDMETHOD(GetFloat)(THIS_ _Out_ float *pValue) PURE; - + STDMETHOD(GetFloat)(THIS_ _Out_ float *pValue) PURE; + STDMETHOD(SetFloatArray)(THIS_ _In_reads_(Count) float *pData, UINT Offset, UINT Count) PURE; STDMETHOD(GetFloatArray)(THIS_ _Out_writes_(Count) float *pData, UINT Offset, UINT Count) PURE; - + STDMETHOD(SetInt)(THIS_ int Value) PURE; STDMETHOD(GetInt)(THIS_ _Out_ int *pValue) PURE; - + STDMETHOD(SetIntArray)(THIS_ _In_reads_(Count) int *pData, UINT Offset, UINT Count) PURE; STDMETHOD(GetIntArray)(THIS_ _Out_writes_(Count) int *pData, UINT Offset, UINT Count) PURE; - + STDMETHOD(SetBool)(THIS_ BOOL Value) PURE; STDMETHOD(GetBool)(THIS_ _Out_ BOOL *pValue) PURE; - + STDMETHOD(SetBoolArray)(THIS_ _In_reads_(Count) BOOL *pData, UINT Offset, UINT Count) PURE; STDMETHOD(GetBoolArray)(THIS_ _Out_writes_(Count) BOOL *pData, UINT Offset, UINT Count) PURE; }; @@ -479,7 +479,7 @@ typedef interface ID3D10EffectVectorVariable ID3D10EffectVectorVariable; typedef interface ID3D10EffectVectorVariable *LPD3D10EFFECTVECTORVARIABLE; // {62B98C44-1F82-4c67-BCD0-72CF8F217E81} -DEFINE_GUID(IID_ID3D10EffectVectorVariable, +DEFINE_GUID(IID_ID3D10EffectVectorVariable, 0x62b98c44, 0x1f82, 0x4c67, 0xbc, 0xd0, 0x72, 0xcf, 0x8f, 0x21, 0x7e, 0x81); #undef INTERFACE @@ -490,22 +490,22 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; - STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE; + STDMETHOD_(ID3D10EffectStringVariable*, AsString)(THIS) PURE; STDMETHOD_(ID3D10EffectShaderResourceVariable*, AsShaderResource)(THIS) PURE; STDMETHOD_(ID3D10EffectRenderTargetViewVariable*, AsRenderTargetView)(THIS) PURE; STDMETHOD_(ID3D10EffectDepthStencilViewVariable*, AsDepthStencilView)(THIS) PURE; @@ -515,10 +515,10 @@ DECLARE_INTERFACE_(ID3D10EffectVectorVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; - + STDMETHOD(SetBoolVector) (THIS_ BOOL *pData) PURE; STDMETHOD(SetIntVector) (THIS_ int *pData) PURE; STDMETHOD(SetFloatVector)(THIS_ float *pData) PURE; @@ -544,7 +544,7 @@ typedef interface ID3D10EffectMatrixVariable ID3D10EffectMatrixVariable; typedef interface ID3D10EffectMatrixVariable *LPD3D10EFFECTMATRIXVARIABLE; // {50666C24-B82F-4eed-A172-5B6E7E8522E0} -DEFINE_GUID(IID_ID3D10EffectMatrixVariable, +DEFINE_GUID(IID_ID3D10EffectMatrixVariable, 0x50666c24, 0xb82f, 0x4eed, 0xa1, 0x72, 0x5b, 0x6e, 0x7e, 0x85, 0x22, 0xe0); #undef INTERFACE @@ -555,18 +555,18 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -580,19 +580,19 @@ DECLARE_INTERFACE_(ID3D10EffectMatrixVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT ByteOffset, UINT ByteCount) PURE; - + STDMETHOD(SetMatrix)(THIS_ float *pData) PURE; STDMETHOD(GetMatrix)(THIS_ float *pData) PURE; - + STDMETHOD(SetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE; STDMETHOD(GetMatrixArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE; - + STDMETHOD(SetMatrixTranspose)(THIS_ float *pData) PURE; STDMETHOD(GetMatrixTranspose)(THIS_ float *pData) PURE; - + STDMETHOD(SetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE; STDMETHOD(GetMatrixTransposeArray)(THIS_ float *pData, UINT Offset, UINT Count) PURE; }; @@ -605,7 +605,7 @@ typedef interface ID3D10EffectStringVariable ID3D10EffectStringVariable; typedef interface ID3D10EffectStringVariable *LPD3D10EFFECTSTRINGVARIABLE; // {71417501-8DF9-4e0a-A78A-255F9756BAFF} -DEFINE_GUID(IID_ID3D10EffectStringVariable, +DEFINE_GUID(IID_ID3D10EffectStringVariable, 0x71417501, 0x8df9, 0x4e0a, 0xa7, 0x8a, 0x25, 0x5f, 0x97, 0x56, 0xba, 0xff); #undef INTERFACE @@ -616,18 +616,18 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -641,10 +641,10 @@ DECLARE_INTERFACE_(ID3D10EffectStringVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetString)(THIS_ _Out_ LPCSTR *ppString) PURE; STDMETHOD(GetStringArray)(THIS_ _Out_writes_(Count) LPCSTR *ppStrings, UINT Offset, UINT Count) PURE; }; @@ -657,7 +657,7 @@ typedef interface ID3D10EffectShaderResourceVariable ID3D10EffectShaderResourceV typedef interface ID3D10EffectShaderResourceVariable *LPD3D10EFFECTSHADERRESOURCEVARIABLE; // {C0A7157B-D872-4b1d-8073-EFC2ACD4B1FC} -DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable, +DEFINE_GUID(IID_ID3D10EffectShaderResourceVariable, 0xc0a7157b, 0xd872, 0x4b1d, 0x80, 0x73, 0xef, 0xc2, 0xac, 0xd4, 0xb1, 0xfc); #undef INTERFACE @@ -668,18 +668,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -693,13 +693,13 @@ DECLARE_INTERFACE_(ID3D10EffectShaderResourceVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(SetResource)(THIS_ _In_opt_ ID3D10ShaderResourceView *pResource) PURE; STDMETHOD(GetResource)(THIS_ _Out_ ID3D10ShaderResourceView **ppResource) PURE; - + STDMETHOD(SetResourceArray)(THIS_ _In_reads_(Count) ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE; STDMETHOD(GetResourceArray)(THIS_ _Out_writes_(Count) ID3D10ShaderResourceView **ppResources, UINT Offset, UINT Count) PURE; }; @@ -712,7 +712,7 @@ typedef interface ID3D10EffectRenderTargetViewVariable ID3D10EffectRenderTargetV typedef interface ID3D10EffectRenderTargetViewVariable *LPD3D10EFFECTRENDERTARGETVIEWVARIABLE; // {28CA0CC3-C2C9-40bb-B57F-67B737122B17} -DEFINE_GUID(IID_ID3D10EffectRenderTargetViewVariable, +DEFINE_GUID(IID_ID3D10EffectRenderTargetViewVariable, 0x28ca0cc3, 0xc2c9, 0x40bb, 0xb5, 0x7f, 0x67, 0xb7, 0x37, 0x12, 0x2b, 0x17); #undef INTERFACE @@ -723,18 +723,18 @@ DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -748,13 +748,13 @@ DECLARE_INTERFACE_(ID3D10EffectRenderTargetViewVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(SetRenderTarget)(THIS_ _In_opt_ ID3D10RenderTargetView *pResource) PURE; STDMETHOD(GetRenderTarget)(THIS_ _Out_ ID3D10RenderTargetView **ppResource) PURE; - + STDMETHOD(SetRenderTargetArray)(THIS_ _In_reads_(Count) ID3D10RenderTargetView **ppResources, UINT Offset, UINT Count) PURE; STDMETHOD(GetRenderTargetArray)(THIS_ _Out_writes_(Count) ID3D10RenderTargetView **ppResources, UINT Offset, UINT Count) PURE; }; @@ -767,7 +767,7 @@ typedef interface ID3D10EffectDepthStencilViewVariable ID3D10EffectDepthStencilV typedef interface ID3D10EffectDepthStencilViewVariable *LPD3D10EFFECTDEPTHSTENCILVIEWVARIABLE; // {3E02C918-CC79-4985-B622-2D92AD701623} -DEFINE_GUID(IID_ID3D10EffectDepthStencilViewVariable, +DEFINE_GUID(IID_ID3D10EffectDepthStencilViewVariable, 0x3e02c918, 0xcc79, 0x4985, 0xb6, 0x22, 0x2d, 0x92, 0xad, 0x70, 0x16, 0x23); #undef INTERFACE @@ -778,18 +778,18 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable) STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -803,13 +803,13 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(SetDepthStencil)(THIS_ _In_opt_ ID3D10DepthStencilView *pResource) PURE; STDMETHOD(GetDepthStencil)(THIS_ _Out_ ID3D10DepthStencilView **ppResource) PURE; - + STDMETHOD(SetDepthStencilArray)(THIS_ _In_reads_(Count) ID3D10DepthStencilView **ppResources, UINT Offset, UINT Count) PURE; STDMETHOD(GetDepthStencilArray)(THIS_ _Out_writes_(Count) ID3D10DepthStencilView **ppResources, UINT Offset, UINT Count) PURE; }; @@ -822,7 +822,7 @@ typedef interface ID3D10EffectConstantBuffer ID3D10EffectConstantBuffer; typedef interface ID3D10EffectConstantBuffer *LPD3D10EFFECTCONSTANTBUFFER; // {56648F4D-CC8B-4444-A5AD-B5A3D76E91B3} -DEFINE_GUID(IID_ID3D10EffectConstantBuffer, +DEFINE_GUID(IID_ID3D10EffectConstantBuffer, 0x56648f4d, 0xcc8b, 0x4444, 0xa5, 0xad, 0xb5, 0xa3, 0xd7, 0x6e, 0x91, 0xb3); #undef INTERFACE @@ -832,18 +832,18 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -857,13 +857,13 @@ DECLARE_INTERFACE_(ID3D10EffectConstantBuffer, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(SetConstantBuffer)(THIS_ _In_opt_ ID3D10Buffer *pConstantBuffer) PURE; STDMETHOD(GetConstantBuffer)(THIS_ _Out_ ID3D10Buffer **ppConstantBuffer) PURE; - + STDMETHOD(SetTextureBuffer)(THIS_ _In_opt_ ID3D10ShaderResourceView *pTextureBuffer) PURE; STDMETHOD(GetTextureBuffer)(THIS_ _Out_ ID3D10ShaderResourceView **ppTextureBuffer) PURE; }; @@ -882,17 +882,16 @@ typedef struct _D3D10_EFFECT_SHADER_DESC { CONST BYTE *pInputSignature; // Passed into CreateInputLayout, // valid on VS and GS only - + BOOL IsInline; // Is this an anonymous shader variable // resulting from an inline shader assignment? - - + // -- The following fields are not valid after Optimize() -- CONST BYTE *pBytecode; // Shader bytecode UINT BytecodeLength; - + LPCSTR SODecl; // Stream out declaration string (for GS with SO) - + UINT NumInputSignatureEntries; // Number of entries in the input signature UINT NumOutputSignatureEntries; // Number of entries in the output signature } D3D10_EFFECT_SHADER_DESC; @@ -901,7 +900,7 @@ typedef interface ID3D10EffectShaderVariable ID3D10EffectShaderVariable; typedef interface ID3D10EffectShaderVariable *LPD3D10EFFECTSHADERVARIABLE; // {80849279-C799-4797-8C33-0407A07D9E06} -DEFINE_GUID(IID_ID3D10EffectShaderVariable, +DEFINE_GUID(IID_ID3D10EffectShaderVariable, 0x80849279, 0xc799, 0x4797, 0x8c, 0x33, 0x4, 0x7, 0xa0, 0x7d, 0x9e, 0x6); #undef INTERFACE @@ -911,18 +910,18 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -936,16 +935,16 @@ DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetShaderDesc)(THIS_ UINT ShaderIndex, _Out_ D3D10_EFFECT_SHADER_DESC *pDesc) PURE; - + STDMETHOD(GetVertexShader)(THIS_ UINT ShaderIndex, _Out_ ID3D10VertexShader **ppVS) PURE; STDMETHOD(GetGeometryShader)(THIS_ UINT ShaderIndex, _Out_ ID3D10GeometryShader **ppGS) PURE; STDMETHOD(GetPixelShader)(THIS_ UINT ShaderIndex, _Out_ ID3D10PixelShader **ppPS) PURE; - + STDMETHOD(GetInputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; STDMETHOD(GetOutputSignatureElementDesc)(THIS_ UINT ShaderIndex, UINT Element, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; }; @@ -958,7 +957,7 @@ typedef interface ID3D10EffectBlendVariable ID3D10EffectBlendVariable; typedef interface ID3D10EffectBlendVariable *LPD3D10EFFECTBLENDVARIABLE; // {1FCD2294-DF6D-4eae-86B3-0E9160CFB07B} -DEFINE_GUID(IID_ID3D10EffectBlendVariable, +DEFINE_GUID(IID_ID3D10EffectBlendVariable, 0x1fcd2294, 0xdf6d, 0x4eae, 0x86, 0xb3, 0xe, 0x91, 0x60, 0xcf, 0xb0, 0x7b); #undef INTERFACE @@ -968,18 +967,18 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -993,10 +992,10 @@ DECLARE_INTERFACE_(ID3D10EffectBlendVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetBlendState)(THIS_ UINT Index, ID3D10BlendState **ppBlendState) PURE; STDMETHOD(GetBackingStore)(THIS_ UINT Index, D3D10_BLEND_DESC *pBlendDesc) PURE; }; @@ -1009,7 +1008,7 @@ typedef interface ID3D10EffectDepthStencilVariable ID3D10EffectDepthStencilVaria typedef interface ID3D10EffectDepthStencilVariable *LPD3D10EFFECTDEPTHSTENCILVARIABLE; // {AF482368-330A-46a5-9A5C-01C71AF24C8D} -DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable, +DEFINE_GUID(IID_ID3D10EffectDepthStencilVariable, 0xaf482368, 0x330a, 0x46a5, 0x9a, 0x5c, 0x1, 0xc7, 0x1a, 0xf2, 0x4c, 0x8d); #undef INTERFACE @@ -1019,18 +1018,18 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -1044,10 +1043,10 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetDepthStencilState)(THIS_ UINT Index, _Out_ ID3D10DepthStencilState **ppDepthStencilState) PURE; STDMETHOD(GetBackingStore)(THIS_ UINT Index, _Out_ D3D10_DEPTH_STENCIL_DESC *pDepthStencilDesc) PURE; }; @@ -1060,7 +1059,7 @@ typedef interface ID3D10EffectRasterizerVariable ID3D10EffectRasterizerVariable; typedef interface ID3D10EffectRasterizerVariable *LPD3D10EFFECTRASTERIZERVARIABLE; // {21AF9F0E-4D94-4ea9-9785-2CB76B8C0B34} -DEFINE_GUID(IID_ID3D10EffectRasterizerVariable, +DEFINE_GUID(IID_ID3D10EffectRasterizerVariable, 0x21af9f0e, 0x4d94, 0x4ea9, 0x97, 0x85, 0x2c, 0xb7, 0x6b, 0x8c, 0xb, 0x34); #undef INTERFACE @@ -1070,18 +1069,18 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -1095,10 +1094,10 @@ DECLARE_INTERFACE_(ID3D10EffectRasterizerVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetRasterizerState)(THIS_ UINT Index, _Out_ ID3D10RasterizerState **ppRasterizerState) PURE; STDMETHOD(GetBackingStore)(THIS_ UINT Index, _Out_ D3D10_RASTERIZER_DESC *pRasterizerDesc) PURE; }; @@ -1111,7 +1110,7 @@ typedef interface ID3D10EffectSamplerVariable ID3D10EffectSamplerVariable; typedef interface ID3D10EffectSamplerVariable *LPD3D10EFFECTSAMPLERVARIABLE; // {6530D5C7-07E9-4271-A418-E7CE4BD1E480} -DEFINE_GUID(IID_ID3D10EffectSamplerVariable, +DEFINE_GUID(IID_ID3D10EffectSamplerVariable, 0x6530d5c7, 0x7e9, 0x4271, 0xa4, 0x18, 0xe7, 0xce, 0x4b, 0xd1, 0xe4, 0x80); #undef INTERFACE @@ -1121,18 +1120,18 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable) { STDMETHOD_(ID3D10EffectType*, GetType)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetMemberByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetMemberBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetElement)(THIS_ UINT Index) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetParentConstantBuffer)(THIS) PURE; - + STDMETHOD_(ID3D10EffectScalarVariable*, AsScalar)(THIS) PURE; STDMETHOD_(ID3D10EffectVectorVariable*, AsVector)(THIS) PURE; STDMETHOD_(ID3D10EffectMatrixVariable*, AsMatrix)(THIS) PURE; @@ -1146,10 +1145,10 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable) STDMETHOD_(ID3D10EffectDepthStencilVariable*, AsDepthStencil)(THIS) PURE; STDMETHOD_(ID3D10EffectRasterizerVariable*, AsRasterizer)(THIS) PURE; STDMETHOD_(ID3D10EffectSamplerVariable*, AsSampler)(THIS) PURE; - + STDMETHOD(SetRawValue)(THIS_ _In_reads_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; STDMETHOD(GetRawValue)(THIS_ _Out_writes_bytes_(ByteCount) void *pData, UINT Offset, UINT ByteCount) PURE; - + STDMETHOD(GetSampler)(THIS_ UINT Index, _Out_ ID3D10SamplerState **ppSampler) PURE; STDMETHOD(GetBackingStore)(THIS_ UINT Index, _Out_ D3D10_SAMPLER_DESC *pSamplerDesc) PURE; }; @@ -1166,13 +1165,13 @@ DECLARE_INTERFACE_(ID3D10EffectSamplerVariable, ID3D10EffectVariable) typedef struct _D3D10_PASS_DESC { - LPCSTR Name; // Name of this pass (NULL if not anonymous) + LPCSTR Name; // Name of this pass (NULL if not anonymous) UINT Annotations; // Number of annotations on this pass - + BYTE *pIAInputSignature; // Signature from VS or GS (if there is no VS) // or NULL if neither exists - SIZE_T IAInputSignatureSize; // Singature size in bytes - + SIZE_T IAInputSignatureSize; // Singature size in bytes + UINT StencilRef; // Specified in SetDepthStencilState() UINT SampleMask; // Specified in SetBlendState() FLOAT BlendFactor[4]; // Specified in SetBlendState() @@ -1188,7 +1187,7 @@ typedef struct _D3D10_PASS_SHADER_DESC { ID3D10EffectShaderVariable *pShaderVariable; // The variable that this shader came from. // If this is an inline shader assignment, - // the returned interface will be an + // the returned interface will be an // anonymous shader variable, which is // not retrievable any other way. It's // name in the variable description will @@ -1196,7 +1195,7 @@ typedef struct _D3D10_PASS_SHADER_DESC // If there is no assignment of this type in // the pass block, pShaderVariable != NULL, // but pShaderVariable->IsValid() == FALSE. - + UINT ShaderIndex; // The element of pShaderVariable (if an array) // or 0 if not applicable } D3D10_PASS_SHADER_DESC; @@ -1205,7 +1204,7 @@ typedef interface ID3D10EffectPass ID3D10EffectPass; typedef interface ID3D10EffectPass *LPD3D10EFFECTPASS; // {5CFBEB89-1A06-46e0-B282-E3F9BFA36A54} -DEFINE_GUID(IID_ID3D10EffectPass, +DEFINE_GUID(IID_ID3D10EffectPass, 0x5cfbeb89, 0x1a06, 0x46e0, 0xb2, 0x82, 0xe3, 0xf9, 0xbf, 0xa3, 0x6a, 0x54); #undef INTERFACE @@ -1215,16 +1214,16 @@ DECLARE_INTERFACE(ID3D10EffectPass) { STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ D3D10_PASS_DESC *pDesc) PURE; - + STDMETHOD(GetVertexShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE; STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE; STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD(Apply)(THIS_ UINT Flags) PURE; - + STDMETHOD(ComputeStateBlockMask)(THIS_ _Out_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE; }; @@ -1249,7 +1248,7 @@ typedef interface ID3D10EffectTechnique ID3D10EffectTechnique; typedef interface ID3D10EffectTechnique *LPD3D10EFFECTTECHNIQUE; // {DB122CE8-D1C9-4292-B237-24ED3DE8B175} -DEFINE_GUID(IID_ID3D10EffectTechnique, +DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #undef INTERFACE @@ -1259,13 +1258,13 @@ DECLARE_INTERFACE(ID3D10EffectTechnique) { STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ D3D10_TECHNIQUE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetAnnotationByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectPass*, GetPassByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectPass*, GetPassByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD(ComputeStateBlockMask)(THIS_ _Out_ D3D10_STATE_BLOCK_MASK *pStateBlockMask) PURE; }; @@ -1281,20 +1280,20 @@ DECLARE_INTERFACE(ID3D10EffectTechnique) typedef struct _D3D10_EFFECT_DESC { - - BOOL IsChildEffect; // TRUE if this is a child effect, + + BOOL IsChildEffect; // TRUE if this is a child effect, // FALSE if this is standalone or an effect pool. - + UINT ConstantBuffers; // Number of constant buffers in this effect, // excluding the effect pool. UINT SharedConstantBuffers; // Number of constant buffers shared in this // effect's pool. - + UINT GlobalVariables; // Number of global variables in this effect, // excluding the effect pool. UINT SharedGlobalVariables; // Number of global variables shared in this // effect's pool. - + UINT Techniques; // Number of techniques in this effect, // excluding the effect pool. } D3D10_EFFECT_DESC; @@ -1303,7 +1302,7 @@ typedef interface ID3D10Effect ID3D10Effect; typedef interface ID3D10Effect *LPD3D10EFFECT; // {51B0CA8B-EC0B-4519-870D-8EE1CB5017C7} -DEFINE_GUID(IID_ID3D10Effect, +DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0xd, 0x8e, 0xe1, 0xcb, 0x50, 0x17, 0xc7); #undef INTERFACE @@ -1315,26 +1314,26 @@ DECLARE_INTERFACE_(ID3D10Effect, IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; - + STDMETHOD_(BOOL, IsValid)(THIS) PURE; STDMETHOD_(BOOL, IsPool)(THIS) PURE; // Managing D3D Device STDMETHOD(GetDevice)(THIS_ _Out_ ID3D10Device** ppDevice) PURE; - + // New Reflection APIs STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_EFFECT_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD_(ID3D10EffectVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(ID3D10EffectVariable*, GetVariableBySemantic)(THIS_ LPCSTR Semantic) PURE; - + STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10EffectTechnique*, GetTechniqueByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD(Optimize)(THIS) PURE; STDMETHOD_(BOOL, IsOptimized)(THIS) PURE; @@ -1348,7 +1347,7 @@ typedef interface ID3D10EffectPool ID3D10EffectPool; typedef interface ID3D10EffectPool *LPD3D10EFFECTPOOL; // {9537AB04-3250-412e-8213-FCD2F8677933} -DEFINE_GUID(IID_ID3D10EffectPool, +DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, 0xd2, 0xf8, 0x67, 0x79, 0x33); #undef INTERFACE @@ -1360,9 +1359,9 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; - + STDMETHOD_(ID3D10Effect*, AsEffect)(THIS) PURE; - + // No public methods }; @@ -1416,16 +1415,16 @@ extern "C" { // ppEffectPool // Address of the newly created Effect pool interface // ppErrors -// If non-NULL, address of a buffer with error messages that occurred +// If non-NULL, address of a buffer with error messages that occurred // during parsing or compilation // //---------------------------------------------------------------------------- -HRESULT WINAPI D3D10CompileEffectFromMemory(_In_reads_bytes_(DataLength) void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, _In_opt_ CONST D3D10_SHADER_MACRO *pDefines, - _In_opt_ ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, +HRESULT WINAPI D3D10CompileEffectFromMemory(_In_reads_bytes_(DataLength) void *pData, SIZE_T DataLength, LPCSTR pSrcFileName, _In_opt_ CONST D3D10_SHADER_MACRO *pDefines, + _In_opt_ ID3D10Include *pInclude, UINT HLSLFlags, UINT FXFlags, _Out_ ID3D10Blob **ppCompiledEffect, _Out_opt_ ID3D10Blob **ppErrors); -HRESULT WINAPI D3D10CreateEffectFromMemory(_In_reads_bytes_(DataLength) void *pData, SIZE_T DataLength, UINT FXFlags, _In_ ID3D10Device *pDevice, +HRESULT WINAPI D3D10CreateEffectFromMemory(_In_reads_bytes_(DataLength) void *pData, SIZE_T DataLength, UINT FXFlags, _In_ ID3D10Device *pDevice, _In_opt_ ID3D10EffectPool *pEffectPool, _Out_ ID3D10Effect **ppEffect); HRESULT WINAPI D3D10CreateEffectPoolFromMemory(_In_reads_bytes_(DataLength) void *pData, SIZE_T DataLength, UINT FXFlags, _In_ ID3D10Device *pDevice, diff --git a/gfx/include/dxsdk/d3d10misc.h b/gfx/include/dxsdk/d3d10misc.h index f6307b8949..9e49821b42 100644 --- a/gfx/include/dxsdk/d3d10misc.h +++ b/gfx/include/dxsdk/d3d10misc.h @@ -42,7 +42,7 @@ typedef enum D3D10_DRIVER_TYPE D3D10_DRIVER_TYPE_WARP = 5, } D3D10_DRIVER_TYPE; -DEFINE_GUID(GUID_DeviceType, +DEFINE_GUID(GUID_DeviceType, 0xd722fb4d, 0x7a68, 0x437a, 0xb2, 0x0c, 0x58, 0x04, 0xee, 0x24, 0x94, 0xa6); /////////////////////////////////////////////////////////////////////////// @@ -50,13 +50,13 @@ DEFINE_GUID(GUID_DeviceType, // ------------------ // // pAdapter -// If NULL, D3D10CreateDevice will choose the primary adapter and +// If NULL, D3D10CreateDevice will choose the primary adapter and // create a new instance from a temporarily created IDXGIFactory. -// If non-NULL, D3D10CreateDevice will register the appropriate -// device, if necessary (via IDXGIAdapter::RegisterDrver), before +// If non-NULL, D3D10CreateDevice will register the appropriate +// device, if necessary (via IDXGIAdapter::RegisterDrver), before // creating the device. // DriverType -// Specifies the driver type to be created: hardware, reference or +// Specifies the driver type to be created: hardware, reference or // null. // Software // HMODULE of a DLL implementing a software rasterizer. Must be NULL for @@ -69,12 +69,12 @@ DEFINE_GUID(GUID_DeviceType, // Pointer to returned interface. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver // D3D10CreateDevice -// +// /////////////////////////////////////////////////////////////////////////// HRESULT WINAPI D3D10CreateDevice( _In_opt_ IDXGIAdapter *pAdapter, @@ -89,13 +89,13 @@ HRESULT WINAPI D3D10CreateDevice( // ------------------------------ // // ppAdapter -// If NULL, D3D10CreateDevice will choose the primary adapter and +// If NULL, D3D10CreateDevice will choose the primary adapter and // create a new instance from a temporarily created IDXGIFactory. -// If non-NULL, D3D10CreateDevice will register the appropriate -// device, if necessary (via IDXGIAdapter::RegisterDrver), before +// If non-NULL, D3D10CreateDevice will register the appropriate +// device, if necessary (via IDXGIAdapter::RegisterDrver), before // creating the device. // DriverType -// Specifies the driver type to be created: hardware, reference or +// Specifies the driver type to be created: hardware, reference or // null. // Software // HMODULE of a DLL implementing a software rasterizer. Must be NULL for @@ -112,13 +112,13 @@ HRESULT WINAPI D3D10CreateDevice( // Pointer to returned interface. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver // D3D10CreateDevice // IDXGIFactory::CreateSwapChain -// +// /////////////////////////////////////////////////////////////////////////// HRESULT WINAPI D3D10CreateDeviceAndSwapChain( _In_opt_ IDXGIAdapter *pAdapter, @@ -127,7 +127,7 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain( UINT Flags, UINT SDKVersion, _In_opt_ DXGI_SWAP_CHAIN_DESC *pSwapChainDesc, - _Out_opt_ IDXGISwapChain **ppSwapChain, + _Out_opt_ IDXGISwapChain **ppSwapChain, _Out_opt_ ID3D10Device **ppDevice); /////////////////////////////////////////////////////////////////////////// diff --git a/gfx/include/dxsdk/d3d10sdklayers.h b/gfx/include/dxsdk/d3d10sdklayers.h index 168622b3e5..1ca63328b4 100644 --- a/gfx/include/dxsdk/d3d10sdklayers.h +++ b/gfx/include/dxsdk/d3d10sdklayers.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D10Debug_FWD_DEFINED__ #define __ID3D10Debug_FWD_DEFINED__ @@ -65,10 +65,10 @@ typedef interface ID3D10InfoQueue ID3D10InfoQueue; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d10sdklayers_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region Desktop Family*/ @@ -88,84 +88,83 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0000_v0_0_s_ifspec; #define __ID3D10Debug_INTERFACE_DEFINED__ /* interface ID3D10Debug */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Debug; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4E01-342C-4106-A19F-4F2704F689F0") ID3D10Debug : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( + virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( UINT Mask) = 0; - + virtual UINT STDMETHODCALLTYPE GetFeatureMask( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPresentPerRenderOpDelay( + + virtual HRESULT STDMETHODCALLTYPE SetPresentPerRenderOpDelay( UINT Milliseconds) = 0; - + virtual UINT STDMETHODCALLTYPE GetPresentPerRenderOpDelay( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSwapChain( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetSwapChain( + /* [annotation] */ _In_opt_ IDXGISwapChain *pSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSwapChain( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetSwapChain( + /* [annotation] */ _Out_ IDXGISwapChain **ppSwapChain) = 0; - + virtual HRESULT STDMETHODCALLTYPE Validate( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10DebugVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Debug * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Debug * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( + + HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( ID3D10Debug * This, UINT Mask); - - UINT ( STDMETHODCALLTYPE *GetFeatureMask )( + + UINT ( STDMETHODCALLTYPE *GetFeatureMask )( ID3D10Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetPresentPerRenderOpDelay )( + + HRESULT ( STDMETHODCALLTYPE *SetPresentPerRenderOpDelay )( ID3D10Debug * This, UINT Milliseconds); - - UINT ( STDMETHODCALLTYPE *GetPresentPerRenderOpDelay )( + + UINT ( STDMETHODCALLTYPE *GetPresentPerRenderOpDelay )( ID3D10Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *SetSwapChain )( ID3D10Debug * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ IDXGISwapChain *pSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *GetSwapChain )( ID3D10Debug * This, - /* [annotation] */ + /* [annotation] */ _Out_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *Validate )( + + HRESULT ( STDMETHODCALLTYPE *Validate )( ID3D10Debug * This); - + END_INTERFACE } ID3D10DebugVtbl; @@ -174,39 +173,37 @@ EXTERN_C const IID IID_ID3D10Debug; CONST_VTBL struct ID3D10DebugVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Debug_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Debug_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Debug_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Debug_SetFeatureMask(This,Mask) \ - ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) + ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) #define ID3D10Debug_GetFeatureMask(This) \ - ( (This)->lpVtbl -> GetFeatureMask(This) ) + ( (This)->lpVtbl -> GetFeatureMask(This) ) #define ID3D10Debug_SetPresentPerRenderOpDelay(This,Milliseconds) \ - ( (This)->lpVtbl -> SetPresentPerRenderOpDelay(This,Milliseconds) ) + ( (This)->lpVtbl -> SetPresentPerRenderOpDelay(This,Milliseconds) ) #define ID3D10Debug_GetPresentPerRenderOpDelay(This) \ - ( (This)->lpVtbl -> GetPresentPerRenderOpDelay(This) ) + ( (This)->lpVtbl -> GetPresentPerRenderOpDelay(This) ) #define ID3D10Debug_SetSwapChain(This,pSwapChain) \ - ( (This)->lpVtbl -> SetSwapChain(This,pSwapChain) ) + ( (This)->lpVtbl -> SetSwapChain(This,pSwapChain) ) #define ID3D10Debug_GetSwapChain(This,ppSwapChain) \ - ( (This)->lpVtbl -> GetSwapChain(This,ppSwapChain) ) + ( (This)->lpVtbl -> GetSwapChain(This,ppSwapChain) ) #define ID3D10Debug_Validate(This) \ - ( (This)->lpVtbl -> Validate(This) ) + ( (This)->lpVtbl -> Validate(This) ) #endif /* COBJMACROS */ @@ -218,49 +215,48 @@ EXTERN_C const IID IID_ID3D10Debug; #define __ID3D10SwitchToRef_INTERFACE_DEFINED__ /* interface ID3D10SwitchToRef */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10SwitchToRef; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4E02-342C-4106-A19F-4F2704F689F0") ID3D10SwitchToRef : public IUnknown { public: - virtual BOOL STDMETHODCALLTYPE SetUseRef( + virtual BOOL STDMETHODCALLTYPE SetUseRef( BOOL UseRef) = 0; - + virtual BOOL STDMETHODCALLTYPE GetUseRef( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10SwitchToRefVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10SwitchToRef * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10SwitchToRef * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10SwitchToRef * This); - - BOOL ( STDMETHODCALLTYPE *SetUseRef )( + + BOOL ( STDMETHODCALLTYPE *SetUseRef )( ID3D10SwitchToRef * This, BOOL UseRef); - - BOOL ( STDMETHODCALLTYPE *GetUseRef )( + + BOOL ( STDMETHODCALLTYPE *GetUseRef )( ID3D10SwitchToRef * This); - + END_INTERFACE } ID3D10SwitchToRefVtbl; @@ -269,24 +265,22 @@ EXTERN_C const IID IID_ID3D10SwitchToRef; CONST_VTBL struct ID3D10SwitchToRefVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10SwitchToRef_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10SwitchToRef_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10SwitchToRef_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10SwitchToRef_SetUseRef(This,UseRef) \ - ( (This)->lpVtbl -> SetUseRef(This,UseRef) ) + ( (This)->lpVtbl -> SetUseRef(This,UseRef) ) #define ID3D10SwitchToRef_GetUseRef(This) \ - ( (This)->lpVtbl -> GetUseRef(This) ) + ( (This)->lpVtbl -> GetUseRef(This) ) #endif /* COBJMACROS */ @@ -295,7 +289,7 @@ EXTERN_C const IID IID_ID3D10SwitchToRef; #endif /* __ID3D10SwitchToRef_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10sdklayers_0000_0002 */ -/* [local] */ +/* [local] */ DEFINE_GUID(DXGI_DEBUG_D3D10, 0x243b4c52, 0x3606, 0x4d3a, 0x99, 0xd7, 0xa7, 0xe7, 0xb3, 0x3e, 0xd7, 0x6); #define D3D10_REGKEY_PATH __TEXT("Software\\Microsoft\\Direct3D") @@ -313,7 +307,7 @@ DEFINE_GUID(DXGI_DEBUG_D3D10, 0x243b4c52, 0x3606, 0x4d3a, 0x99, 0xd7, 0xa7, 0xe7 #define D3D10_BREAKON_ID_DECIMAL __TEXT("BreakOn_ID_%d") #define D3D10_APPSIZE_STRING __TEXT("Size") #define D3D10_APPNAME_STRING __TEXT("Name") -typedef +typedef enum D3D10_MESSAGE_CATEGORY { D3D10_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0, @@ -326,20 +320,20 @@ enum D3D10_MESSAGE_CATEGORY D3D10_MESSAGE_CATEGORY_STATE_GETTING = ( D3D10_MESSAGE_CATEGORY_STATE_SETTING + 1 ) , D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = ( D3D10_MESSAGE_CATEGORY_STATE_GETTING + 1 ) , D3D10_MESSAGE_CATEGORY_EXECUTION = ( D3D10_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 ) , - D3D10_MESSAGE_CATEGORY_SHADER = ( D3D10_MESSAGE_CATEGORY_EXECUTION + 1 ) + D3D10_MESSAGE_CATEGORY_SHADER = ( D3D10_MESSAGE_CATEGORY_EXECUTION + 1 ) } D3D10_MESSAGE_CATEGORY; -typedef +typedef enum D3D10_MESSAGE_SEVERITY { D3D10_MESSAGE_SEVERITY_CORRUPTION = 0, D3D10_MESSAGE_SEVERITY_ERROR = ( D3D10_MESSAGE_SEVERITY_CORRUPTION + 1 ) , D3D10_MESSAGE_SEVERITY_WARNING = ( D3D10_MESSAGE_SEVERITY_ERROR + 1 ) , D3D10_MESSAGE_SEVERITY_INFO = ( D3D10_MESSAGE_SEVERITY_WARNING + 1 ) , - D3D10_MESSAGE_SEVERITY_MESSAGE = ( D3D10_MESSAGE_SEVERITY_INFO + 1 ) + D3D10_MESSAGE_SEVERITY_MESSAGE = ( D3D10_MESSAGE_SEVERITY_INFO + 1 ) } D3D10_MESSAGE_SEVERITY; -typedef +typedef enum D3D10_MESSAGE_ID { D3D10_MESSAGE_ID_UNKNOWN = 0, @@ -848,7 +842,7 @@ enum D3D10_MESSAGE_ID D3D10_MESSAGE_ID_CREATESAMPLERSTATE_BORDER_NOT_SUPPORTED = ( D3D10_MESSAGE_ID_CREATERESOURCE_NON_POW_2_MIPMAP + 1 ) , D3D10_MESSAGE_ID_OMSETRENDERTARGETS_NO_SRGB_MRT = ( D3D10_MESSAGE_ID_CREATESAMPLERSTATE_BORDER_NOT_SUPPORTED + 1 ) , D3D10_MESSAGE_ID_COPYRESOURCE_NO_3D_MISMATCHED_UPDATES = ( D3D10_MESSAGE_ID_OMSETRENDERTARGETS_NO_SRGB_MRT + 1 ) , - D3D10_MESSAGE_ID_D3D10L9_MESSAGES_END = ( D3D10_MESSAGE_ID_COPYRESOURCE_NO_3D_MISMATCHED_UPDATES + 1 ) + D3D10_MESSAGE_ID_D3D10L9_MESSAGES_END = ( D3D10_MESSAGE_ID_COPYRESOURCE_NO_3D_MISMATCHED_UPDATES + 1 ) } D3D10_MESSAGE_ID; typedef struct D3D10_MESSAGE @@ -856,7 +850,7 @@ typedef struct D3D10_MESSAGE D3D10_MESSAGE_CATEGORY Category; D3D10_MESSAGE_SEVERITY Severity; D3D10_MESSAGE_ID ID; - /* [annotation] */ + /* [annotation] */ _Field_size_(DescriptionByteLength) const char *pDescription; SIZE_T DescriptionByteLength; } D3D10_MESSAGE; @@ -864,13 +858,13 @@ typedef struct D3D10_MESSAGE typedef struct D3D10_INFO_QUEUE_FILTER_DESC { UINT NumCategories; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumCategories) D3D10_MESSAGE_CATEGORY *pCategoryList; UINT NumSeverities; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumSeverities) D3D10_MESSAGE_SEVERITY *pSeverityList; UINT NumIDs; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumIDs) D3D10_MESSAGE_ID *pIDList; } D3D10_INFO_QUEUE_FILTER_DESC; @@ -889,324 +883,323 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d10sdklayers_0000_0002_v0_0_s_ifspec; #define __ID3D10InfoQueue_INTERFACE_DEFINED__ /* interface ID3D10InfoQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10InfoQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1b940b17-2642-4d1f-ab1f-b99bad0c395f") ID3D10InfoQueue : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( + /* [annotation] */ _In_ UINT64 MessageCountLimit) = 0; - + virtual void STDMETHODCALLTYPE ClearStoredMessages( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetMessage( + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) D3D10_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopStorageFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopRetrievalFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddMessage( + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnID( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnID( + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID) = 0; - - virtual void STDMETHODCALLTYPE SetMuteDebugOutput( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetMuteDebugOutput( + /* [annotation] */ _In_ BOOL bMute) = 0; - + virtual BOOL STDMETHODCALLTYPE GetMuteDebugOutput( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10InfoQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10InfoQueue * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10InfoQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( + + HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageCountLimit); - - void ( STDMETHODCALLTYPE *ClearStoredMessages )( + + void ( STDMETHODCALLTYPE *ClearStoredMessages )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *GetMessage )( + + HRESULT ( STDMETHODCALLTYPE *GetMessage )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) D3D10_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( ID3D10InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( ID3D10InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( ID3D10InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( ID3D10InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( ID3D10InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearStorageFilter )( + + void ( STDMETHODCALLTYPE *ClearStorageFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopStorageFilter )( + + void ( STDMETHODCALLTYPE *PopStorageFilter )( ID3D10InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D10_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( + + void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopRetrievalFilter )( + + void ( STDMETHODCALLTYPE *PopRetrievalFilter )( ID3D10InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( ID3D10InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddMessage )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_CATEGORY Category); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_SEVERITY Severity); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D10_MESSAGE_ID ID); - - void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( + + void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( ID3D10InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMute); - - BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( + + BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( ID3D10InfoQueue * This); - + END_INTERFACE } ID3D10InfoQueueVtbl; @@ -1215,123 +1208,121 @@ EXTERN_C const IID IID_ID3D10InfoQueue; CONST_VTBL struct ID3D10InfoQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10InfoQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10InfoQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10InfoQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10InfoQueue_SetMessageCountLimit(This,MessageCountLimit) \ - ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) + ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) #define ID3D10InfoQueue_ClearStoredMessages(This) \ - ( (This)->lpVtbl -> ClearStoredMessages(This) ) + ( (This)->lpVtbl -> ClearStoredMessages(This) ) #define ID3D10InfoQueue_GetMessage(This,MessageIndex,pMessage,pMessageByteLength) \ - ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) + ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) #define ID3D10InfoQueue_GetNumMessagesAllowedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) #define ID3D10InfoQueue_GetNumMessagesDeniedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) #define ID3D10InfoQueue_GetNumStoredMessages(This) \ - ( (This)->lpVtbl -> GetNumStoredMessages(This) ) + ( (This)->lpVtbl -> GetNumStoredMessages(This) ) #define ID3D10InfoQueue_GetNumStoredMessagesAllowedByRetrievalFilter(This) \ - ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) + ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) #define ID3D10InfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) #define ID3D10InfoQueue_GetMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetMessageCountLimit(This) ) #define ID3D10InfoQueue_AddStorageFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) #define ID3D10InfoQueue_GetStorageFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) #define ID3D10InfoQueue_ClearStorageFilter(This) \ - ( (This)->lpVtbl -> ClearStorageFilter(This) ) + ( (This)->lpVtbl -> ClearStorageFilter(This) ) #define ID3D10InfoQueue_PushEmptyStorageFilter(This) \ - ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) + ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) #define ID3D10InfoQueue_PushCopyOfStorageFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) #define ID3D10InfoQueue_PushStorageFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) #define ID3D10InfoQueue_PopStorageFilter(This) \ - ( (This)->lpVtbl -> PopStorageFilter(This) ) + ( (This)->lpVtbl -> PopStorageFilter(This) ) #define ID3D10InfoQueue_GetStorageFilterStackSize(This) \ - ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) + ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) #define ID3D10InfoQueue_AddRetrievalFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) #define ID3D10InfoQueue_GetRetrievalFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) #define ID3D10InfoQueue_ClearRetrievalFilter(This) \ - ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) + ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) #define ID3D10InfoQueue_PushEmptyRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) #define ID3D10InfoQueue_PushCopyOfRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) #define ID3D10InfoQueue_PushRetrievalFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) #define ID3D10InfoQueue_PopRetrievalFilter(This) \ - ( (This)->lpVtbl -> PopRetrievalFilter(This) ) + ( (This)->lpVtbl -> PopRetrievalFilter(This) ) #define ID3D10InfoQueue_GetRetrievalFilterStackSize(This) \ - ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) + ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) #define ID3D10InfoQueue_AddMessage(This,Category,Severity,ID,pDescription) \ - ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) + ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) #define ID3D10InfoQueue_AddApplicationMessage(This,Severity,pDescription) \ - ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) + ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) #define ID3D10InfoQueue_SetBreakOnCategory(This,Category,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) #define ID3D10InfoQueue_SetBreakOnSeverity(This,Severity,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) #define ID3D10InfoQueue_SetBreakOnID(This,ID,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) #define ID3D10InfoQueue_GetBreakOnCategory(This,Category) \ - ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) + ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) #define ID3D10InfoQueue_GetBreakOnSeverity(This,Severity) \ - ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) + ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) #define ID3D10InfoQueue_GetBreakOnID(This,ID) \ - ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) + ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) #define ID3D10InfoQueue_SetMuteDebugOutput(This,bMute) \ - ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) + ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) #define ID3D10InfoQueue_GetMuteDebugOutput(This) \ - ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) + ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) #endif /* COBJMACROS */ @@ -1340,7 +1331,7 @@ EXTERN_C const IID IID_ID3D10InfoQueue; #endif /* __ID3D10InfoQueue_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d10sdklayers_0000_0003 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d3d10shader.h b/gfx/include/dxsdk/d3d10shader.h index 68091e3355..d21dcad935 100644 --- a/gfx/include/dxsdk/d3d10shader.h +++ b/gfx/include/dxsdk/d3d10shader.h @@ -37,9 +37,9 @@ // you KNOW will work. (ie. have compiled before without this option.) // Shaders are always validated by D3D before they are set to the device. // -// D3D10_SHADER_SKIP_OPTIMIZATION +// D3D10_SHADER_SKIP_OPTIMIZATION // Instructs the compiler to skip optimization steps during code generation. -// Unless you are trying to isolate a problem in your code using this option +// Unless you are trying to isolate a problem in your code using this option // is not recommended. // // D3D10_SHADER_PACK_MATRIX_ROW_MAJOR @@ -47,8 +47,8 @@ // on input and output from the shader. // // D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR -// Unless explicitly specified, matrices will be packed in column-major -// order on input and output from the shader. This is generally more +// Unless explicitly specified, matrices will be packed in column-major +// order on input and output from the shader. This is generally more // efficient, since it allows vector-matrix multiplication to be performed // using a series of dot-products. // @@ -58,16 +58,16 @@ // // D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT // Force compiler to compile against the next highest available software -// target for vertex shaders. This flag also turns optimizations off, -// and debugging on. +// target for vertex shaders. This flag also turns optimizations off, +// and debugging on. // // D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT // Force compiler to compile against the next highest available software -// target for pixel shaders. This flag also turns optimizations off, +// target for pixel shaders. This flag also turns optimizations off, // and debugging on. // // D3D10_SHADER_NO_PRESHADER -// Disables Preshaders. Using this flag will cause the compiler to not +// Disables Preshaders. Using this flag will cause the compiler to not // pull out static expression for evaluation on the host cpu // // D3D10_SHADER_AVOID_FLOW_CONTROL @@ -169,16 +169,16 @@ typedef struct _D3D10_SHADER_DESC UINT Version; // Shader version LPCSTR Creator; // Creator string UINT Flags; // Shader compilation/parse flags - + UINT ConstantBuffers; // Number of constant buffers UINT BoundResources; // Number of bound resources UINT InputParameters; // Number of parameters in the input signature UINT OutputParameters; // Number of parameters in the output signature UINT InstructionCount; // Number of emitted instructions - UINT TempRegisterCount; // Number of temporary registers used + UINT TempRegisterCount; // Number of temporary registers used UINT TempArrayCount; // Number of temporary arrays used - UINT DefCount; // Number of constant defines + UINT DefCount; // Number of constant defines UINT DclCount; // Number of declarations (input + output) UINT TextureNormalInstructions; // Number of non-categorized texture instructions UINT TextureLoadInstructions; // Number of texture load instructions @@ -224,7 +224,7 @@ typedef struct _D3D10_SHADER_TYPE_DESC UINT Columns; // Number of columns (for vectors & matrices, 1 for other numeric, 0 if not applicable) UINT Elements; // Number of elements (0 if not an array) UINT Members; // Number of members (0 if not a structure) - UINT Offset; // Offset from the start of structure (0 if not a structure member) + UINT Offset; // Offset from the start of structure (0 if not a structure member) } D3D10_SHADER_TYPE_DESC; typedef struct _D3D10_SHADER_INPUT_BIND_DESC @@ -233,7 +233,7 @@ typedef struct _D3D10_SHADER_INPUT_BIND_DESC D3D10_SHADER_INPUT_TYPE Type; // Type of resource (e.g. texture, cbuffer, etc.) UINT BindPoint; // Starting bind point UINT BindCount; // Number of contiguous bind points (for arrays) - + UINT uFlags; // Input binding flags D3D10_RESOURCE_RETURN_TYPE ReturnType; // Return type (if texture) D3D10_SRV_DIMENSION Dimension; // Dimension (if texture) @@ -249,11 +249,11 @@ typedef struct _D3D10_SIGNATURE_PARAMETER_DESC D3D10_REGISTER_COMPONENT_TYPE ComponentType;// Scalar type (e.g. uint, float, etc.) BYTE Mask; // Mask to indicate which components of the register // are used (combination of D3D10_COMPONENT_MASK values) - BYTE ReadWriteMask; // Mask to indicate whether a given component is + BYTE ReadWriteMask; // Mask to indicate whether a given component is // never written (if this is an output signature) or // always read (if this is an input signature). // (combination of D3D10_COMPONENT_MASK values) - + } D3D10_SIGNATURE_PARAMETER_DESC; // @@ -265,7 +265,7 @@ typedef interface ID3D10ShaderReflectionType *LPD3D10SHADERREFLECTIONTYPE; // {C530AD7D-9B16-4395-A979-BA2ECFF83ADD} interface DECLSPEC_UUID("C530AD7D-9B16-4395-A979-BA2ECFF83ADD") ID3D10ShaderReflectionType; -DEFINE_GUID(IID_ID3D10ShaderReflectionType, +DEFINE_GUID(IID_ID3D10ShaderReflectionType, 0xc530ad7d, 0x9b16, 0x4395, 0xa9, 0x79, 0xba, 0x2e, 0xcf, 0xf8, 0x3a, 0xdd); #undef INTERFACE @@ -274,7 +274,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionType, DECLARE_INTERFACE(ID3D10ShaderReflectionType) { STDMETHOD(GetDesc)(THIS_ D3D10_SHADER_TYPE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10ShaderReflectionType*, GetMemberTypeByName)(THIS_ LPCSTR Name) PURE; STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ UINT Index) PURE; @@ -285,7 +285,7 @@ typedef interface ID3D10ShaderReflectionVariable *LPD3D10SHADERREFLECTIONVARIABL // {1BF63C95-2650-405d-99C1-3636BD1DA0A1} interface DECLSPEC_UUID("1BF63C95-2650-405d-99C1-3636BD1DA0A1") ID3D10ShaderReflectionVariable; -DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, +DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, 0x1bf63c95, 0x2650, 0x405d, 0x99, 0xc1, 0x36, 0x36, 0xbd, 0x1d, 0xa0, 0xa1); #undef INTERFACE @@ -294,7 +294,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionVariable, DECLARE_INTERFACE(ID3D10ShaderReflectionVariable) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_SHADER_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10ShaderReflectionType*, GetType)(THIS) PURE; }; @@ -303,7 +303,7 @@ typedef interface ID3D10ShaderReflectionConstantBuffer *LPD3D10SHADERREFLECTIONC // {66C66A94-DDDD-4b62-A66A-F0DA33C2B4D0} interface DECLSPEC_UUID("66C66A94-DDDD-4b62-A66A-F0DA33C2B4D0") ID3D10ShaderReflectionConstantBuffer; -DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer, +DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer, 0x66c66a94, 0xdddd, 0x4b62, 0xa6, 0x6a, 0xf0, 0xda, 0x33, 0xc2, 0xb4, 0xd0); #undef INTERFACE @@ -312,7 +312,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflectionConstantBuffer, DECLARE_INTERFACE(ID3D10ShaderReflectionConstantBuffer) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_SHADER_BUFFER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10ShaderReflectionVariable*, GetVariableByName)(THIS_ LPCSTR Name) PURE; }; @@ -322,7 +322,7 @@ typedef interface ID3D10ShaderReflection *LPD3D10SHADERREFLECTION; // {D40E20B6-F8F7-42ad-AB20-4BAF8F15DFAA} interface DECLSPEC_UUID("D40E20B6-F8F7-42ad-AB20-4BAF8F15DFAA") ID3D10ShaderReflection; -DEFINE_GUID(IID_ID3D10ShaderReflection, +DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, 0x4b, 0xaf, 0x8f, 0x15, 0xdf, 0xaa); #undef INTERFACE @@ -335,15 +335,15 @@ DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D10_SHADER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ UINT Index) PURE; STDMETHOD_(ID3D10ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ UINT ResourceIndex, _Out_ D3D10_SHADER_INPUT_BIND_DESC *pDesc) PURE; - + STDMETHOD(GetInputParameterDesc)(THIS_ UINT ParameterIndex, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; STDMETHOD(GetOutputParameterDesc)(THIS_ UINT ParameterIndex, _Out_ D3D10_SIGNATURE_PARAMETER_DESC *pDesc) PURE; - + }; ////////////////////////////////////////////////////////////////////////////// @@ -393,7 +393,7 @@ extern "C" { // these are the same messages you will see in your debug output. //---------------------------------------------------------------------------- -HRESULT WINAPI D3D10CompileShader(_In_reads_bytes_(SrcDataSize) LPCSTR pSrcData, SIZE_T SrcDataSize, _In_opt_ LPCSTR pFileName, _In_opt_ CONST D3D10_SHADER_MACRO* pDefines, _In_opt_ LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3D10CompileShader(_In_reads_bytes_(SrcDataSize) LPCSTR pSrcData, SIZE_T SrcDataSize, _In_opt_ LPCSTR pFileName, _In_opt_ CONST D3D10_SHADER_MACRO* pDefines, _In_opt_ LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags, _Out_ ID3D10Blob** ppShader, _Out_opt_ ID3D10Blob** ppErrorMsgs); //---------------------------------------------------------------------------- @@ -445,7 +445,7 @@ LPCSTR WINAPI D3D10GetGeometryShaderProfile(_In_ ID3D10Device *pDevice); // BytecodeLength // Length of the shader bytecode buffer // ppReflector -// [out] Returns a ID3D10ShaderReflection object that can be used to +// [out] Returns a ID3D10ShaderReflection object that can be used to // retrieve shader resource and constant buffer information // //---------------------------------------------------------------------------- @@ -480,7 +480,7 @@ HRESULT WINAPI D3D10ReflectShader(_In_reads_bytes_(BytecodeLength) CONST void *p // these are the same messages you will see in your debug output. //---------------------------------------------------------------------------- -HRESULT WINAPI D3D10PreprocessShader(_In_reads_bytes_(SrcDataSize) LPCSTR pSrcData, SIZE_T SrcDataSize, _In_opt_ LPCSTR pFileName, _In_opt_ CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3D10PreprocessShader(_In_reads_bytes_(SrcDataSize) LPCSTR pSrcData, SIZE_T SrcDataSize, _In_opt_ LPCSTR pFileName, _In_opt_ CONST D3D10_SHADER_MACRO* pDefines, _In_opt_ LPD3D10INCLUDE pInclude, _Out_ ID3D10Blob** ppShaderText, _Out_opt_ ID3D10Blob** ppErrorMsgs); ////////////////////////////////////////////////////////////////////////// @@ -489,14 +489,14 @@ HRESULT WINAPI D3D10PreprocessShader(_In_reads_bytes_(SrcDataSize) LPCSTR pSrcDa // --------------------------------- // // void *pShaderBytecode - a buffer containing the result of an HLSL -// compilation. Typically this opaque buffer contains several +// compilation. Typically this opaque buffer contains several // discrete sections including the shader executable code, the input -// signature, and the output signature. This can typically be retrieved +// signature, and the output signature. This can typically be retrieved // by calling ID3D10Blob::GetBufferPointer() on the returned blob // from HLSL's compile APIs. // -// UINT BytecodeLength - the length of pShaderBytecode. This can -// typically be retrieved by calling ID3D10Blob::GetBufferSize() +// UINT BytecodeLength - the length of pShaderBytecode. This can +// typically be retrieved by calling ID3D10Blob::GetBufferSize() // on the returned blob from HLSL's compile APIs. // // ID3D10Blob **ppSignatureBlob(s) - a newly created buffer that @@ -540,5 +540,5 @@ HRESULT WINAPI D3D10GetShaderDebugInfo(_In_reads_bytes_(BytecodeLength) CONST vo /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ - + #endif //__D3D10SHADER_H__ diff --git a/gfx/include/dxsdk/d3d11.h b/gfx/include/dxsdk/d3d11.h index 04c9d3c1d7..40c96ce526 100644 --- a/gfx/include/dxsdk/d3d11.h +++ b/gfx/include/dxsdk/d3d11.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11DeviceChild_FWD_DEFINED__ #define __ID3D11DeviceChild_FWD_DEFINED__ @@ -294,10 +294,10 @@ typedef interface ID3D11Device ID3D11Device; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11_0000_0000 */ -/* [local] */ +/* [local] */ #ifndef _D3D11_CONSTANTS #define _D3D11_CONSTANTS @@ -1018,7 +1018,7 @@ struct CD3D11_DEFAULT {}; extern const DECLSPEC_SELECTANY CD3D11_DEFAULT D3D11_DEFAULT; extern "C"{ #endif -typedef +typedef enum D3D11_INPUT_CLASSIFICATION { D3D11_INPUT_PER_VERTEX_DATA = 0, @@ -1038,7 +1038,7 @@ typedef struct D3D11_INPUT_ELEMENT_DESC UINT InstanceDataStepRate; } D3D11_INPUT_ELEMENT_DESC; -typedef +typedef enum D3D11_FILL_MODE { D3D11_FILL_WIREFRAME = 2, @@ -1049,7 +1049,7 @@ typedef D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY; typedef D3D_PRIMITIVE D3D11_PRIMITIVE; -typedef +typedef enum D3D11_CULL_MODE { D3D11_CULL_NONE = 1, @@ -1105,7 +1105,7 @@ typedef struct D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS UINT StartInstanceLocation; } D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS; -typedef +typedef enum D3D11_RESOURCE_DIMENSION { D3D11_RESOURCE_DIMENSION_UNKNOWN = 0, @@ -1117,7 +1117,7 @@ enum D3D11_RESOURCE_DIMENSION typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; -typedef +typedef enum D3D11_DSV_DIMENSION { D3D11_DSV_DIMENSION_UNKNOWN = 0, @@ -1129,7 +1129,7 @@ enum D3D11_DSV_DIMENSION D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY = 6 } D3D11_DSV_DIMENSION; -typedef +typedef enum D3D11_RTV_DIMENSION { D3D11_RTV_DIMENSION_UNKNOWN = 0, @@ -1143,7 +1143,7 @@ enum D3D11_RTV_DIMENSION D3D11_RTV_DIMENSION_TEXTURE3D = 8 } D3D11_RTV_DIMENSION; -typedef +typedef enum D3D11_UAV_DIMENSION { D3D11_UAV_DIMENSION_UNKNOWN = 0, @@ -1155,7 +1155,7 @@ enum D3D11_UAV_DIMENSION D3D11_UAV_DIMENSION_TEXTURE3D = 8 } D3D11_UAV_DIMENSION; -typedef +typedef enum D3D11_USAGE { D3D11_USAGE_DEFAULT = 0, @@ -1164,7 +1164,7 @@ enum D3D11_USAGE D3D11_USAGE_STAGING = 3 } D3D11_USAGE; -typedef +typedef enum D3D11_BIND_FLAG { D3D11_BIND_VERTEX_BUFFER = 0x1L, @@ -1179,14 +1179,14 @@ enum D3D11_BIND_FLAG D3D11_BIND_VIDEO_ENCODER = 0x400L } D3D11_BIND_FLAG; -typedef +typedef enum D3D11_CPU_ACCESS_FLAG { D3D11_CPU_ACCESS_WRITE = 0x10000L, D3D11_CPU_ACCESS_READ = 0x20000L } D3D11_CPU_ACCESS_FLAG; -typedef +typedef enum D3D11_RESOURCE_MISC_FLAG { D3D11_RESOURCE_MISC_GENERATE_MIPS = 0x1L, @@ -1208,7 +1208,7 @@ enum D3D11_RESOURCE_MISC_FLAG D3D11_RESOURCE_MISC_HW_PROTECTED = 0x80000L } D3D11_RESOURCE_MISC_FLAG; -typedef +typedef enum D3D11_MAP { D3D11_MAP_READ = 1, @@ -1218,19 +1218,19 @@ enum D3D11_MAP D3D11_MAP_WRITE_NO_OVERWRITE = 5 } D3D11_MAP; -typedef +typedef enum D3D11_MAP_FLAG { D3D11_MAP_FLAG_DO_NOT_WAIT = 0x100000L } D3D11_MAP_FLAG; -typedef +typedef enum D3D11_RAISE_FLAG { D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1L } D3D11_RAISE_FLAG; -typedef +typedef enum D3D11_CLEAR_FLAG { D3D11_CLEAR_DEPTH = 0x1L, @@ -1325,93 +1325,92 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0000_v0_0_s_ifspec; #define __ID3D11DeviceChild_INTERFACE_DEFINED__ /* interface ID3D11DeviceChild */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceChild; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1841e5c8-16b0-489b-bcc8-44cfb0d5deae") ID3D11DeviceChild : public IUnknown { public: - virtual void STDMETHODCALLTYPE GetDevice( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDevice( + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceChildVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceChild * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceChild * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceChild * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceChild * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11DeviceChildVtbl; @@ -1420,30 +1419,28 @@ EXTERN_C const IID IID_ID3D11DeviceChild; CONST_VTBL struct ID3D11DeviceChildVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceChild_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceChild_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceChild_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceChild_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceChild_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceChild_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceChild_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -1452,9 +1449,9 @@ EXTERN_C const IID IID_ID3D11DeviceChild; #endif /* __ID3D11DeviceChild_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0001 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_COMPARISON_FUNC { D3D11_COMPARISON_NEVER = 1, @@ -1467,14 +1464,14 @@ enum D3D11_COMPARISON_FUNC D3D11_COMPARISON_ALWAYS = 8 } D3D11_COMPARISON_FUNC; -typedef +typedef enum D3D11_DEPTH_WRITE_MASK { D3D11_DEPTH_WRITE_MASK_ZERO = 0, D3D11_DEPTH_WRITE_MASK_ALL = 1 } D3D11_DEPTH_WRITE_MASK; -typedef +typedef enum D3D11_STENCIL_OP { D3D11_STENCIL_OP_KEEP = 1, @@ -1573,76 +1570,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0001_v0_0_s_ifspec; #define __ID3D11DepthStencilState_INTERFACE_DEFINED__ /* interface ID3D11DepthStencilState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DepthStencilState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("03823efb-8d8f-4e1c-9aa2-f64bb2cbfdf1") ID3D11DepthStencilState : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_DEPTH_STENCIL_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DepthStencilStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DepthStencilState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DepthStencilState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DepthStencilState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11DepthStencilState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_DEPTH_STENCIL_DESC *pDesc); - + END_INTERFACE } ID3D11DepthStencilStateVtbl; @@ -1651,33 +1647,31 @@ EXTERN_C const IID IID_ID3D11DepthStencilState; CONST_VTBL struct ID3D11DepthStencilStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DepthStencilState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DepthStencilState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DepthStencilState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DepthStencilState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DepthStencilState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DepthStencilState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DepthStencilState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DepthStencilState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1686,9 +1680,9 @@ EXTERN_C const IID IID_ID3D11DepthStencilState; #endif /* __ID3D11DepthStencilState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_BLEND { D3D11_BLEND_ZERO = 1, @@ -1710,7 +1704,7 @@ enum D3D11_BLEND D3D11_BLEND_INV_SRC1_ALPHA = 19 } D3D11_BLEND; -typedef +typedef enum D3D11_BLEND_OP { D3D11_BLEND_OP_ADD = 1, @@ -1720,14 +1714,14 @@ enum D3D11_BLEND_OP D3D11_BLEND_OP_MAX = 5 } D3D11_BLEND_OP; -typedef +typedef enum D3D11_COLOR_WRITE_ENABLE { D3D11_COLOR_WRITE_ENABLE_RED = 1, D3D11_COLOR_WRITE_ENABLE_GREEN = 2, D3D11_COLOR_WRITE_ENABLE_BLUE = 4, D3D11_COLOR_WRITE_ENABLE_ALPHA = 8, - D3D11_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN ) | D3D11_COLOR_WRITE_ENABLE_BLUE ) | D3D11_COLOR_WRITE_ENABLE_ALPHA ) + D3D11_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D11_COLOR_WRITE_ENABLE_RED | D3D11_COLOR_WRITE_ENABLE_GREEN ) | D3D11_COLOR_WRITE_ENABLE_BLUE ) | D3D11_COLOR_WRITE_ENABLE_ALPHA ) } D3D11_COLOR_WRITE_ENABLE; typedef struct D3D11_RENDER_TARGET_BLEND_DESC @@ -1749,7 +1743,7 @@ typedef struct D3D11_BLEND_DESC D3D11_RENDER_TARGET_BLEND_DESC RenderTarget[ 8 ]; } D3D11_BLEND_DESC; -/* Note, the array size for RenderTarget[] above is D3D11_SIMULTANEOUS_RENDERTARGET_COUNT. +/* Note, the array size for RenderTarget[] above is D3D11_SIMULTANEOUS_RENDERTARGET_COUNT. IDL processing/generation of this header replaces the define; this comment is merely explaining what happened. */ #if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus ) } @@ -1787,76 +1781,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0002_v0_0_s_ifspec; #define __ID3D11BlendState_INTERFACE_DEFINED__ /* interface ID3D11BlendState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11BlendState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("75b68faa-347d-4159-8f45-a0640f01cd9a") ID3D11BlendState : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_BLEND_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11BlendStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11BlendState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11BlendState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11BlendState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11BlendState * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11BlendState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11BlendState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_BLEND_DESC *pDesc); - + END_INTERFACE } ID3D11BlendStateVtbl; @@ -1865,33 +1858,31 @@ EXTERN_C const IID IID_ID3D11BlendState; CONST_VTBL struct ID3D11BlendStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11BlendState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11BlendState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11BlendState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11BlendState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11BlendState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11BlendState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11BlendState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11BlendState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -1900,7 +1891,7 @@ EXTERN_C const IID IID_ID3D11BlendState; #endif /* __ID3D11BlendState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0003 */ -/* [local] */ +/* [local] */ typedef struct D3D11_RASTERIZER_DESC { @@ -1974,76 +1965,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0003_v0_0_s_ifspec; #define __ID3D11RasterizerState_INTERFACE_DEFINED__ /* interface ID3D11RasterizerState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RasterizerState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9bb4ab81-ab1a-4d8f-b506-fc04200b6ee7") ID3D11RasterizerState : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RasterizerStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RasterizerState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RasterizerState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RasterizerState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11RasterizerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC *pDesc); - + END_INTERFACE } ID3D11RasterizerStateVtbl; @@ -2052,33 +2042,31 @@ EXTERN_C const IID IID_ID3D11RasterizerState; CONST_VTBL struct ID3D11RasterizerStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RasterizerState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RasterizerState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RasterizerState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RasterizerState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11RasterizerState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11RasterizerState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11RasterizerState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11RasterizerState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2087,7 +2075,7 @@ EXTERN_C const IID IID_ID3D11RasterizerState; #endif /* __ID3D11RasterizerState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0004 */ -/* [local] */ +/* [local] */ #if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus ) } @@ -2116,90 +2104,89 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0004_v0_0_s_ifspec; #define __ID3D11Resource_INTERFACE_DEFINED__ /* interface ID3D11Resource */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Resource; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("dc8e63f3-d12b-4952-b47b-5e45026a862d") ID3D11Resource : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetType( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetType( + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension) = 0; - - virtual void STDMETHODCALLTYPE SetEvictionPriority( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetEvictionPriority( + /* [annotation] */ _In_ UINT EvictionPriority) = 0; - + virtual UINT STDMETHODCALLTYPE GetEvictionPriority( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ResourceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Resource * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Resource * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Resource * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Resource * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Resource * This); - + END_INTERFACE } ID3D11ResourceVtbl; @@ -2208,39 +2195,37 @@ EXTERN_C const IID IID_ID3D11Resource; CONST_VTBL struct ID3D11ResourceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Resource_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Resource_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Resource_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Resource_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Resource_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Resource_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Resource_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Resource_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Resource_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Resource_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #endif /* COBJMACROS */ @@ -2249,7 +2234,7 @@ EXTERN_C const IID IID_ID3D11Resource; #endif /* __ID3D11Resource_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0005 */ -/* [local] */ +/* [local] */ typedef struct D3D11_BUFFER_DESC { @@ -2298,89 +2283,88 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0005_v0_0_s_ifspec; #define __ID3D11Buffer_INTERFACE_DEFINED__ /* interface ID3D11Buffer */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Buffer; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("48570b85-d1ee-4fcd-a250-eb350722b037") ID3D11Buffer : public ID3D11Resource { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_BUFFER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11BufferVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Buffer * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Buffer * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Buffer * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Buffer * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Buffer * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_BUFFER_DESC *pDesc); - + END_INTERFACE } ID3D11BufferVtbl; @@ -2389,42 +2373,40 @@ EXTERN_C const IID IID_ID3D11Buffer; CONST_VTBL struct ID3D11BufferVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Buffer_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Buffer_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Buffer_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Buffer_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Buffer_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Buffer_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Buffer_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Buffer_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Buffer_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Buffer_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Buffer_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2433,7 +2415,7 @@ EXTERN_C const IID IID_ID3D11Buffer; #endif /* __ID3D11Buffer_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0006 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEXTURE1D_DESC { @@ -2488,89 +2470,88 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0006_v0_0_s_ifspec; #define __ID3D11Texture1D_INTERFACE_DEFINED__ /* interface ID3D11Texture1D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Texture1D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("f8fb5c27-c6b3-4f75-a4c8-439af2ef564c") ID3D11Texture1D : public ID3D11Resource { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_TEXTURE1D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Texture1DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Texture1D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Texture1D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Texture1D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Texture1D * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Texture1D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE1D_DESC *pDesc); - + END_INTERFACE } ID3D11Texture1DVtbl; @@ -2579,42 +2560,40 @@ EXTERN_C const IID IID_ID3D11Texture1D; CONST_VTBL struct ID3D11Texture1DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Texture1D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Texture1D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Texture1D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Texture1D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Texture1D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Texture1D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Texture1D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Texture1D_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Texture1D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Texture1D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Texture1D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2623,7 +2602,7 @@ EXTERN_C const IID IID_ID3D11Texture1D; #endif /* __ID3D11Texture1D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0007 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEXTURE2D_DESC { @@ -2686,89 +2665,88 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0007_v0_0_s_ifspec; #define __ID3D11Texture2D_INTERFACE_DEFINED__ /* interface ID3D11Texture2D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Texture2D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6f15aaf2-d208-4e89-9ab4-489535d34f9c") ID3D11Texture2D : public ID3D11Resource { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_TEXTURE2D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Texture2DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Texture2D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Texture2D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Texture2D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Texture2D * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Texture2D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE2D_DESC *pDesc); - + END_INTERFACE } ID3D11Texture2DVtbl; @@ -2777,42 +2755,40 @@ EXTERN_C const IID IID_ID3D11Texture2D; CONST_VTBL struct ID3D11Texture2DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Texture2D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Texture2D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Texture2D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Texture2D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Texture2D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Texture2D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Texture2D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Texture2D_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Texture2D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Texture2D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Texture2D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -2821,7 +2797,7 @@ EXTERN_C const IID IID_ID3D11Texture2D; #endif /* __ID3D11Texture2D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0008 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEXTURE3D_DESC { @@ -2879,89 +2855,88 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0008_v0_0_s_ifspec; #define __ID3D11Texture3D_INTERFACE_DEFINED__ /* interface ID3D11Texture3D */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Texture3D; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("037e866e-f56d-4357-a8af-9dabbe6e250e") ID3D11Texture3D : public ID3D11Resource { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_TEXTURE3D_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Texture3DVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Texture3D * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Texture3D * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Texture3D * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Texture3D * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Texture3D * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE3D_DESC *pDesc); - + END_INTERFACE } ID3D11Texture3DVtbl; @@ -2970,42 +2945,40 @@ EXTERN_C const IID IID_ID3D11Texture3D; CONST_VTBL struct ID3D11Texture3DVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Texture3D_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Texture3D_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Texture3D_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Texture3D_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Texture3D_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Texture3D_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Texture3D_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Texture3D_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Texture3D_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Texture3D_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Texture3D_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3014,9 +2987,9 @@ EXTERN_C const IID IID_ID3D11Texture3D; #endif /* __ID3D11Texture3D_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0009 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_TEXTURECUBE_FACE { D3D11_TEXTURECUBE_FACE_POSITIVE_X = 0, @@ -3034,76 +3007,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0009_v0_0_s_ifspec; #define __ID3D11View_INTERFACE_DEFINED__ /* interface ID3D11View */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11View; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("839d1216-bb2e-412b-b7f4-a9dbebe08ed1") ID3D11View : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetResource( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetResource( + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11View * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11View * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11View * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11View * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11View * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11View * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - + END_INTERFACE } ID3D11ViewVtbl; @@ -3112,33 +3084,31 @@ EXTERN_C const IID IID_ID3D11View; CONST_VTBL struct ID3D11ViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11View_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11View_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11View_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11View_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11View_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11View_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11View_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11View_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #endif /* COBJMACROS */ @@ -3147,23 +3117,23 @@ EXTERN_C const IID IID_ID3D11View; #endif /* __ID3D11View_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0010 */ -/* [local] */ +/* [local] */ typedef struct D3D11_BUFFER_SRV { - union + union { UINT FirstElement; UINT ElementOffset; } ; - union + union { UINT NumElements; UINT ElementWidth; } ; } D3D11_BUFFER_SRV; -typedef +typedef enum D3D11_BUFFEREX_SRV_FLAG { D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1 @@ -3239,7 +3209,7 @@ typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC { DXGI_FORMAT Format; D3D11_SRV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_SRV Buffer; D3D11_TEX1D_SRV Texture1D; @@ -3387,7 +3357,7 @@ struct CD3D11_SHADER_RESOURCE_VIEW_DESC : public D3D11_SHADER_RESOURCE_VIEW_DESC UINT arraySize = -1 ) // NumCubes for TEXTURECUBEARRAY { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == mipLevels && D3D11_SRV_DIMENSION_TEXTURE2DMS != viewDimension && D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY != viewDimension) || @@ -3469,81 +3439,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0010_v0_0_s_ifspec; #define __ID3D11ShaderResourceView_INTERFACE_DEFINED__ /* interface ID3D11ShaderResourceView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ShaderResourceView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("b0e06fe0-8192-4e1a-b1ca-36d7414710b2") ID3D11ShaderResourceView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ShaderResourceViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ShaderResourceView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ShaderResourceView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ShaderResourceView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11ShaderResourceView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11ShaderResourceViewVtbl; @@ -3552,36 +3521,34 @@ EXTERN_C const IID IID_ID3D11ShaderResourceView; CONST_VTBL struct ID3D11ShaderResourceViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ShaderResourceView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ShaderResourceView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ShaderResourceView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ShaderResourceView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11ShaderResourceView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11ShaderResourceView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11ShaderResourceView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11ShaderResourceView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11ShaderResourceView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3590,16 +3557,16 @@ EXTERN_C const IID IID_ID3D11ShaderResourceView; #endif /* __ID3D11ShaderResourceView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0011 */ -/* [local] */ +/* [local] */ typedef struct D3D11_BUFFER_RTV { - union + union { UINT FirstElement; UINT ElementOffset; } ; - union + union { UINT NumElements; UINT ElementWidth; @@ -3652,7 +3619,7 @@ typedef struct D3D11_RENDER_TARGET_VIEW_DESC { DXGI_FORMAT Format; D3D11_RTV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_RTV Buffer; D3D11_TEX1D_RTV Texture1D; @@ -3770,7 +3737,7 @@ struct CD3D11_RENDER_TARGET_VIEW_DESC : public D3D11_RENDER_TARGET_VIEW_DESC UINT arraySize = -1 ) { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == arraySize && (D3D11_RTV_DIMENSION_TEXTURE2DARRAY == viewDimension || D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY == viewDimension))) @@ -3833,81 +3800,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0011_v0_0_s_ifspec; #define __ID3D11RenderTargetView_INTERFACE_DEFINED__ /* interface ID3D11RenderTargetView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RenderTargetView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("dfdba067-0b8d-4865-875b-d7b4516cc164") ID3D11RenderTargetView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_RENDER_TARGET_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RenderTargetViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RenderTargetView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RenderTargetView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RenderTargetView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11RenderTargetView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RENDER_TARGET_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11RenderTargetViewVtbl; @@ -3916,36 +3882,34 @@ EXTERN_C const IID IID_ID3D11RenderTargetView; CONST_VTBL struct ID3D11RenderTargetViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RenderTargetView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RenderTargetView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RenderTargetView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RenderTargetView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11RenderTargetView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11RenderTargetView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11RenderTargetView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11RenderTargetView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11RenderTargetView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -3954,7 +3918,7 @@ EXTERN_C const IID IID_ID3D11RenderTargetView; #endif /* __ID3D11RenderTargetView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0012 */ -/* [local] */ +/* [local] */ #if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus ) } @@ -4138,7 +4102,7 @@ typedef struct D3D11_TEX2DMS_ARRAY_DSV UINT ArraySize; } D3D11_TEX2DMS_ARRAY_DSV; -typedef +typedef enum D3D11_DSV_FLAG { D3D11_DSV_READ_ONLY_DEPTH = 0x1L, @@ -4150,7 +4114,7 @@ typedef struct D3D11_DEPTH_STENCIL_VIEW_DESC DXGI_FORMAT Format; D3D11_DSV_DIMENSION ViewDimension; UINT Flags; - union + union { D3D11_TEX1D_DSV Texture1D; D3D11_TEX1D_ARRAY_DSV Texture1DArray; @@ -4252,7 +4216,7 @@ struct CD3D11_DEPTH_STENCIL_VIEW_DESC : public D3D11_DEPTH_STENCIL_VIEW_DESC { ViewDimension = viewDimension; Flags = flags; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == arraySize && (D3D11_DSV_DIMENSION_TEXTURE2DARRAY == viewDimension || D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY == viewDimension))) @@ -4295,81 +4259,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0012_v0_0_s_ifspec; #define __ID3D11DepthStencilView_INTERFACE_DEFINED__ /* interface ID3D11DepthStencilView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DepthStencilView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9fdac92a-1876-48c3-afad-25b94f84a9b6") ID3D11DepthStencilView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DepthStencilViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DepthStencilView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DepthStencilView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DepthStencilView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11DepthStencilView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11DepthStencilViewVtbl; @@ -4378,36 +4341,34 @@ EXTERN_C const IID IID_ID3D11DepthStencilView; CONST_VTBL struct ID3D11DepthStencilViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DepthStencilView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DepthStencilView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DepthStencilView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DepthStencilView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DepthStencilView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DepthStencilView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DepthStencilView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DepthStencilView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11DepthStencilView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -4416,9 +4377,9 @@ EXTERN_C const IID IID_ID3D11DepthStencilView; #endif /* __ID3D11DepthStencilView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0013 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_BUFFER_UAV_FLAG { D3D11_BUFFER_UAV_FLAG_RAW = 0x1, @@ -4468,7 +4429,7 @@ typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC { DXGI_FORMAT Format; D3D11_UAV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_UAV Buffer; D3D11_TEX1D_UAV Texture1D; @@ -4582,7 +4543,7 @@ struct CD3D11_UNORDERED_ACCESS_VIEW_DESC : public D3D11_UNORDERED_ACCESS_VIEW_DE UINT arraySize = -1 ) { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == arraySize && D3D11_UAV_DIMENSION_TEXTURE2DARRAY == viewDimension)) { D3D11_TEXTURE2D_DESC TexDesc; @@ -4637,81 +4598,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0013_v0_0_s_ifspec; #define __ID3D11UnorderedAccessView_INTERFACE_DEFINED__ /* interface ID3D11UnorderedAccessView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11UnorderedAccessView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("28acf509-7f5c-48f6-8611-f316010a6380") ID3D11UnorderedAccessView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11UnorderedAccessViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11UnorderedAccessView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11UnorderedAccessView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11UnorderedAccessView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11UnorderedAccessView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11UnorderedAccessViewVtbl; @@ -4720,36 +4680,34 @@ EXTERN_C const IID IID_ID3D11UnorderedAccessView; CONST_VTBL struct ID3D11UnorderedAccessViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11UnorderedAccessView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11UnorderedAccessView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11UnorderedAccessView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11UnorderedAccessView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11UnorderedAccessView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11UnorderedAccessView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11UnorderedAccessView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11UnorderedAccessView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11UnorderedAccessView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -4761,67 +4719,66 @@ EXTERN_C const IID IID_ID3D11UnorderedAccessView; #define __ID3D11VertexShader_INTERFACE_DEFINED__ /* interface ID3D11VertexShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VertexShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3b301d64-d678-4289-8897-22f8928b72f3") ID3D11VertexShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11VertexShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VertexShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VertexShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VertexShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VertexShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VertexShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11VertexShaderVtbl; @@ -4830,30 +4787,28 @@ EXTERN_C const IID IID_ID3D11VertexShader; CONST_VTBL struct ID3D11VertexShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VertexShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VertexShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VertexShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VertexShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VertexShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VertexShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VertexShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -4865,67 +4820,66 @@ EXTERN_C const IID IID_ID3D11VertexShader; #define __ID3D11HullShader_INTERFACE_DEFINED__ /* interface ID3D11HullShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11HullShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8e5c6061-628a-4c8e-8264-bbe45cb3d5dd") ID3D11HullShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11HullShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11HullShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11HullShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11HullShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11HullShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11HullShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11HullShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11HullShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11HullShaderVtbl; @@ -4934,30 +4888,28 @@ EXTERN_C const IID IID_ID3D11HullShader; CONST_VTBL struct ID3D11HullShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11HullShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11HullShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11HullShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11HullShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11HullShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11HullShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11HullShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -4969,67 +4921,66 @@ EXTERN_C const IID IID_ID3D11HullShader; #define __ID3D11DomainShader_INTERFACE_DEFINED__ /* interface ID3D11DomainShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DomainShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("f582c508-0f36-490c-9977-31eece268cfa") ID3D11DomainShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11DomainShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DomainShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DomainShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DomainShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DomainShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DomainShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DomainShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DomainShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11DomainShaderVtbl; @@ -5038,30 +4989,28 @@ EXTERN_C const IID IID_ID3D11DomainShader; CONST_VTBL struct ID3D11DomainShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DomainShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DomainShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DomainShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DomainShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DomainShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DomainShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DomainShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -5073,67 +5022,66 @@ EXTERN_C const IID IID_ID3D11DomainShader; #define __ID3D11GeometryShader_INTERFACE_DEFINED__ /* interface ID3D11GeometryShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11GeometryShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("38325b96-effb-4022-ba02-2e795b70275c") ID3D11GeometryShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11GeometryShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11GeometryShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11GeometryShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11GeometryShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11GeometryShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11GeometryShaderVtbl; @@ -5142,30 +5090,28 @@ EXTERN_C const IID IID_ID3D11GeometryShader; CONST_VTBL struct ID3D11GeometryShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11GeometryShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11GeometryShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11GeometryShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11GeometryShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11GeometryShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11GeometryShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11GeometryShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -5177,67 +5123,66 @@ EXTERN_C const IID IID_ID3D11GeometryShader; #define __ID3D11PixelShader_INTERFACE_DEFINED__ /* interface ID3D11PixelShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11PixelShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("ea82e40d-51dc-4f33-93d4-db7c9125ae8c") ID3D11PixelShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11PixelShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11PixelShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11PixelShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11PixelShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11PixelShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11PixelShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11PixelShaderVtbl; @@ -5246,30 +5191,28 @@ EXTERN_C const IID IID_ID3D11PixelShader; CONST_VTBL struct ID3D11PixelShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11PixelShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11PixelShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11PixelShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11PixelShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11PixelShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11PixelShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11PixelShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -5281,67 +5224,66 @@ EXTERN_C const IID IID_ID3D11PixelShader; #define __ID3D11ComputeShader_INTERFACE_DEFINED__ /* interface ID3D11ComputeShader */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ComputeShader; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("4f5b196e-c2bd-495e-bd01-1fded38e4969") ID3D11ComputeShader : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11ComputeShaderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ComputeShader * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ComputeShader * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ComputeShader * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11ComputeShader * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11ComputeShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11ComputeShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11ComputeShader * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11ComputeShaderVtbl; @@ -5350,30 +5292,28 @@ EXTERN_C const IID IID_ID3D11ComputeShader; CONST_VTBL struct ID3D11ComputeShaderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ComputeShader_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ComputeShader_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ComputeShader_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ComputeShader_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11ComputeShader_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11ComputeShader_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11ComputeShader_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -5385,67 +5325,66 @@ EXTERN_C const IID IID_ID3D11ComputeShader; #define __ID3D11InputLayout_INTERFACE_DEFINED__ /* interface ID3D11InputLayout */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11InputLayout; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("e4819ddc-4cf0-4025-bd26-5de82a3e07b7") ID3D11InputLayout : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D11InputLayoutVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11InputLayout * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11InputLayout * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11InputLayout * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11InputLayout * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11InputLayout * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11InputLayoutVtbl; @@ -5454,30 +5393,28 @@ EXTERN_C const IID IID_ID3D11InputLayout; CONST_VTBL struct ID3D11InputLayoutVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11InputLayout_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11InputLayout_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11InputLayout_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11InputLayout_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11InputLayout_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11InputLayout_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11InputLayout_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -5486,9 +5423,9 @@ EXTERN_C const IID IID_ID3D11InputLayout; #endif /* __ID3D11InputLayout_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0021 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_FILTER { D3D11_FILTER_MIN_MAG_MIP_POINT = 0, @@ -5529,14 +5466,14 @@ enum D3D11_FILTER D3D11_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5 } D3D11_FILTER; -typedef +typedef enum D3D11_FILTER_TYPE { D3D11_FILTER_TYPE_POINT = 0, D3D11_FILTER_TYPE_LINEAR = 1 } D3D11_FILTER_TYPE; -typedef +typedef enum D3D11_FILTER_REDUCTION_TYPE { D3D11_FILTER_REDUCTION_TYPE_STANDARD = 0, @@ -5557,9 +5494,9 @@ enum D3D11_FILTER_REDUCTION_TYPE #define D3D11_MIP_FILTER_SHIFT ( 0 ) -// D3D11_COMPARISON_FILTERING_BIT is no longer used / meaningless. The D3D11_FILTER_REDUCTION_TYPE enum replaced it. -// Old code that uses D3D11_COMPARISON_FILTERING_BIT and would never use D3D11_FILTER_MINIMUM_* or D3D11_FILTER_MAXIMUM_* -// will still work fine though, so the define is left to avoid breaks. +// D3D11_COMPARISON_FILTERING_BIT is no longer used / meaningless. The D3D11_FILTER_REDUCTION_TYPE enum replaced it. +// Old code that uses D3D11_COMPARISON_FILTERING_BIT and would never use D3D11_FILTER_MINIMUM_* or D3D11_FILTER_MAXIMUM_* +// will still work fine though, so the define is left to avoid breaks. #define D3D11_COMPARISON_FILTERING_BIT ( 0x80 ) #define D3D11_ANISOTROPIC_FILTERING_BIT ( 0x40 ) @@ -5569,34 +5506,34 @@ enum D3D11_FILTER_REDUCTION_TYPE ( ( ( min ) & D3D11_FILTER_TYPE_MASK ) << D3D11_MIN_FILTER_SHIFT ) | \ ( ( ( mag ) & D3D11_FILTER_TYPE_MASK ) << D3D11_MAG_FILTER_SHIFT ) | \ ( ( ( mip ) & D3D11_FILTER_TYPE_MASK ) << D3D11_MIP_FILTER_SHIFT ) | \ - ( ( ( reduction ) & D3D11_FILTER_REDUCTION_TYPE_MASK ) << D3D11_FILTER_REDUCTION_TYPE_SHIFT ) ) ) + ( ( ( reduction ) & D3D11_FILTER_REDUCTION_TYPE_MASK ) << D3D11_FILTER_REDUCTION_TYPE_SHIFT ) ) ) #define D3D11_ENCODE_ANISOTROPIC_FILTER( reduction ) \ ( ( D3D11_FILTER ) ( \ D3D11_ANISOTROPIC_FILTERING_BIT | \ D3D11_ENCODE_BASIC_FILTER( D3D11_FILTER_TYPE_LINEAR, \ D3D11_FILTER_TYPE_LINEAR, \ D3D11_FILTER_TYPE_LINEAR, \ - reduction ) ) ) + reduction ) ) ) #define D3D11_DECODE_MIN_FILTER( d3d11Filter ) \ ( ( D3D11_FILTER_TYPE ) \ - ( ( ( d3d11Filter ) >> D3D11_MIN_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) + ( ( ( d3d11Filter ) >> D3D11_MIN_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) #define D3D11_DECODE_MAG_FILTER( d3d11Filter ) \ ( ( D3D11_FILTER_TYPE ) \ - ( ( ( d3d11Filter ) >> D3D11_MAG_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) + ( ( ( d3d11Filter ) >> D3D11_MAG_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) #define D3D11_DECODE_MIP_FILTER( d3d11Filter ) \ ( ( D3D11_FILTER_TYPE ) \ - ( ( ( d3d11Filter ) >> D3D11_MIP_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) + ( ( ( d3d11Filter ) >> D3D11_MIP_FILTER_SHIFT ) & D3D11_FILTER_TYPE_MASK ) ) #define D3D11_DECODE_FILTER_REDUCTION( d3d11Filter ) \ ( ( D3D11_FILTER_REDUCTION_TYPE ) \ - ( ( ( d3d11Filter ) >> D3D11_FILTER_REDUCTION_TYPE_SHIFT ) & D3D11_FILTER_REDUCTION_TYPE_MASK ) ) + ( ( ( d3d11Filter ) >> D3D11_FILTER_REDUCTION_TYPE_SHIFT ) & D3D11_FILTER_REDUCTION_TYPE_MASK ) ) #define D3D11_DECODE_IS_COMPARISON_FILTER( d3d11Filter ) \ - ( D3D11_DECODE_FILTER_REDUCTION( d3d11Filter ) == D3D11_FILTER_REDUCTION_TYPE_COMPARISON ) + ( D3D11_DECODE_FILTER_REDUCTION( d3d11Filter ) == D3D11_FILTER_REDUCTION_TYPE_COMPARISON ) #define D3D11_DECODE_IS_ANISOTROPIC_FILTER( d3d11Filter ) \ ( ( ( d3d11Filter ) & D3D11_ANISOTROPIC_FILTERING_BIT ) && \ ( D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIN_FILTER( d3d11Filter ) ) && \ ( D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MAG_FILTER( d3d11Filter ) ) && \ - ( D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIP_FILTER( d3d11Filter ) ) ) -typedef + ( D3D11_FILTER_TYPE_LINEAR == D3D11_DECODE_MIP_FILTER( d3d11Filter ) ) ) +typedef enum D3D11_TEXTURE_ADDRESS_MODE { D3D11_TEXTURE_ADDRESS_WRAP = 1, @@ -5686,76 +5623,75 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0021_v0_0_s_ifspec; #define __ID3D11SamplerState_INTERFACE_DEFINED__ /* interface ID3D11SamplerState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11SamplerState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("da6fea51-564c-4487-9810-f0d0f9b4e3a5") ID3D11SamplerState : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_SAMPLER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11SamplerStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11SamplerState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11SamplerState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11SamplerState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11SamplerState * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11SamplerState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11SamplerState * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_SAMPLER_DESC *pDesc); - + END_INTERFACE } ID3D11SamplerStateVtbl; @@ -5764,33 +5700,31 @@ EXTERN_C const IID IID_ID3D11SamplerState; CONST_VTBL struct ID3D11SamplerStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11SamplerState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11SamplerState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11SamplerState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11SamplerState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11SamplerState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11SamplerState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11SamplerState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11SamplerState_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -5799,9 +5733,9 @@ EXTERN_C const IID IID_ID3D11SamplerState; #endif /* __ID3D11SamplerState_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0022 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_FORMAT_SUPPORT { D3D11_FORMAT_SUPPORT_BUFFER = 0x1, @@ -5837,7 +5771,7 @@ enum D3D11_FORMAT_SUPPORT D3D11_FORMAT_SUPPORT_VIDEO_ENCODER = 0x40000000 } D3D11_FORMAT_SUPPORT; -typedef +typedef enum D3D11_FORMAT_SUPPORT2 { D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x1, @@ -5861,72 +5795,71 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0022_v0_0_s_ifspec; #define __ID3D11Asynchronous_INTERFACE_DEFINED__ /* interface ID3D11Asynchronous */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Asynchronous; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("4b35d0cd-1e15-4258-9c98-1b1333f6dd3b") ID3D11Asynchronous : public ID3D11DeviceChild { public: virtual UINT STDMETHODCALLTYPE GetDataSize( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11AsynchronousVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Asynchronous * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Asynchronous * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Asynchronous * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Asynchronous * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D11Asynchronous * This); - + END_INTERFACE } ID3D11AsynchronousVtbl; @@ -5935,33 +5868,31 @@ EXTERN_C const IID IID_ID3D11Asynchronous; CONST_VTBL struct ID3D11AsynchronousVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Asynchronous_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Asynchronous_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Asynchronous_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Asynchronous_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Asynchronous_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Asynchronous_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Asynchronous_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Asynchronous_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #endif /* COBJMACROS */ @@ -5970,15 +5901,15 @@ EXTERN_C const IID IID_ID3D11Asynchronous; #endif /* __ID3D11Asynchronous_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0023 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_ASYNC_GETDATA_FLAG { D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x1 } D3D11_ASYNC_GETDATA_FLAG; -typedef +typedef enum D3D11_QUERY { D3D11_QUERY_EVENT = 0, @@ -5996,10 +5927,10 @@ enum D3D11_QUERY D3D11_QUERY_SO_STATISTICS_STREAM2 = ( D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 + 1 ) , D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 = ( D3D11_QUERY_SO_STATISTICS_STREAM2 + 1 ) , D3D11_QUERY_SO_STATISTICS_STREAM3 = ( D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 + 1 ) , - D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 = ( D3D11_QUERY_SO_STATISTICS_STREAM3 + 1 ) + D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 = ( D3D11_QUERY_SO_STATISTICS_STREAM3 + 1 ) } D3D11_QUERY; -typedef +typedef enum D3D11_QUERY_MISC_FLAG { D3D11_QUERY_MISC_PREDICATEHINT = 0x1 @@ -6040,79 +5971,78 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0023_v0_0_s_ifspec; #define __ID3D11Query_INTERFACE_DEFINED__ /* interface ID3D11Query */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Query; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("d6c00747-87b7-425e-b84d-44d108560afd") ID3D11Query : public ID3D11Asynchronous { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_QUERY_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11QueryVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Query * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Query * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Query * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Query * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Query * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D11Query * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Query * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_QUERY_DESC *pDesc); - + END_INTERFACE } ID3D11QueryVtbl; @@ -6121,36 +6051,34 @@ EXTERN_C const IID IID_ID3D11Query; CONST_VTBL struct ID3D11QueryVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Query_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Query_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Query_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Query_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Query_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Query_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Query_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Query_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D11Query_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -6162,75 +6090,74 @@ EXTERN_C const IID IID_ID3D11Query; #define __ID3D11Predicate_INTERFACE_DEFINED__ /* interface ID3D11Predicate */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Predicate; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9eb576dd-9f77-4d86-81aa-8bab5fe490e2") ID3D11Predicate : public ID3D11Query { public: }; - - + #else /* C style interface */ typedef struct ID3D11PredicateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Predicate * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Predicate * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Predicate * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Predicate * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Predicate * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D11Predicate * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Predicate * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_QUERY_DESC *pDesc); - + END_INTERFACE } ID3D11PredicateVtbl; @@ -6239,36 +6166,34 @@ EXTERN_C const IID IID_ID3D11Predicate; CONST_VTBL struct ID3D11PredicateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Predicate_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Predicate_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Predicate_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Predicate_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Predicate_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Predicate_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Predicate_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Predicate_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D11Predicate_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -6277,7 +6202,7 @@ EXTERN_C const IID IID_ID3D11Predicate; #endif /* __ID3D11Predicate_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0025 */ -/* [local] */ +/* [local] */ typedef struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT { @@ -6306,19 +6231,19 @@ typedef struct D3D11_QUERY_DATA_SO_STATISTICS UINT64 PrimitivesStorageNeeded; } D3D11_QUERY_DATA_SO_STATISTICS; -typedef +typedef enum D3D11_COUNTER { D3D11_COUNTER_DEVICE_DEPENDENT_0 = 0x40000000 } D3D11_COUNTER; -typedef +typedef enum D3D11_COUNTER_TYPE { D3D11_COUNTER_TYPE_FLOAT32 = 0, D3D11_COUNTER_TYPE_UINT16 = ( D3D11_COUNTER_TYPE_FLOAT32 + 1 ) , D3D11_COUNTER_TYPE_UINT32 = ( D3D11_COUNTER_TYPE_UINT16 + 1 ) , - D3D11_COUNTER_TYPE_UINT64 = ( D3D11_COUNTER_TYPE_UINT32 + 1 ) + D3D11_COUNTER_TYPE_UINT64 = ( D3D11_COUNTER_TYPE_UINT32 + 1 ) } D3D11_COUNTER_TYPE; typedef struct D3D11_COUNTER_DESC @@ -6362,79 +6287,78 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0025_v0_0_s_ifspec; #define __ID3D11Counter_INTERFACE_DEFINED__ /* interface ID3D11Counter */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Counter; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6e8c49fb-a371-4770-b440-29086022b741") ID3D11Counter : public ID3D11Asynchronous { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_COUNTER_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11CounterVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Counter * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Counter * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Counter * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Counter * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Counter * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D11Counter * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Counter * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_DESC *pDesc); - + END_INTERFACE } ID3D11CounterVtbl; @@ -6443,36 +6367,34 @@ EXTERN_C const IID IID_ID3D11Counter; CONST_VTBL struct ID3D11CounterVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Counter_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Counter_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Counter_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Counter_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Counter_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Counter_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Counter_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Counter_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D11Counter_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -6481,20 +6403,20 @@ EXTERN_C const IID IID_ID3D11Counter; #endif /* __ID3D11Counter_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0026 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS { D3D11_STANDARD_MULTISAMPLE_PATTERN = 0xffffffff, D3D11_CENTER_MULTISAMPLE_PATTERN = 0xfffffffe } D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS; -typedef +typedef enum D3D11_DEVICE_CONTEXT_TYPE { D3D11_DEVICE_CONTEXT_IMMEDIATE = 0, - D3D11_DEVICE_CONTEXT_DEFERRED = ( D3D11_DEVICE_CONTEXT_IMMEDIATE + 1 ) + D3D11_DEVICE_CONTEXT_DEFERRED = ( D3D11_DEVICE_CONTEXT_IMMEDIATE + 1 ) } D3D11_DEVICE_CONTEXT_TYPE; typedef struct D3D11_CLASS_INSTANCE_DESC @@ -6516,111 +6438,110 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0026_v0_0_s_ifspec; #define __ID3D11ClassInstance_INTERFACE_DEFINED__ /* interface ID3D11ClassInstance */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ClassInstance; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a6cd7faa-b0b7-4a2f-9436-8662a65797cb") ID3D11ClassInstance : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetClassLinkage( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetClassLinkage( + /* [annotation] */ _Outptr_ ID3D11ClassLinkage **ppLinkage) = 0; - - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_CLASS_INSTANCE_DESC *pDesc) = 0; - - virtual void STDMETHODCALLTYPE GetInstanceName( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetInstanceName( + /* [annotation] */ _Out_writes_opt_(*pBufferLength) LPSTR pInstanceName, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pBufferLength) = 0; - - virtual void STDMETHODCALLTYPE GetTypeName( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetTypeName( + /* [annotation] */ _Out_writes_opt_(*pBufferLength) LPSTR pTypeName, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pBufferLength) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ClassInstanceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ClassInstance * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ClassInstance * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ClassInstance * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetClassLinkage )( + + void ( STDMETHODCALLTYPE *GetClassLinkage )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11ClassLinkage **ppLinkage); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_CLASS_INSTANCE_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetInstanceName )( + + void ( STDMETHODCALLTYPE *GetInstanceName )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pBufferLength) LPSTR pInstanceName, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pBufferLength); - - void ( STDMETHODCALLTYPE *GetTypeName )( + + void ( STDMETHODCALLTYPE *GetTypeName )( ID3D11ClassInstance * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pBufferLength) LPSTR pTypeName, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pBufferLength); - + END_INTERFACE } ID3D11ClassInstanceVtbl; @@ -6629,42 +6550,40 @@ EXTERN_C const IID IID_ID3D11ClassInstance; CONST_VTBL struct ID3D11ClassInstanceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ClassInstance_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ClassInstance_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ClassInstance_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ClassInstance_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11ClassInstance_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11ClassInstance_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11ClassInstance_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11ClassInstance_GetClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> GetClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> GetClassLinkage(This,ppLinkage) ) #define ID3D11ClassInstance_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11ClassInstance_GetInstanceName(This,pInstanceName,pBufferLength) \ - ( (This)->lpVtbl -> GetInstanceName(This,pInstanceName,pBufferLength) ) + ( (This)->lpVtbl -> GetInstanceName(This,pInstanceName,pBufferLength) ) #define ID3D11ClassInstance_GetTypeName(This,pTypeName,pBufferLength) \ - ( (This)->lpVtbl -> GetTypeName(This,pTypeName,pBufferLength) ) + ( (This)->lpVtbl -> GetTypeName(This,pTypeName,pBufferLength) ) #endif /* COBJMACROS */ @@ -6676,113 +6595,112 @@ EXTERN_C const IID IID_ID3D11ClassInstance; #define __ID3D11ClassLinkage_INTERFACE_DEFINED__ /* interface ID3D11ClassLinkage */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ClassLinkage; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("ddf57cba-9543-46e4-a12b-f207a0fe7fed") ID3D11ClassLinkage : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE GetClassInstance( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetClassInstance( + /* [annotation] */ _In_ LPCSTR pClassInstanceName, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceIndex, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassInstance **ppInstance) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateClassInstance( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateClassInstance( + /* [annotation] */ _In_ LPCSTR pClassTypeName, - /* [annotation] */ + /* [annotation] */ _In_ UINT ConstantBufferOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT ConstantVectorOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT TextureOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT SamplerOffset, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassInstance **ppInstance) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ClassLinkageVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ClassLinkage * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ClassLinkage * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ClassLinkage * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetClassInstance )( + + HRESULT ( STDMETHODCALLTYPE *GetClassInstance )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pClassInstanceName, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceIndex, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassInstance **ppInstance); - - HRESULT ( STDMETHODCALLTYPE *CreateClassInstance )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassInstance )( ID3D11ClassLinkage * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pClassTypeName, - /* [annotation] */ + /* [annotation] */ _In_ UINT ConstantBufferOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT ConstantVectorOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT TextureOffset, - /* [annotation] */ + /* [annotation] */ _In_ UINT SamplerOffset, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassInstance **ppInstance); - + END_INTERFACE } ID3D11ClassLinkageVtbl; @@ -6791,36 +6709,34 @@ EXTERN_C const IID IID_ID3D11ClassLinkage; CONST_VTBL struct ID3D11ClassLinkageVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ClassLinkage_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ClassLinkage_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ClassLinkage_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ClassLinkage_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11ClassLinkage_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11ClassLinkage_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11ClassLinkage_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11ClassLinkage_GetClassInstance(This,pClassInstanceName,InstanceIndex,ppInstance) \ - ( (This)->lpVtbl -> GetClassInstance(This,pClassInstanceName,InstanceIndex,ppInstance) ) + ( (This)->lpVtbl -> GetClassInstance(This,pClassInstanceName,InstanceIndex,ppInstance) ) #define ID3D11ClassLinkage_CreateClassInstance(This,pClassTypeName,ConstantBufferOffset,ConstantVectorOffset,TextureOffset,SamplerOffset,ppInstance) \ - ( (This)->lpVtbl -> CreateClassInstance(This,pClassTypeName,ConstantBufferOffset,ConstantVectorOffset,TextureOffset,SamplerOffset,ppInstance) ) + ( (This)->lpVtbl -> CreateClassInstance(This,pClassTypeName,ConstantBufferOffset,ConstantVectorOffset,TextureOffset,SamplerOffset,ppInstance) ) #endif /* COBJMACROS */ @@ -6832,72 +6748,71 @@ EXTERN_C const IID IID_ID3D11ClassLinkage; #define __ID3D11CommandList_INTERFACE_DEFINED__ /* interface ID3D11CommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11CommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a24bc4d1-769e-43f7-8013-98ff566c18e2") ID3D11CommandList : public ID3D11DeviceChild { public: virtual UINT STDMETHODCALLTYPE GetContextFlags( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11CommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11CommandList * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11CommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11CommandList * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11CommandList * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11CommandList * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11CommandList * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11CommandList * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11CommandList * This); - + END_INTERFACE } ID3D11CommandListVtbl; @@ -6906,33 +6821,31 @@ EXTERN_C const IID IID_ID3D11CommandList; CONST_VTBL struct ID3D11CommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11CommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11CommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11CommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11CommandList_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11CommandList_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11CommandList_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11CommandList_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11CommandList_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #endif /* COBJMACROS */ @@ -6941,9 +6854,9 @@ EXTERN_C const IID IID_ID3D11CommandList; #endif /* __ID3D11CommandList_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0029 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_FEATURE { D3D11_FEATURE_THREADING = 0, @@ -6964,7 +6877,7 @@ enum D3D11_FEATURE D3D11_FEATURE_D3D11_OPTIONS3 = ( D3D11_FEATURE_D3D11_OPTIONS2 + 1 ) , D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = ( D3D11_FEATURE_D3D11_OPTIONS3 + 1 ) , D3D11_FEATURE_D3D11_OPTIONS4 = ( D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT + 1 ) , - D3D11_FEATURE_SHADER_CACHE = ( D3D11_FEATURE_D3D11_OPTIONS4 + 1 ) + D3D11_FEATURE_SHADER_CACHE = ( D3D11_FEATURE_D3D11_OPTIONS4 + 1 ) } D3D11_FEATURE; typedef struct D3D11_FEATURE_DATA_THREADING @@ -6996,18 +6909,18 @@ typedef struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS } D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS; // ============================================================================= -// In the D3D11_FEATURE_DATA_D3D11_OPTIONS struct below, -// the following groupings of capabilities will always be set identically. -// That is, all the BOOLs in a grouping will be TRUE or FALSE together. -// -// Group: DiscardAPIsSeenByDriver, FlagsForUpdateAndCopySeenByDriver -// -// Group: ClearView, CopyWithOverlap, ConstantBufferPartialUpdate -// ConstantBufferOffsetting, MapNoOverwriteOnDynamicConstantBuffer -// -// Group: MapNoOverwriteOnDynamicBufferSRV, -// MultisampleRTVWithForcedSampleCountOne -// +// In the D3D11_FEATURE_DATA_D3D11_OPTIONS struct below, +// the following groupings of capabilities will always be set identically. +// That is, all the BOOLs in a grouping will be TRUE or FALSE together. +// +// Group: DiscardAPIsSeenByDriver, FlagsForUpdateAndCopySeenByDriver +// +// Group: ClearView, CopyWithOverlap, ConstantBufferPartialUpdate +// ConstantBufferOffsetting, MapNoOverwriteOnDynamicConstantBuffer +// +// Group: MapNoOverwriteOnDynamicBufferSRV, +// MultisampleRTVWithForcedSampleCountOne +// typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS { BOOL OutputMergerLogicOp; @@ -7041,7 +6954,7 @@ typedef struct D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT BOOL SupportsDepthAsTextureWithLessEqualComparisonFilter; } D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT; -typedef +typedef enum D3D11_SHADER_MIN_PRECISION_SUPPORT { D3D11_SHADER_MIN_PRECISION_10_BIT = 0x1, @@ -7054,7 +6967,7 @@ typedef struct D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT UINT AllOtherShaderStagesMinPrecision; } D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT; -typedef +typedef enum D3D11_TILED_RESOURCES_TIER { D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0, @@ -7089,7 +7002,7 @@ typedef struct D3D11_FEATURE_DATA_D3D9_OPTIONS1 BOOL TextureCubeFaceRenderTargetWithNonCubeDepthStencilSupported; } D3D11_FEATURE_DATA_D3D9_OPTIONS1; -typedef +typedef enum D3D11_CONSERVATIVE_RASTERIZATION_TIER { D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0, @@ -7121,7 +7034,7 @@ typedef struct D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT UINT MaxGPUVirtualAddressBitsPerProcess; } D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; -typedef +typedef enum D3D11_SHADER_CACHE_SUPPORT_FLAGS { D3D11_SHADER_CACHE_SUPPORT_NONE = 0, @@ -7141,1777 +7054,1776 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0029_v0_0_s_ifspec; #define __ID3D11DeviceContext_INTERFACE_DEFINED__ /* interface ID3D11DeviceContext */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceContext; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c0bfa96c-e089-44fb-8eaf-26f8796190da") ID3D11DeviceContext : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE VSSetConstantBuffers( - /* [annotation] */ + virtual void STDMETHODCALLTYPE VSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE PSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE PSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetShader( + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE PSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE VSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetShader( + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexed( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawIndexed( + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation) = 0; - - virtual void STDMETHODCALLTYPE Draw( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Draw( + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation) = 0; - - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource) = 0; - - virtual void STDMETHODCALLTYPE Unmap( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Unmap( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource) = 0; - - virtual void STDMETHODCALLTYPE PSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE IASetInputLayout( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetInputLayout( + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout) = 0; - - virtual void STDMETHODCALLTYPE IASetVertexBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetVertexBuffers( + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets) = 0; - - virtual void STDMETHODCALLTYPE IASetIndexBuffer( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetIndexBuffer( + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexedInstanced( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawIndexedInstanced( + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE DrawInstanced( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawInstanced( + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE GSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE GSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetShader( + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology) = 0; - - virtual void STDMETHODCALLTYPE VSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE VSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE Begin( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Begin( + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync) = 0; - - virtual void STDMETHODCALLTYPE End( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE End( + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetData( + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags) = 0; - - virtual void STDMETHODCALLTYPE SetPredication( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetPredication( + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue) = 0; - - virtual void STDMETHODCALLTYPE GSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE GSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE OMSetRenderTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetRenderTargets( + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView) = 0; - - virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetRenderTargetsAndUnorderedAccessViews( + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts) = 0; - - virtual void STDMETHODCALLTYPE OMSetBlendState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetBlendState( + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask) = 0; - - virtual void STDMETHODCALLTYPE OMSetDepthStencilState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMSetDepthStencilState( + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef) = 0; - - virtual void STDMETHODCALLTYPE SOSetTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SOSetTargets( + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets) = 0; - + virtual void STDMETHODCALLTYPE DrawAuto( void) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawIndexedInstancedIndirect( + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs) = 0; - - virtual void STDMETHODCALLTYPE DrawInstancedIndirect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DrawInstancedIndirect( + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs) = 0; - - virtual void STDMETHODCALLTYPE Dispatch( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE Dispatch( + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ) = 0; - - virtual void STDMETHODCALLTYPE DispatchIndirect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DispatchIndirect( + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs) = 0; - - virtual void STDMETHODCALLTYPE RSSetState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetState( + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState) = 0; - - virtual void STDMETHODCALLTYPE RSSetViewports( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetViewports( + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports) = 0; - - virtual void STDMETHODCALLTYPE RSSetScissorRects( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSSetScissorRects( + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE CopySubresourceRegion( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopySubresourceRegion( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox) = 0; - - virtual void STDMETHODCALLTYPE CopyResource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopyResource( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource) = 0; - - virtual void STDMETHODCALLTYPE UpdateSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE UpdateSubresource( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch) = 0; - - virtual void STDMETHODCALLTYPE CopyStructureCount( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopyStructureCount( + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView) = 0; - - virtual void STDMETHODCALLTYPE ClearRenderTargetView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearRenderTargetView( + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]) = 0; - - virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint( + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]) = 0; - - virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat( + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]) = 0; - - virtual void STDMETHODCALLTYPE ClearDepthStencilView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearDepthStencilView( + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil) = 0; - - virtual void STDMETHODCALLTYPE GenerateMips( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GenerateMips( + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView) = 0; - - virtual void STDMETHODCALLTYPE SetResourceMinLOD( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetResourceMinLOD( + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD) = 0; - - virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD( - /* [annotation] */ + + virtual FLOAT STDMETHODCALLTYPE GetResourceMinLOD( + /* [annotation] */ _In_ ID3D11Resource *pResource) = 0; - - virtual void STDMETHODCALLTYPE ResolveSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ResolveSubresource( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format) = 0; - - virtual void STDMETHODCALLTYPE ExecuteCommandList( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ExecuteCommandList( + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState) = 0; - - virtual void STDMETHODCALLTYPE HSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE HSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSSetShader( + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE HSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE HSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE DSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE DSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSSetShader( + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE DSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE DSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE CSSetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetUnorderedAccessViews( + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts) = 0; - - virtual void STDMETHODCALLTYPE CSSetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetShader( + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE CSSetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE CSSetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE VSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE PSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE PSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE PSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE VSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE PSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE IAGetInputLayout( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetInputLayout( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout) = 0; - - virtual void STDMETHODCALLTYPE IAGetVertexBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetVertexBuffers( + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets) = 0; - - virtual void STDMETHODCALLTYPE IAGetIndexBuffer( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetIndexBuffer( + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset) = 0; - - virtual void STDMETHODCALLTYPE GSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE GSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE IAGetPrimitiveTopology( + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology) = 0; - - virtual void STDMETHODCALLTYPE VSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE VSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE GetPredication( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetPredication( + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue) = 0; - - virtual void STDMETHODCALLTYPE GSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE GSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE OMGetRenderTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetRenderTargets( + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView) = 0; - - virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetRenderTargetsAndUnorderedAccessViews( + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews) = 0; - - virtual void STDMETHODCALLTYPE OMGetBlendState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetBlendState( + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask) = 0; - - virtual void STDMETHODCALLTYPE OMGetDepthStencilState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE OMGetDepthStencilState( + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef) = 0; - - virtual void STDMETHODCALLTYPE SOGetTargets( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SOGetTargets( + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets) = 0; - - virtual void STDMETHODCALLTYPE RSGetState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetState( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState) = 0; - - virtual void STDMETHODCALLTYPE RSGetViewports( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetViewports( + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports) = 0; - - virtual void STDMETHODCALLTYPE RSGetScissorRects( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE RSGetScissorRects( + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE HSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE HSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE HSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE HSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE DSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE DSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE DSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE DSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - - virtual void STDMETHODCALLTYPE CSGetShaderResources( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetShaderResources( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews) = 0; - - virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetUnorderedAccessViews( + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews) = 0; - - virtual void STDMETHODCALLTYPE CSGetShader( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetShader( + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances) = 0; - - virtual void STDMETHODCALLTYPE CSGetSamplers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetSamplers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers) = 0; - - virtual void STDMETHODCALLTYPE CSGetConstantBuffers( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetConstantBuffers( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers) = 0; - + virtual void STDMETHODCALLTYPE ClearState( void) = 0; - + virtual void STDMETHODCALLTYPE Flush( void) = 0; - + virtual D3D11_DEVICE_CONTEXT_TYPE STDMETHODCALLTYPE GetType( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetContextFlags( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE FinishCommandList( + + virtual HRESULT STDMETHODCALLTYPE FinishCommandList( BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceContextVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceContext * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceContext * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceContext * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D11DeviceContext * This); - - void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *DispatchIndirect )( + + void ( STDMETHODCALLTYPE *DispatchIndirect )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *CopyStructureCount )( + + void ( STDMETHODCALLTYPE *CopyStructureCount )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *SetResourceMinLOD )( + + void ( STDMETHODCALLTYPE *SetResourceMinLOD )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD); - - FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( + + FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *ExecuteCommandList )( + + void ( STDMETHODCALLTYPE *ExecuteCommandList )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState); - - void ( STDMETHODCALLTYPE *HSSetShaderResources )( + + void ( STDMETHODCALLTYPE *HSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSSetShader )( + + void ( STDMETHODCALLTYPE *HSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *HSSetSamplers )( + + void ( STDMETHODCALLTYPE *HSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSSetShaderResources )( + + void ( STDMETHODCALLTYPE *DSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSSetShader )( + + void ( STDMETHODCALLTYPE *DSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DSSetSamplers )( + + void ( STDMETHODCALLTYPE *DSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSSetShaderResources )( + + void ( STDMETHODCALLTYPE *CSSetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *CSSetShader )( + + void ( STDMETHODCALLTYPE *CSSetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *CSSetSamplers )( + + void ( STDMETHODCALLTYPE *CSSetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *HSGetShaderResources )( + + void ( STDMETHODCALLTYPE *HSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSGetShader )( + + void ( STDMETHODCALLTYPE *HSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *HSGetSamplers )( + + void ( STDMETHODCALLTYPE *HSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSGetShaderResources )( + + void ( STDMETHODCALLTYPE *DSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSGetShader )( + + void ( STDMETHODCALLTYPE *DSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *DSGetSamplers )( + + void ( STDMETHODCALLTYPE *DSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSGetShaderResources )( + + void ( STDMETHODCALLTYPE *CSGetShaderResources )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *CSGetShader )( + + void ( STDMETHODCALLTYPE *CSGetShader )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *CSGetSamplers )( + + void ( STDMETHODCALLTYPE *CSGetSamplers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( ID3D11DeviceContext * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D11DeviceContext * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D11DeviceContext * This); - - D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D11DeviceContext * This); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11DeviceContext * This); - - HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( + + HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( ID3D11DeviceContext * This, BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList); - + END_INTERFACE } ID3D11DeviceContextVtbl; @@ -8920,354 +8832,352 @@ EXTERN_C const IID IID_ID3D11DeviceContext; CONST_VTBL struct ID3D11DeviceContextVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceContext_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceContext_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceContext_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceContext_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceContext_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceContext_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceContext_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DeviceContext_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D11DeviceContext_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D11DeviceContext_Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) \ - ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) + ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) #define ID3D11DeviceContext_Unmap(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) #define ID3D11DeviceContext_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D11DeviceContext_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_GSSetShader(This,pShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D11DeviceContext_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_Begin(This,pAsync) \ - ( (This)->lpVtbl -> Begin(This,pAsync) ) + ( (This)->lpVtbl -> Begin(This,pAsync) ) #define ID3D11DeviceContext_End(This,pAsync) \ - ( (This)->lpVtbl -> End(This,pAsync) ) + ( (This)->lpVtbl -> End(This,pAsync) ) #define ID3D11DeviceContext_GetData(This,pAsync,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) #define ID3D11DeviceContext_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D11DeviceContext_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D11DeviceContext_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D11DeviceContext_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D11DeviceContext_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D11DeviceContext_DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext_DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D11DeviceContext_DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D11DeviceContext_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D11DeviceContext_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D11DeviceContext_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11DeviceContext_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D11DeviceContext_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11DeviceContext_CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) \ - ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) + ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) #define ID3D11DeviceContext_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D11DeviceContext_ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext_ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D11DeviceContext_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D11DeviceContext_SetResourceMinLOD(This,pResource,MinLOD) \ - ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) + ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) #define ID3D11DeviceContext_GetResourceMinLOD(This,pResource) \ - ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) + ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) #define ID3D11DeviceContext_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D11DeviceContext_ExecuteCommandList(This,pCommandList,RestoreContextState) \ - ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) + ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) #define ID3D11DeviceContext_HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext_CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext_CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D11DeviceContext_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D11DeviceContext_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D11DeviceContext_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D11DeviceContext_OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D11DeviceContext_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D11DeviceContext_SOGetTargets(This,NumBuffers,ppSOTargets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) #define ID3D11DeviceContext_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D11DeviceContext_RSGetViewports(This,pNumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) #define ID3D11DeviceContext_RSGetScissorRects(This,pNumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) #define ID3D11DeviceContext_HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext_CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext_CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext_CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext_CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D11DeviceContext_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D11DeviceContext_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D11DeviceContext_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #define ID3D11DeviceContext_FinishCommandList(This,RestoreDeferredContextState,ppCommandList) \ - ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) + ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) #endif /* COBJMACROS */ @@ -9276,7 +9186,7 @@ EXTERN_C const IID IID_ID3D11DeviceContext; #endif /* __ID3D11DeviceContext_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0030 */ -/* [local] */ +/* [local] */ #if !defined( D3D11_VIDEO_NO_HELPERS ) && defined( __cplusplus ) } @@ -9352,7 +9262,7 @@ typedef struct D3D11_VIDEO_DECODER_CONFIG USHORT ConfigDecoderSpecific; } D3D11_VIDEO_DECODER_CONFIG; -typedef +typedef enum D3D11_VIDEO_DECODER_BUFFER_TYPE { D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0, @@ -9391,7 +9301,7 @@ typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC UINT Height; UINT Stride; UINT ReservedBits; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(IVSize) void *pIV; UINT IVSize; BOOL PartialEncryption; @@ -9401,14 +9311,14 @@ typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC typedef struct D3D11_VIDEO_DECODER_EXTENSION { UINT Function; - /* [annotation] */ + /* [annotation] */ _Field_size_(PrivateInputDataSize) void *pPrivateInputData; UINT PrivateInputDataSize; - /* [annotation] */ + /* [annotation] */ _Field_size_(PrivateOutputDataSize) void *pPrivateOutputData; UINT PrivateOutputDataSize; UINT ResourceCount; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(ResourceCount) ID3D11Resource **ppResourceList; } D3D11_VIDEO_DECODER_EXTENSION; @@ -9419,89 +9329,88 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0030_v0_0_s_ifspec; #define __ID3D11VideoDecoder_INTERFACE_DEFINED__ /* interface ID3D11VideoDecoder */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoDecoder; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3C9C5B51-995D-48d1-9B8D-FA5CAEDED65C") ID3D11VideoDecoder : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE GetCreationParameters( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetCreationParameters( + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_DESC *pVideoDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_CONFIG *pConfig) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDriverHandle( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetDriverHandle( + /* [annotation] */ _Out_ HANDLE *pDriverHandle) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoDecoderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoDecoder * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoDecoder * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoDecoder * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetCreationParameters )( + + HRESULT ( STDMETHODCALLTYPE *GetCreationParameters )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_DESC *pVideoDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_CONFIG *pConfig); - - HRESULT ( STDMETHODCALLTYPE *GetDriverHandle )( + + HRESULT ( STDMETHODCALLTYPE *GetDriverHandle )( ID3D11VideoDecoder * This, - /* [annotation] */ + /* [annotation] */ _Out_ HANDLE *pDriverHandle); - + END_INTERFACE } ID3D11VideoDecoderVtbl; @@ -9510,36 +9419,34 @@ EXTERN_C const IID IID_ID3D11VideoDecoder; CONST_VTBL struct ID3D11VideoDecoderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoDecoder_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoDecoder_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoDecoder_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoDecoder_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoDecoder_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoDecoder_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoDecoder_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoDecoder_GetCreationParameters(This,pVideoDesc,pConfig) \ - ( (This)->lpVtbl -> GetCreationParameters(This,pVideoDesc,pConfig) ) + ( (This)->lpVtbl -> GetCreationParameters(This,pVideoDesc,pConfig) ) #define ID3D11VideoDecoder_GetDriverHandle(This,pDriverHandle) \ - ( (This)->lpVtbl -> GetDriverHandle(This,pDriverHandle) ) + ( (This)->lpVtbl -> GetDriverHandle(This,pDriverHandle) ) #endif /* COBJMACROS */ @@ -9548,16 +9455,16 @@ EXTERN_C const IID IID_ID3D11VideoDecoder; #endif /* __ID3D11VideoDecoder_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0031 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT { D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x1, D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x2 } D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS { D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_LINEAR_SPACE = 0x1, @@ -9567,7 +9474,7 @@ enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_NOMINAL_RANGE = 0x10 } D3D11_VIDEO_PROCESSOR_DEVICE_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS { D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_FILL = 0x1, @@ -9584,7 +9491,7 @@ enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_METADATA_HDR10 = 0x800 } D3D11_VIDEO_PROCESSOR_FEATURE_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS { D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS = 0x1, @@ -9597,7 +9504,7 @@ enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT = 0x80 } D3D11_VIDEO_PROCESSOR_FILTER_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS { D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_INTERLACED = 0x1, @@ -9606,7 +9513,7 @@ enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_PALETTE_INTERLACED = 0x8 } D3D11_VIDEO_PROCESSOR_FORMAT_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS { D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DENOISE = 0x1, @@ -9619,7 +9526,7 @@ enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_ANAMORPHIC_SCALING = 0x80 } D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_CAPS { D3D11_VIDEO_PROCESSOR_STEREO_CAPS_MONO_OFFSET = 0x1, @@ -9642,7 +9549,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_CAPS UINT MaxStreamStates; } D3D11_VIDEO_PROCESSOR_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS { D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND = 0x1, @@ -9653,7 +9560,7 @@ enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_FRAME_RATE_CONVERSION = 0x20 } D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS { D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_32 = 0x1, @@ -9677,7 +9584,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS UINT CustomRateCount; } D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS; -typedef +typedef enum D3D11_CONTENT_PROTECTION_CAPS { D3D11_CONTENT_PROTECTION_CAPS_SOFTWARE = 0x1, @@ -9716,7 +9623,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE UINT InputFramesOrFields; } D3D11_VIDEO_PROCESSOR_CUSTOM_RATE; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_FILTER { D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS = 0, @@ -9737,7 +9644,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_FILTER_RANGE float Multiplier; } D3D11_VIDEO_PROCESSOR_FILTER_RANGE; -typedef +typedef enum D3D11_VIDEO_FRAME_FORMAT { D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE = 0, @@ -9745,7 +9652,7 @@ enum D3D11_VIDEO_FRAME_FORMAT D3D11_VIDEO_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2 } D3D11_VIDEO_FRAME_FORMAT; -typedef +typedef enum D3D11_VIDEO_USAGE { D3D11_VIDEO_USAGE_PLAYBACK_NORMAL = 0, @@ -9772,141 +9679,140 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0031_v0_0_s_ifspec; #define __ID3D11VideoProcessorEnumerator_INTERFACE_DEFINED__ /* interface ID3D11VideoProcessorEnumerator */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("31627037-53AB-4200-9061-05FAA9AB45F9") ID3D11VideoProcessorEnumerator : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorContentDesc( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorContentDesc( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pContentDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckVideoProcessorFormat( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckVideoProcessorFormat( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorCaps( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorCaps( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CAPS *pCaps) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorRateConversionCaps( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorRateConversionCaps( + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorCustomRate( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorCustomRate( + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT CustomRateIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CUSTOM_RATE *pRate) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorFilterRange( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoProcessorFilterRange( + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_FILTER_RANGE *pRange) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoProcessorEnumeratorVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoProcessorEnumerator * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoProcessorEnumerator * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoProcessorEnumerator * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorContentDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorContentDesc )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pContentDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormat )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormat )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCaps )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorRateConversionCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorRateConversionCaps )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCustomRate )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCustomRate )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT CustomRateIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CUSTOM_RATE *pRate); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorFilterRange )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorFilterRange )( ID3D11VideoProcessorEnumerator * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_FILTER_RANGE *pRange); - + END_INTERFACE } ID3D11VideoProcessorEnumeratorVtbl; @@ -9915,48 +9821,46 @@ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator; CONST_VTBL struct ID3D11VideoProcessorEnumeratorVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoProcessorEnumerator_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoProcessorEnumerator_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoProcessorEnumerator_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoProcessorEnumerator_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoProcessorEnumerator_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoProcessorEnumerator_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoProcessorEnumerator_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoProcessorEnumerator_GetVideoProcessorContentDesc(This,pContentDesc) \ - ( (This)->lpVtbl -> GetVideoProcessorContentDesc(This,pContentDesc) ) + ( (This)->lpVtbl -> GetVideoProcessorContentDesc(This,pContentDesc) ) #define ID3D11VideoProcessorEnumerator_CheckVideoProcessorFormat(This,Format,pFlags) \ - ( (This)->lpVtbl -> CheckVideoProcessorFormat(This,Format,pFlags) ) + ( (This)->lpVtbl -> CheckVideoProcessorFormat(This,Format,pFlags) ) #define ID3D11VideoProcessorEnumerator_GetVideoProcessorCaps(This,pCaps) \ - ( (This)->lpVtbl -> GetVideoProcessorCaps(This,pCaps) ) + ( (This)->lpVtbl -> GetVideoProcessorCaps(This,pCaps) ) #define ID3D11VideoProcessorEnumerator_GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) \ - ( (This)->lpVtbl -> GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) ) + ( (This)->lpVtbl -> GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) ) #define ID3D11VideoProcessorEnumerator_GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) \ - ( (This)->lpVtbl -> GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) ) + ( (This)->lpVtbl -> GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) ) #define ID3D11VideoProcessorEnumerator_GetVideoProcessorFilterRange(This,Filter,pRange) \ - ( (This)->lpVtbl -> GetVideoProcessorFilterRange(This,Filter,pRange) ) + ( (This)->lpVtbl -> GetVideoProcessorFilterRange(This,Filter,pRange) ) #endif /* COBJMACROS */ @@ -9965,7 +9869,7 @@ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator; #endif /* __ID3D11VideoProcessorEnumerator_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0032 */ -/* [local] */ +/* [local] */ typedef struct D3D11_VIDEO_COLOR_RGBA { @@ -9985,14 +9889,14 @@ typedef struct D3D11_VIDEO_COLOR_YCbCrA typedef struct D3D11_VIDEO_COLOR { - union + union { D3D11_VIDEO_COLOR_YCbCrA YCbCr; D3D11_VIDEO_COLOR_RGBA RGBA; } ; } D3D11_VIDEO_COLOR; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE { D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_UNDEFINED = 0, @@ -10010,7 +9914,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_COLOR_SPACE UINT Reserved : 26; } D3D11_VIDEO_PROCESSOR_COLOR_SPACE; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE { D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_OPAQUE = 0, @@ -10019,7 +9923,7 @@ enum D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_SOURCE_STREAM = 3 } D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_OUTPUT_RATE { D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_NORMAL = 0, @@ -10027,7 +9931,7 @@ enum D3D11_VIDEO_PROCESSOR_OUTPUT_RATE D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_CUSTOM = 2 } D3D11_VIDEO_PROCESSOR_OUTPUT_RATE; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_FORMAT { D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO = 0, @@ -10040,7 +9944,7 @@ enum D3D11_VIDEO_PROCESSOR_STEREO_FORMAT D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_CHECKERBOARD = 7 } D3D11_VIDEO_PROCESSOR_STEREO_FORMAT; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE { D3D11_VIDEO_PROCESSOR_STEREO_FLIP_NONE = 0, @@ -10048,7 +9952,7 @@ enum D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME1 = 2 } D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_ROTATION { D3D11_VIDEO_PROCESSOR_ROTATION_IDENTITY = 0, @@ -10064,15 +9968,15 @@ typedef struct D3D11_VIDEO_PROCESSOR_STREAM UINT InputFrameOrField; UINT PastFrames; UINT FutureFrames; - /* [annotation] */ + /* [annotation] */ _Field_size_(PastFrames) ID3D11VideoProcessorInputView **ppPastSurfaces; ID3D11VideoProcessorInputView *pInputSurface; - /* [annotation] */ + /* [annotation] */ _Field_size_(FutureFrames) ID3D11VideoProcessorInputView **ppFutureSurfaces; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(PastFrames) ID3D11VideoProcessorInputView **ppPastSurfacesRight; ID3D11VideoProcessorInputView *pInputSurfaceRight; - /* [annotation] */ + /* [annotation] */ _Field_size_(FutureFrames) ID3D11VideoProcessorInputView **ppFutureSurfacesRight; } D3D11_VIDEO_PROCESSOR_STREAM; @@ -10083,85 +9987,84 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0032_v0_0_s_ifspec; #define __ID3D11VideoProcessor_INTERFACE_DEFINED__ /* interface ID3D11VideoProcessor */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoProcessor; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1D7B0652-185F-41c6-85CE-0C5BE3D4AE6C") ID3D11VideoProcessor : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetContentDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetContentDesc( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc) = 0; - - virtual void STDMETHODCALLTYPE GetRateConversionCaps( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetRateConversionCaps( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoProcessorVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoProcessor * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoProcessor * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoProcessor * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetContentDesc )( + + void ( STDMETHODCALLTYPE *GetContentDesc )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetRateConversionCaps )( + + void ( STDMETHODCALLTYPE *GetRateConversionCaps )( ID3D11VideoProcessor * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps); - + END_INTERFACE } ID3D11VideoProcessorVtbl; @@ -10170,36 +10073,34 @@ EXTERN_C const IID IID_ID3D11VideoProcessor; CONST_VTBL struct ID3D11VideoProcessorVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoProcessor_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoProcessor_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoProcessor_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoProcessor_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoProcessor_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoProcessor_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoProcessor_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoProcessor_GetContentDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetContentDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetContentDesc(This,pDesc) ) #define ID3D11VideoProcessor_GetRateConversionCaps(This,pCaps) \ - ( (This)->lpVtbl -> GetRateConversionCaps(This,pCaps) ) + ( (This)->lpVtbl -> GetRateConversionCaps(This,pCaps) ) #endif /* COBJMACROS */ @@ -10208,14 +10109,14 @@ EXTERN_C const IID IID_ID3D11VideoProcessor; #endif /* __ID3D11VideoProcessor_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0033 */ -/* [local] */ +/* [local] */ typedef struct D3D11_OMAC { BYTE Omac[ 16 ]; } D3D11_OMAC; -typedef +typedef enum D3D11_AUTHENTICATED_CHANNEL_TYPE { D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1, @@ -10230,98 +10131,97 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0033_v0_0_s_ifspec; #define __ID3D11AuthenticatedChannel_INTERFACE_DEFINED__ /* interface ID3D11AuthenticatedChannel */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11AuthenticatedChannel; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3015A308-DCBD-47aa-A747-192486D14D4A") ID3D11AuthenticatedChannel : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE GetCertificateSize( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetCertificateSize( + /* [annotation] */ _Out_ UINT *pCertificateSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCertificate( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetCertificate( + /* [annotation] */ _In_ UINT CertificateSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(CertificateSize) BYTE *pCertificate) = 0; - - virtual void STDMETHODCALLTYPE GetChannelHandle( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetChannelHandle( + /* [annotation] */ _Out_ HANDLE *pChannelHandle) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11AuthenticatedChannelVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11AuthenticatedChannel * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11AuthenticatedChannel * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11AuthenticatedChannel * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetCertificateSize )( + + HRESULT ( STDMETHODCALLTYPE *GetCertificateSize )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCertificateSize); - - HRESULT ( STDMETHODCALLTYPE *GetCertificate )( + + HRESULT ( STDMETHODCALLTYPE *GetCertificate )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT CertificateSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(CertificateSize) BYTE *pCertificate); - - void ( STDMETHODCALLTYPE *GetChannelHandle )( + + void ( STDMETHODCALLTYPE *GetChannelHandle )( ID3D11AuthenticatedChannel * This, - /* [annotation] */ + /* [annotation] */ _Out_ HANDLE *pChannelHandle); - + END_INTERFACE } ID3D11AuthenticatedChannelVtbl; @@ -10330,39 +10230,37 @@ EXTERN_C const IID IID_ID3D11AuthenticatedChannel; CONST_VTBL struct ID3D11AuthenticatedChannelVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11AuthenticatedChannel_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11AuthenticatedChannel_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11AuthenticatedChannel_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11AuthenticatedChannel_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11AuthenticatedChannel_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11AuthenticatedChannel_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11AuthenticatedChannel_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11AuthenticatedChannel_GetCertificateSize(This,pCertificateSize) \ - ( (This)->lpVtbl -> GetCertificateSize(This,pCertificateSize) ) + ( (This)->lpVtbl -> GetCertificateSize(This,pCertificateSize) ) #define ID3D11AuthenticatedChannel_GetCertificate(This,CertificateSize,pCertificate) \ - ( (This)->lpVtbl -> GetCertificate(This,CertificateSize,pCertificate) ) + ( (This)->lpVtbl -> GetCertificate(This,CertificateSize,pCertificate) ) #define ID3D11AuthenticatedChannel_GetChannelHandle(This,pChannelHandle) \ - ( (This)->lpVtbl -> GetChannelHandle(This,pChannelHandle) ) + ( (This)->lpVtbl -> GetChannelHandle(This,pChannelHandle) ) #endif /* COBJMACROS */ @@ -10371,7 +10269,7 @@ EXTERN_C const IID IID_ID3D11AuthenticatedChannel; #endif /* __ID3D11AuthenticatedChannel_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0034 */ -/* [local] */ +/* [local] */ DEFINE_GUID( D3D11_AUTHENTICATED_QUERY_PROTECTION, 0xa84eb584, 0xc495, 0x48aa, 0xb9, 0x4d, 0x8b, 0xd2, 0xd6, 0xfb, 0xce, 0x5 ); DEFINE_GUID( D3D11_AUTHENTICATED_QUERY_CHANNEL_TYPE, 0xbc1b18a5, 0xb1fb, 0x42ab, 0xbd, 0x94, 0xb5, 0x82, 0x8b, 0x4b, 0xf7, 0xbe ); @@ -10462,7 +10360,7 @@ typedef struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_INPU UINT ProcessIndex; } D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_INPUT; -typedef +typedef enum D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE { D3D11_PROCESSIDTYPE_UNKNOWN = 0, @@ -10516,7 +10414,7 @@ typedef struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT UINT64 OutputID; } D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT; -typedef +typedef enum D3D11_BUS_TYPE { D3D11_BUS_TYPE_OTHER = 0, @@ -10626,116 +10524,115 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0034_v0_0_s_ifspec; #define __ID3D11CryptoSession_INTERFACE_DEFINED__ /* interface ID3D11CryptoSession */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11CryptoSession; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B32F9AD-BDCC-40a6-A39D-D5C865845720") ID3D11CryptoSession : public ID3D11DeviceChild { public: - virtual void STDMETHODCALLTYPE GetCryptoType( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetCryptoType( + /* [annotation] */ _Out_ GUID *pCryptoType) = 0; - - virtual void STDMETHODCALLTYPE GetDecoderProfile( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetDecoderProfile( + /* [annotation] */ _Out_ GUID *pDecoderProfile) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCertificateSize( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetCertificateSize( + /* [annotation] */ _Out_ UINT *pCertificateSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCertificate( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetCertificate( + /* [annotation] */ _In_ UINT CertificateSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(CertificateSize) BYTE *pCertificate) = 0; - - virtual void STDMETHODCALLTYPE GetCryptoSessionHandle( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetCryptoSessionHandle( + /* [annotation] */ _Out_ HANDLE *pCryptoSessionHandle) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11CryptoSessionVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11CryptoSession * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11CryptoSession * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11CryptoSession * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetCryptoType )( + + void ( STDMETHODCALLTYPE *GetCryptoType )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pCryptoType); - - void ( STDMETHODCALLTYPE *GetDecoderProfile )( + + void ( STDMETHODCALLTYPE *GetDecoderProfile )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pDecoderProfile); - - HRESULT ( STDMETHODCALLTYPE *GetCertificateSize )( + + HRESULT ( STDMETHODCALLTYPE *GetCertificateSize )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCertificateSize); - - HRESULT ( STDMETHODCALLTYPE *GetCertificate )( + + HRESULT ( STDMETHODCALLTYPE *GetCertificate )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT CertificateSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(CertificateSize) BYTE *pCertificate); - - void ( STDMETHODCALLTYPE *GetCryptoSessionHandle )( + + void ( STDMETHODCALLTYPE *GetCryptoSessionHandle )( ID3D11CryptoSession * This, - /* [annotation] */ + /* [annotation] */ _Out_ HANDLE *pCryptoSessionHandle); - + END_INTERFACE } ID3D11CryptoSessionVtbl; @@ -10744,45 +10641,43 @@ EXTERN_C const IID IID_ID3D11CryptoSession; CONST_VTBL struct ID3D11CryptoSessionVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11CryptoSession_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11CryptoSession_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11CryptoSession_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11CryptoSession_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11CryptoSession_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11CryptoSession_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11CryptoSession_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11CryptoSession_GetCryptoType(This,pCryptoType) \ - ( (This)->lpVtbl -> GetCryptoType(This,pCryptoType) ) + ( (This)->lpVtbl -> GetCryptoType(This,pCryptoType) ) #define ID3D11CryptoSession_GetDecoderProfile(This,pDecoderProfile) \ - ( (This)->lpVtbl -> GetDecoderProfile(This,pDecoderProfile) ) + ( (This)->lpVtbl -> GetDecoderProfile(This,pDecoderProfile) ) #define ID3D11CryptoSession_GetCertificateSize(This,pCertificateSize) \ - ( (This)->lpVtbl -> GetCertificateSize(This,pCertificateSize) ) + ( (This)->lpVtbl -> GetCertificateSize(This,pCertificateSize) ) #define ID3D11CryptoSession_GetCertificate(This,CertificateSize,pCertificate) \ - ( (This)->lpVtbl -> GetCertificate(This,CertificateSize,pCertificate) ) + ( (This)->lpVtbl -> GetCertificate(This,CertificateSize,pCertificate) ) #define ID3D11CryptoSession_GetCryptoSessionHandle(This,pCryptoSessionHandle) \ - ( (This)->lpVtbl -> GetCryptoSessionHandle(This,pCryptoSessionHandle) ) + ( (This)->lpVtbl -> GetCryptoSessionHandle(This,pCryptoSessionHandle) ) #endif /* COBJMACROS */ @@ -10791,9 +10686,9 @@ EXTERN_C const IID IID_ID3D11CryptoSession; #endif /* __ID3D11CryptoSession_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0035 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_VDOV_DIMENSION { D3D11_VDOV_DIMENSION_UNKNOWN = 0, @@ -10809,7 +10704,7 @@ typedef struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC { GUID DecodeProfile; D3D11_VDOV_DIMENSION ViewDimension; - union + union { D3D11_TEX2D_VDOV Texture2D; } ; @@ -10822,81 +10717,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0035_v0_0_s_ifspec; #define __ID3D11VideoDecoderOutputView_INTERFACE_DEFINED__ /* interface ID3D11VideoDecoderOutputView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoDecoderOutputView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("C2931AEA-2A85-4f20-860F-FBA1FD256E18") ID3D11VideoDecoderOutputView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoDecoderOutputViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoDecoderOutputView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoDecoderOutputView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoDecoderOutputView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11VideoDecoderOutputView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11VideoDecoderOutputViewVtbl; @@ -10905,36 +10799,34 @@ EXTERN_C const IID IID_ID3D11VideoDecoderOutputView; CONST_VTBL struct ID3D11VideoDecoderOutputViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoDecoderOutputView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoDecoderOutputView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoDecoderOutputView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoDecoderOutputView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoDecoderOutputView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoDecoderOutputView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoDecoderOutputView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoDecoderOutputView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11VideoDecoderOutputView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -10943,9 +10835,9 @@ EXTERN_C const IID IID_ID3D11VideoDecoderOutputView; #endif /* __ID3D11VideoDecoderOutputView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0036 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_VPIV_DIMENSION { D3D11_VPIV_DIMENSION_UNKNOWN = 0, @@ -10962,7 +10854,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC { UINT FourCC; D3D11_VPIV_DIMENSION ViewDimension; - union + union { D3D11_TEX2D_VPIV Texture2D; } ; @@ -10975,81 +10867,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0036_v0_0_s_ifspec; #define __ID3D11VideoProcessorInputView_INTERFACE_DEFINED__ /* interface ID3D11VideoProcessorInputView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoProcessorInputView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("11EC5A5F-51DC-4945-AB34-6E8C21300EA5") ID3D11VideoProcessorInputView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoProcessorInputViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoProcessorInputView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoProcessorInputView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoProcessorInputView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11VideoProcessorInputView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11VideoProcessorInputViewVtbl; @@ -11058,36 +10949,34 @@ EXTERN_C const IID IID_ID3D11VideoProcessorInputView; CONST_VTBL struct ID3D11VideoProcessorInputViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoProcessorInputView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoProcessorInputView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoProcessorInputView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoProcessorInputView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoProcessorInputView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoProcessorInputView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoProcessorInputView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoProcessorInputView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11VideoProcessorInputView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -11096,9 +10985,9 @@ EXTERN_C const IID IID_ID3D11VideoProcessorInputView; #endif /* __ID3D11VideoProcessorInputView_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0037 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_VPOV_DIMENSION { D3D11_VPOV_DIMENSION_UNKNOWN = 0, @@ -11121,7 +11010,7 @@ typedef struct D3D11_TEX2D_ARRAY_VPOV typedef struct D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC { D3D11_VPOV_DIMENSION ViewDimension; - union + union { D3D11_TEX2D_VPOV Texture2D; D3D11_TEX2D_ARRAY_VPOV Texture2DArray; @@ -11135,81 +11024,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0037_v0_0_s_ifspec; #define __ID3D11VideoProcessorOutputView_INTERFACE_DEFINED__ /* interface ID3D11VideoProcessorOutputView */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoProcessorOutputView; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("A048285E-25A9-4527-BD93-D68B68C44254") ID3D11VideoProcessorOutputView : public ID3D11View { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoProcessorOutputViewVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoProcessorOutputView * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoProcessorOutputView * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoProcessorOutputView * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11VideoProcessorOutputView * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc); - + END_INTERFACE } ID3D11VideoProcessorOutputViewVtbl; @@ -11218,36 +11106,34 @@ EXTERN_C const IID IID_ID3D11VideoProcessorOutputView; CONST_VTBL struct ID3D11VideoProcessorOutputViewVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoProcessorOutputView_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoProcessorOutputView_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoProcessorOutputView_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoProcessorOutputView_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoProcessorOutputView_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoProcessorOutputView_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoProcessorOutputView_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoProcessorOutputView_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11VideoProcessorOutputView_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #endif /* COBJMACROS */ @@ -11259,1233 +11145,1232 @@ EXTERN_C const IID IID_ID3D11VideoProcessorOutputView; #define __ID3D11VideoContext_INTERFACE_DEFINED__ /* interface ID3D11VideoContext */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoContext; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("61F21C45-3C0E-4a74-9CEA-67100D9AD5E4") ID3D11VideoContext : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE GetDecoderBuffer( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetDecoderBuffer( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, D3D11_VIDEO_DECODER_BUFFER_TYPE Type, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBufferSize, - /* [annotation] */ + /* [annotation] */ _Outptr_result_bytebuffer_(*pBufferSize) void **ppBuffer) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReleaseDecoderBuffer( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE ReleaseDecoderBuffer( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_DECODER_BUFFER_TYPE Type) = 0; - - virtual HRESULT STDMETHODCALLTYPE DecoderBeginFrame( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE DecoderBeginFrame( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoderOutputView *pView, UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey) = 0; - - virtual HRESULT STDMETHODCALLTYPE DecoderEndFrame( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE DecoderEndFrame( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder) = 0; - - virtual HRESULT STDMETHODCALLTYPE SubmitDecoderBuffers( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SubmitDecoderBuffers( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc) = 0; - - virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE DecoderExtension( - /* [annotation] */ + + virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE DecoderExtension( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_EXTENSION *pExtensionData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputTargetRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputTargetRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputBackgroundColor( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputBackgroundColor( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL YCbCr, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_COLOR *pColor) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputColorSpace( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputColorSpace( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputAlphaFillMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputAlphaFillMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE AlphaFillMode, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputConstriction( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputConstriction( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ SIZE Size) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputStereoMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputStereoMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable) = 0; - - virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorSetOutputExtension( - /* [annotation] */ + + virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorSetOutputExtension( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputTargetRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputTargetRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *Enabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputBackgroundColor( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputBackgroundColor( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pYCbCr, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_COLOR *pColor) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputColorSpace( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputColorSpace( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputAlphaFillMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputAlphaFillMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE *pAlphaFillMode, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pStreamIndex) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputConstriction( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputConstriction( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ SIZE *pSize) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputStereoMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputStereoMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled) = 0; - - virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorGetOutputExtension( - /* [annotation] */ + + virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorGetOutputExtension( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamFrameFormat( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamFrameFormat( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_FRAME_FORMAT FrameFormat) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamColorSpace( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamColorSpace( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamOutputRate( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamOutputRate( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE OutputRate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL RepeatFrame, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pCustomRate) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamSourceRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamSourceRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamDestRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamDestRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamAlpha( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamAlpha( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Alpha) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamPalette( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamPalette( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(Count) const UINT *pEntries) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamPixelAspectRatio( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamPixelAspectRatio( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pDestinationAspectRatio) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamLumaKey( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamLumaKey( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Lower, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Upper) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamStereoFormat( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamStereoFormat( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ BOOL LeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ BOOL BaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE FlipMode, - /* [annotation] */ + /* [annotation] */ _In_ int MonoOffset) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamAutoProcessingMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamAutoProcessingMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamFilter( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ int Level) = 0; - - virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorSetStreamExtension( - /* [annotation] */ + + virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorSetStreamExtension( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamFrameFormat( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamFrameFormat( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_FRAME_FORMAT *pFrameFormat) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamColorSpace( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamColorSpace( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamOutputRate( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamOutputRate( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE *pOutputRate, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRepeatFrame, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pCustomRate) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamSourceRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamSourceRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamDestRect( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamDestRect( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamAlpha( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamAlpha( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pAlpha) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamPalette( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamPalette( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _Out_writes_(Count) UINT *pEntries) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamPixelAspectRatio( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamPixelAspectRatio( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pDestinationAspectRatio) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamLumaKey( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamLumaKey( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pLower, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pUpper) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamStereoFormat( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamStereoFormat( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT *pFormat, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pLeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pBaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE *pFlipMode, - /* [annotation] */ + /* [annotation] */ _Out_ int *MonoOffset) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamAutoProcessingMode( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamAutoProcessingMode( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamFilter( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ int *pLevel) = 0; - - virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorGetStreamExtension( - /* [annotation] */ + + virtual APP_DEPRECATED_HRESULT STDMETHODCALLTYPE VideoProcessorGetStreamExtension( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE VideoProcessorBlt( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE VideoProcessorBlt( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorOutputView *pView, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputFrame, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM *pStreams) = 0; - - virtual HRESULT STDMETHODCALLTYPE NegotiateCryptoSessionKeyExchange( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE NegotiateCryptoSessionKeyExchange( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData) = 0; - - virtual void STDMETHODCALLTYPE EncryptionBlt( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE EncryptionBlt( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV) = 0; - - virtual void STDMETHODCALLTYPE DecryptionBlt( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DecryptionBlt( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_opt_ D3D11_ENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, - /* [annotation] */ + /* [annotation] */ _In_ UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV) = 0; - - virtual void STDMETHODCALLTYPE StartSessionKeyRefresh( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE StartSessionKeyRefresh( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT RandomNumberSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(RandomNumberSize) void *pRandomNumber) = 0; - - virtual void STDMETHODCALLTYPE FinishSessionKeyRefresh( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE FinishSessionKeyRefresh( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetEncryptionBltKey( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetEncryptionBltKey( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT KeySize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(KeySize) void *pReadbackKey) = 0; - - virtual HRESULT STDMETHODCALLTYPE NegotiateAuthenticatedChannelKeyExchange( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE NegotiateAuthenticatedChannelKeyExchange( + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE QueryAuthenticatedChannel( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE QueryAuthenticatedChannel( + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(OutputSize) void *pOutput) = 0; - - virtual HRESULT STDMETHODCALLTYPE ConfigureAuthenticatedChannel( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE ConfigureAuthenticatedChannel( + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_AUTHENTICATED_CONFIGURE_OUTPUT *pOutput) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamRotation( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamRotation( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ROTATION Rotation) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamRotation( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamRotation( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ROTATION *pRotation) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoContextVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoContext * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoContext * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoContext * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, D3D11_VIDEO_DECODER_BUFFER_TYPE Type, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBufferSize, - /* [annotation] */ + /* [annotation] */ _Outptr_result_bytebuffer_(*pBufferSize) void **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_DECODER_BUFFER_TYPE Type); - - HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoderOutputView *pView, UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey); - - HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder); - - HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( + + HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_EXTENSION *pExtensionData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL YCbCr, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE AlphaFillMode, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ SIZE Size); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *Enabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pYCbCr, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE *pAlphaFillMode, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pStreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ SIZE *pSize); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_FRAME_FORMAT FrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE OutputRate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL RepeatFrame, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Alpha); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(Count) const UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Lower, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Upper); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ BOOL LeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ BOOL BaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE FlipMode, - /* [annotation] */ + /* [annotation] */ _In_ int MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ int Level); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_FRAME_FORMAT *pFrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE *pOutputRate, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRepeatFrame, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pAlpha); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _Out_writes_(Count) UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pLower, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pUpper); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT *pFormat, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pLeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pBaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE *pFlipMode, - /* [annotation] */ + /* [annotation] */ _Out_ int *MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ int *pLevel); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( + + HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorOutputView *pView, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputFrame, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM *pStreams); - - HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *EncryptionBlt )( + + void ( STDMETHODCALLTYPE *EncryptionBlt )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *DecryptionBlt )( + + void ( STDMETHODCALLTYPE *DecryptionBlt )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_opt_ D3D11_ENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, - /* [annotation] */ + /* [annotation] */ _In_ UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT RandomNumberSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(RandomNumberSize) void *pRandomNumber); - - void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession); - - HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( + + HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT KeySize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(KeySize) void *pReadbackKey); - - HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(OutputSize) void *pOutput); - - HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_AUTHENTICATED_CONFIGURE_OUTPUT *pOutput); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ROTATION Rotation); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( ID3D11VideoContext * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ROTATION *pRotation); - + END_INTERFACE } ID3D11VideoContextVtbl; @@ -12494,204 +12379,202 @@ EXTERN_C const IID IID_ID3D11VideoContext; CONST_VTBL struct ID3D11VideoContextVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoContext_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoContext_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoContext_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoContext_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoContext_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoContext_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoContext_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoContext_GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) \ - ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) + ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) #define ID3D11VideoContext_ReleaseDecoderBuffer(This,pDecoder,Type) \ - ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) + ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) #define ID3D11VideoContext_DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) \ - ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) + ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) #define ID3D11VideoContext_DecoderEndFrame(This,pDecoder) \ - ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) + ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) #define ID3D11VideoContext_SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) \ - ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) + ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) #define ID3D11VideoContext_DecoderExtension(This,pDecoder,pExtensionData) \ - ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) + ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) #define ID3D11VideoContext_VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) #define ID3D11VideoContext_VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) #define ID3D11VideoContext_VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext_VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) #define ID3D11VideoContext_VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) #define ID3D11VideoContext_VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) #define ID3D11VideoContext_VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext_VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) #define ID3D11VideoContext_VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) #define ID3D11VideoContext_VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext_VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) #define ID3D11VideoContext_VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) #define ID3D11VideoContext_VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) #define ID3D11VideoContext_VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext_VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) #define ID3D11VideoContext_VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext_VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) #define ID3D11VideoContext_VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext_VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext_VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) #define ID3D11VideoContext_VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext_VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext_VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) #define ID3D11VideoContext_VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) #define ID3D11VideoContext_VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) #define ID3D11VideoContext_VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) #define ID3D11VideoContext_VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext_VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) #define ID3D11VideoContext_VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext_VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) #define ID3D11VideoContext_VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext_VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext_VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) #define ID3D11VideoContext_VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext_VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext_VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) #define ID3D11VideoContext_VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) #define ID3D11VideoContext_VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) #define ID3D11VideoContext_VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) #define ID3D11VideoContext_VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext_VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) \ - ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) + ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) #define ID3D11VideoContext_NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) #define ID3D11VideoContext_EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) \ - ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) + ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) #define ID3D11VideoContext_DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) \ - ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) + ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) #define ID3D11VideoContext_StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) \ - ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) + ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) #define ID3D11VideoContext_FinishSessionKeyRefresh(This,pCryptoSession) \ - ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) + ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) #define ID3D11VideoContext_GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) \ - ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) + ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) #define ID3D11VideoContext_NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) #define ID3D11VideoContext_QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) \ - ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) + ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) #define ID3D11VideoContext_ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) \ - ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) + ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) #define ID3D11VideoContext_VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) #define ID3D11VideoContext_VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) #endif /* COBJMACROS */ @@ -12703,310 +12586,309 @@ EXTERN_C const IID IID_ID3D11VideoContext; #define __ID3D11VideoDevice_INTERFACE_DEFINED__ /* interface ID3D11VideoDevice */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoDevice; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("10EC4D5B-975A-4689-B9E4-D0AAC30FE333") ID3D11VideoDevice : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoder( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoder( + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pVideoDesc, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pConfig, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoDecoder **ppDecoder) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessor( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessor( + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ UINT RateConversionIndex, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessor **ppVideoProcessor) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateAuthenticatedChannel( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateAuthenticatedChannel( + /* [annotation] */ _In_ D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11AuthenticatedChannel **ppAuthenticatedChannel) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCryptoSession( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateCryptoSession( + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pKeyExchangeType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11CryptoSession **ppCryptoSession) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoderOutputView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoderOutputView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoDecoderOutputView **ppVDOVView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorInputView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorInputView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorInputView **ppVPIView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorOutputView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorOutputView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorOutputView **ppVPOView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorEnumerator( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessorEnumerator( + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessorEnumerator **ppEnum) = 0; - + virtual UINT STDMETHODCALLTYPE GetVideoDecoderProfileCount( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderProfile( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderProfile( + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pDecoderProfile) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckVideoDecoderFormat( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckVideoDecoderFormat( + /* [annotation] */ _In_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderConfigCount( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderConfigCount( + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCount) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderConfig( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderConfig( + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_CONFIG *pConfig) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetContentProtectionCaps( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetContentProtectionCaps( + /* [annotation] */ _In_opt_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_CONTENT_PROTECTION_CAPS *pCaps) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckCryptoKeyExchange( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckCryptoKeyExchange( + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pKeyExchangeType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoDeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoDevice * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoDevice * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoDevice * This); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pVideoDesc, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pConfig, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoDecoder **ppDecoder); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ UINT RateConversionIndex, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessor **ppVideoProcessor); - - HRESULT ( STDMETHODCALLTYPE *CreateAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *CreateAuthenticatedChannel )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11AuthenticatedChannel **ppAuthenticatedChannel); - - HRESULT ( STDMETHODCALLTYPE *CreateCryptoSession )( + + HRESULT ( STDMETHODCALLTYPE *CreateCryptoSession )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pKeyExchangeType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11CryptoSession **ppCryptoSession); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderOutputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderOutputView )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoDecoderOutputView **ppVDOVView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorInputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorInputView )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorInputView **ppVPIView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorOutputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorOutputView )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorOutputView **ppVPOView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorEnumerator )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorEnumerator )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessorEnumerator **ppEnum); - - UINT ( STDMETHODCALLTYPE *GetVideoDecoderProfileCount )( + + UINT ( STDMETHODCALLTYPE *GetVideoDecoderProfileCount )( ID3D11VideoDevice * This); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderProfile )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderProfile )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pDecoderProfile); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderFormat )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderFormat )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfigCount )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfigCount )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCount); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfig )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfig )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_CONFIG *pConfig); - - HRESULT ( STDMETHODCALLTYPE *GetContentProtectionCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetContentProtectionCaps )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_CONTENT_PROTECTION_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *CheckCryptoKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *CheckCryptoKeyExchange )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pKeyExchangeType); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3D11VideoDeviceVtbl; @@ -13015,69 +12897,67 @@ EXTERN_C const IID IID_ID3D11VideoDevice; CONST_VTBL struct ID3D11VideoDeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoDevice_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoDevice_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoDevice_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoDevice_CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) \ - ( (This)->lpVtbl -> CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) ) + ( (This)->lpVtbl -> CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) ) #define ID3D11VideoDevice_CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) \ - ( (This)->lpVtbl -> CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) ) + ( (This)->lpVtbl -> CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) ) #define ID3D11VideoDevice_CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) \ - ( (This)->lpVtbl -> CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) ) + ( (This)->lpVtbl -> CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) ) #define ID3D11VideoDevice_CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) \ - ( (This)->lpVtbl -> CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) ) + ( (This)->lpVtbl -> CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) ) #define ID3D11VideoDevice_CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) \ - ( (This)->lpVtbl -> CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) ) + ( (This)->lpVtbl -> CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) ) #define ID3D11VideoDevice_CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) \ - ( (This)->lpVtbl -> CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) ) + ( (This)->lpVtbl -> CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) ) #define ID3D11VideoDevice_CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) \ - ( (This)->lpVtbl -> CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) ) + ( (This)->lpVtbl -> CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) ) #define ID3D11VideoDevice_CreateVideoProcessorEnumerator(This,pDesc,ppEnum) \ - ( (This)->lpVtbl -> CreateVideoProcessorEnumerator(This,pDesc,ppEnum) ) + ( (This)->lpVtbl -> CreateVideoProcessorEnumerator(This,pDesc,ppEnum) ) #define ID3D11VideoDevice_GetVideoDecoderProfileCount(This) \ - ( (This)->lpVtbl -> GetVideoDecoderProfileCount(This) ) + ( (This)->lpVtbl -> GetVideoDecoderProfileCount(This) ) #define ID3D11VideoDevice_GetVideoDecoderProfile(This,Index,pDecoderProfile) \ - ( (This)->lpVtbl -> GetVideoDecoderProfile(This,Index,pDecoderProfile) ) + ( (This)->lpVtbl -> GetVideoDecoderProfile(This,Index,pDecoderProfile) ) #define ID3D11VideoDevice_CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) \ - ( (This)->lpVtbl -> CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) ) + ( (This)->lpVtbl -> CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) ) #define ID3D11VideoDevice_GetVideoDecoderConfigCount(This,pDesc,pCount) \ - ( (This)->lpVtbl -> GetVideoDecoderConfigCount(This,pDesc,pCount) ) + ( (This)->lpVtbl -> GetVideoDecoderConfigCount(This,pDesc,pCount) ) #define ID3D11VideoDevice_GetVideoDecoderConfig(This,pDesc,Index,pConfig) \ - ( (This)->lpVtbl -> GetVideoDecoderConfig(This,pDesc,Index,pConfig) ) + ( (This)->lpVtbl -> GetVideoDecoderConfig(This,pDesc,Index,pConfig) ) #define ID3D11VideoDevice_GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) \ - ( (This)->lpVtbl -> GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) ) + ( (This)->lpVtbl -> GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) ) #define ID3D11VideoDevice_CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) \ - ( (This)->lpVtbl -> CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) ) + ( (This)->lpVtbl -> CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) ) #define ID3D11VideoDevice_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoDevice_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -13086,7 +12966,7 @@ EXTERN_C const IID IID_ID3D11VideoDevice; #endif /* __ID3D11VideoDevice_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0040 */ -/* [local] */ +/* [local] */ /*#include */ @@ -13097,669 +12977,668 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_0000_0040_v0_0_s_ifspec; #define __ID3D11Device_INTERFACE_DEFINED__ /* interface ID3D11Device */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("db6f6ddb-ac77-4e88-8253-819df9bbf140") ID3D11Device : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CreateBuffer( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateBuffer( + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture1D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture1D( + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture2D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture2D( + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture3D( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture3D( + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilView( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateInputLayout( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateInputLayout( + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVertexShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateVertexShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateGeometryShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateGeometryShaderWithStreamOutput( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreatePixelShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreatePixelShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateHullShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateHullShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDomainShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDomainShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateComputeShader( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateComputeShader( + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateClassLinkage( + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateBlendState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateBlendState( + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDepthStencilState( + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState( + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSamplerState( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSamplerState( + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateQuery( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateQuery( + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreatePredicate( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreatePredicate( + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCounter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateCounter( + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext( + + virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext( UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedResource( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE OpenSharedResource( + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckFormatSupport( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels) = 0; - - virtual void STDMETHODCALLTYPE CheckCounterInfo( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CheckCounterInfo( + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckCounter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckCounter( + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( + + virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData) = 0; - + virtual D3D_FEATURE_LEVEL STDMETHODCALLTYPE GetFeatureLevel( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetCreationFlags( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason( void) = 0; - - virtual void STDMETHODCALLTYPE GetImmediateContext( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetImmediateContext( + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetExceptionMode( + + virtual HRESULT STDMETHODCALLTYPE SetExceptionMode( UINT RaiseFlags) = 0; - + virtual UINT STDMETHODCALLTYPE GetExceptionMode( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device * This); - + END_INTERFACE } ID3D11DeviceVtbl; @@ -13768,138 +13647,136 @@ EXTERN_C const IID IID_ID3D11Device; CONST_VTBL struct ID3D11DeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #endif /* COBJMACROS */ @@ -13908,9 +13785,9 @@ EXTERN_C const IID IID_ID3D11Device; #endif /* __ID3D11Device_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_0000_0041 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_CREATE_DEVICE_FLAG { D3D11_CREATE_DEVICE_SINGLETHREADED = 0x1, @@ -13926,16 +13803,16 @@ enum D3D11_CREATE_DEVICE_FLAG #define D3D11_SDK_VERSION ( 7 ) -#if !defined( D3D11_IGNORE_SDK_LAYERS ) -#include "d3d11sdklayers.h" -#endif +#if !defined( D3D11_IGNORE_SDK_LAYERS ) +#include "d3d11sdklayers.h" +#endif #include "d3d10_1.h" /*#pragma region Desktop Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)*/ -#include "d3d10shader.h" -#include "d3d10_1shader.h" -#include "d3d10misc.h" -#include "d3d10effect.h" +#include "d3d10shader.h" +#include "d3d10_1shader.h" +#include "d3d10misc.h" +#include "d3d10effect.h" /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ @@ -13971,17 +13848,17 @@ enum D3D11_CREATE_DEVICE_FLAG // Pointer to returned interface. May be NULL. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory1 // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver // D3D11CreateDevice // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE)( _In_opt_ IDXGIAdapter*, - D3D_DRIVER_TYPE, HMODULE, UINT, - _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, - UINT FeatureLevels, UINT, _COM_Outptr_opt_ ID3D11Device**, +typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE)( _In_opt_ IDXGIAdapter*, + D3D_DRIVER_TYPE, HMODULE, UINT, + _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, + UINT FeatureLevels, UINT, _COM_Outptr_opt_ ID3D11Device**, _Out_opt_ D3D_FEATURE_LEVEL*, _COM_Outptr_opt_ ID3D11DeviceContext** ); HRESULT WINAPI D3D11CreateDevice( @@ -14003,7 +13880,7 @@ HRESULT WINAPI D3D11CreateDevice( // ------------------------------ // // ppAdapter -// If NULL, D3D11CreateDevice will choose the primary adapter and +// If NULL, D3D11CreateDevice will choose the primary adapter and // create a new instance from a temporarily created IDXGIFactory. // If non-NULL, D3D11CreateDevice will register the appropriate // device, if necessary (via IDXGIAdapter::RegisterDrver), before @@ -14025,8 +13902,8 @@ HRESULT WINAPI D3D11CreateDevice( // D3D_FEATURE_LEVEL_9_2 // D3D_FEATURE_LEVEL_9_1 // Order indicates sequence in which instantiation will be attempted. If -// NULL, then the implied order is the same as previously listed (i.e. -// prefer most features available). +// NULL, then the implied order is the same as previously listed (i.e. +// prefer most features available). // FeatureLevels // Size of feature levels array. // SDKVersion @@ -14043,7 +13920,7 @@ HRESULT WINAPI D3D11CreateDevice( // Pointer to returned interface. May be NULL. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory1 // IDXGIFactory::EnumAdapters // IDXGIAdapter::RegisterDriver @@ -14051,11 +13928,11 @@ HRESULT WINAPI D3D11CreateDevice( // IDXGIFactory::CreateSwapChain // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)( _In_opt_ IDXGIAdapter*, - D3D_DRIVER_TYPE, HMODULE, UINT, - _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, - UINT FeatureLevels, UINT, _In_opt_ CONST DXGI_SWAP_CHAIN_DESC*, - _COM_Outptr_opt_ IDXGISwapChain**, _COM_Outptr_opt_ ID3D11Device**, +typedef HRESULT (WINAPI* PFN_D3D11_CREATE_DEVICE_AND_SWAP_CHAIN)( _In_opt_ IDXGIAdapter*, + D3D_DRIVER_TYPE, HMODULE, UINT, + _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, + UINT FeatureLevels, UINT, _In_opt_ CONST DXGI_SWAP_CHAIN_DESC*, + _COM_Outptr_opt_ IDXGISwapChain**, _COM_Outptr_opt_ ID3D11Device**, _Out_opt_ D3D_FEATURE_LEVEL*, _COM_Outptr_opt_ ID3D11DeviceContext** ); HRESULT WINAPI D3D11CreateDeviceAndSwapChain( diff --git a/gfx/include/dxsdk/d3d11_1.h b/gfx/include/dxsdk/d3d11_1.h index f8accdb165..9303544f52 100644 --- a/gfx/include/dxsdk/d3d11_1.h +++ b/gfx/include/dxsdk/d3d11_1.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11BlendState1_FWD_DEFINED__ #define __ID3D11BlendState1_FWD_DEFINED__ @@ -102,10 +102,10 @@ typedef interface ID3DUserDefinedAnnotation ID3DUserDefinedAnnotation; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11_1_0000_0000 */ -/* [local] */ +/* [local] */ #ifdef __cplusplus } @@ -114,14 +114,14 @@ extern "C"{ #ifdef __cplusplus extern "C"{ #endif -typedef +typedef enum D3D11_COPY_FLAGS { D3D11_COPY_NO_OVERWRITE = 0x1, D3D11_COPY_DISCARD = 0x2 } D3D11_COPY_FLAGS; -typedef +typedef enum D3D11_LOGIC_OP { D3D11_LOGIC_OP_CLEAR = 0, @@ -139,7 +139,7 @@ enum D3D11_LOGIC_OP D3D11_LOGIC_OP_AND_REVERSE = ( D3D11_LOGIC_OP_EQUIV + 1 ) , D3D11_LOGIC_OP_AND_INVERTED = ( D3D11_LOGIC_OP_AND_REVERSE + 1 ) , D3D11_LOGIC_OP_OR_REVERSE = ( D3D11_LOGIC_OP_AND_INVERTED + 1 ) , - D3D11_LOGIC_OP_OR_INVERTED = ( D3D11_LOGIC_OP_OR_REVERSE + 1 ) + D3D11_LOGIC_OP_OR_INVERTED = ( D3D11_LOGIC_OP_OR_REVERSE + 1 ) } D3D11_LOGIC_OP; typedef struct D3D11_RENDER_TARGET_BLEND_DESC1 @@ -163,7 +163,7 @@ typedef struct D3D11_BLEND_DESC1 D3D11_RENDER_TARGET_BLEND_DESC1 RenderTarget[ 8 ]; } D3D11_BLEND_DESC1; -/* Note, the array size for RenderTarget[] above is D3D11_SIMULTANEOUS_RENDERTARGET_COUNT. +/* Note, the array size for RenderTarget[] above is D3D11_SIMULTANEOUS_RENDERTARGET_COUNT. IDL processing/generation of this header replaces the define; this comment is merely explaining what happened. */ #if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus ) } @@ -202,81 +202,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_1_0000_0000_v0_0_s_ifspec; #define __ID3D11BlendState1_INTERFACE_DEFINED__ /* interface ID3D11BlendState1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11BlendState1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("cc86fabe-da55-401d-85e7-e3c9de2877e9") ID3D11BlendState1 : public ID3D11BlendState { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_BLEND_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11BlendState1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11BlendState1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11BlendState1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11BlendState1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_BLEND_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11BlendState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_BLEND_DESC1 *pDesc); - + END_INTERFACE } ID3D11BlendState1Vtbl; @@ -285,36 +284,34 @@ EXTERN_C const IID IID_ID3D11BlendState1; CONST_VTBL struct ID3D11BlendState1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11BlendState1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11BlendState1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11BlendState1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11BlendState1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11BlendState1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11BlendState1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11BlendState1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11BlendState1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11BlendState1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -323,7 +320,7 @@ EXTERN_C const IID IID_ID3D11BlendState1; #endif /* __ID3D11BlendState1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_1_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct D3D11_RASTERIZER_DESC1 { @@ -373,7 +370,7 @@ struct CD3D11_RASTERIZER_DESC1 : public D3D11_RASTERIZER_DESC1 BOOL depthClipEnable, BOOL scissorEnable, BOOL multisampleEnable, - BOOL antialiasedLineEnable, + BOOL antialiasedLineEnable, UINT forcedSampleCount ) { FillMode = fillMode; @@ -401,81 +398,80 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_1_0000_0001_v0_0_s_ifspec; #define __ID3D11RasterizerState1_INTERFACE_DEFINED__ /* interface ID3D11RasterizerState1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RasterizerState1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1217d7a6-5039-418c-b042-9cbe256afd6e") ID3D11RasterizerState1 : public ID3D11RasterizerState { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RasterizerState1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RasterizerState1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RasterizerState1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RasterizerState1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11RasterizerState1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC1 *pDesc); - + END_INTERFACE } ID3D11RasterizerState1Vtbl; @@ -484,36 +480,34 @@ EXTERN_C const IID IID_ID3D11RasterizerState1; CONST_VTBL struct ID3D11RasterizerState1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RasterizerState1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RasterizerState1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RasterizerState1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RasterizerState1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11RasterizerState1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11RasterizerState1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11RasterizerState1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11RasterizerState1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11RasterizerState1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -522,9 +516,9 @@ EXTERN_C const IID IID_ID3D11RasterizerState1; #endif /* __ID3D11RasterizerState1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_1_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_1_CREATE_DEVICE_CONTEXT_STATE_FLAG { D3D11_1_CREATE_DEVICE_CONTEXT_STATE_SINGLETHREADED = 0x1 @@ -537,67 +531,66 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_1_0000_0002_v0_0_s_ifspec; #define __ID3DDeviceContextState_INTERFACE_DEFINED__ /* interface ID3DDeviceContextState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3DDeviceContextState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("5c1e0d8a-7c23-48f9-8c59-a92958ceff11") ID3DDeviceContextState : public ID3D11DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3DDeviceContextStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3DDeviceContextState * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3DDeviceContextState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3DDeviceContextState * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3DDeviceContextState * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3DDeviceContextState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3DDeviceContextState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3DDeviceContextState * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - + END_INTERFACE } ID3DDeviceContextStateVtbl; @@ -606,30 +599,28 @@ EXTERN_C const IID IID_ID3DDeviceContextState; CONST_VTBL struct ID3DDeviceContextStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3DDeviceContextState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3DDeviceContextState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3DDeviceContextState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3DDeviceContextState_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3DDeviceContextState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3DDeviceContextState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3DDeviceContextState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #endif /* COBJMACROS */ @@ -641,1415 +632,1414 @@ EXTERN_C const IID IID_ID3DDeviceContextState; #define __ID3D11DeviceContext1_INTERFACE_DEFINED__ /* interface ID3D11DeviceContext1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceContext1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("bb2c6faa-b5fb-4082-8e6b-388b8cfa90e1") ID3D11DeviceContext1 : public ID3D11DeviceContext { public: - virtual void STDMETHODCALLTYPE CopySubresourceRegion1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE CopySubresourceRegion1( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags) = 0; - - virtual void STDMETHODCALLTYPE UpdateSubresource1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE UpdateSubresource1( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags) = 0; - - virtual void STDMETHODCALLTYPE DiscardResource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DiscardResource( + /* [annotation] */ _In_ ID3D11Resource *pResource) = 0; - - virtual void STDMETHODCALLTYPE DiscardView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DiscardView( + /* [annotation] */ _In_ ID3D11View *pResourceView) = 0; - - virtual void STDMETHODCALLTYPE VSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE HSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE DSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE GSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE PSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE CSSetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSSetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE VSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE HSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE HSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE DSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE GSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE PSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE CSGetConstantBuffers1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CSGetConstantBuffers1( + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants) = 0; - - virtual void STDMETHODCALLTYPE SwapDeviceContextState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SwapDeviceContextState( + /* [annotation] */ _In_ ID3DDeviceContextState *pState, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_ ID3DDeviceContextState **ppPreviousState) = 0; - - virtual void STDMETHODCALLTYPE ClearView( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearView( + /* [annotation] */ _In_ ID3D11View *pView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Color[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRect, UINT NumRects) = 0; - - virtual void STDMETHODCALLTYPE DiscardView1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE DiscardView1( + /* [annotation] */ _In_ ID3D11View *pResourceView, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects, UINT NumRects) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceContext1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceContext1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceContext1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceContext1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D11DeviceContext1 * This); - - void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *DispatchIndirect )( + + void ( STDMETHODCALLTYPE *DispatchIndirect )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *CopyStructureCount )( + + void ( STDMETHODCALLTYPE *CopyStructureCount )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *SetResourceMinLOD )( + + void ( STDMETHODCALLTYPE *SetResourceMinLOD )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD); - - FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( + + FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *ExecuteCommandList )( + + void ( STDMETHODCALLTYPE *ExecuteCommandList )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState); - - void ( STDMETHODCALLTYPE *HSSetShaderResources )( + + void ( STDMETHODCALLTYPE *HSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSSetShader )( + + void ( STDMETHODCALLTYPE *HSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *HSSetSamplers )( + + void ( STDMETHODCALLTYPE *HSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSSetShaderResources )( + + void ( STDMETHODCALLTYPE *DSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSSetShader )( + + void ( STDMETHODCALLTYPE *DSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DSSetSamplers )( + + void ( STDMETHODCALLTYPE *DSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSSetShaderResources )( + + void ( STDMETHODCALLTYPE *CSSetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *CSSetShader )( + + void ( STDMETHODCALLTYPE *CSSetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *CSSetSamplers )( + + void ( STDMETHODCALLTYPE *CSSetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *HSGetShaderResources )( + + void ( STDMETHODCALLTYPE *HSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSGetShader )( + + void ( STDMETHODCALLTYPE *HSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *HSGetSamplers )( + + void ( STDMETHODCALLTYPE *HSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSGetShaderResources )( + + void ( STDMETHODCALLTYPE *DSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSGetShader )( + + void ( STDMETHODCALLTYPE *DSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *DSGetSamplers )( + + void ( STDMETHODCALLTYPE *DSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSGetShaderResources )( + + void ( STDMETHODCALLTYPE *CSGetShaderResources )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *CSGetShader )( + + void ( STDMETHODCALLTYPE *CSGetShader )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *CSGetSamplers )( + + void ( STDMETHODCALLTYPE *CSGetSamplers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D11DeviceContext1 * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D11DeviceContext1 * This); - - D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D11DeviceContext1 * This); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11DeviceContext1 * This); - - HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( + + HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( ID3D11DeviceContext1 * This, BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *UpdateSubresource1 )( + + void ( STDMETHODCALLTYPE *UpdateSubresource1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *DiscardView )( + + void ( STDMETHODCALLTYPE *DiscardView )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *SwapDeviceContextState )( + + void ( STDMETHODCALLTYPE *SwapDeviceContextState )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3DDeviceContextState *pState, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_ ID3DDeviceContextState **ppPreviousState); - - void ( STDMETHODCALLTYPE *ClearView )( + + void ( STDMETHODCALLTYPE *ClearView )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Color[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRect, UINT NumRects); - - void ( STDMETHODCALLTYPE *DiscardView1 )( + + void ( STDMETHODCALLTYPE *DiscardView1 )( ID3D11DeviceContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects, UINT NumRects); - + END_INTERFACE } ID3D11DeviceContext1Vtbl; @@ -2058,411 +2048,409 @@ EXTERN_C const IID IID_ID3D11DeviceContext1; CONST_VTBL struct ID3D11DeviceContext1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceContext1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceContext1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceContext1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceContext1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceContext1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceContext1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceContext1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DeviceContext1_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D11DeviceContext1_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D11DeviceContext1_Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) \ - ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) + ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) #define ID3D11DeviceContext1_Unmap(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) #define ID3D11DeviceContext1_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D11DeviceContext1_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext1_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext1_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext1_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext1_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_GSSetShader(This,pShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D11DeviceContext1_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_Begin(This,pAsync) \ - ( (This)->lpVtbl -> Begin(This,pAsync) ) + ( (This)->lpVtbl -> Begin(This,pAsync) ) #define ID3D11DeviceContext1_End(This,pAsync) \ - ( (This)->lpVtbl -> End(This,pAsync) ) + ( (This)->lpVtbl -> End(This,pAsync) ) #define ID3D11DeviceContext1_GetData(This,pAsync,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) #define ID3D11DeviceContext1_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D11DeviceContext1_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D11DeviceContext1_OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext1_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D11DeviceContext1_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D11DeviceContext1_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D11DeviceContext1_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D11DeviceContext1_DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext1_DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext1_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D11DeviceContext1_DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext1_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D11DeviceContext1_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D11DeviceContext1_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D11DeviceContext1_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11DeviceContext1_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D11DeviceContext1_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11DeviceContext1_CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) \ - ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) + ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) #define ID3D11DeviceContext1_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D11DeviceContext1_ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext1_ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext1_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D11DeviceContext1_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D11DeviceContext1_SetResourceMinLOD(This,pResource,MinLOD) \ - ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) + ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) #define ID3D11DeviceContext1_GetResourceMinLOD(This,pResource) \ - ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) + ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) #define ID3D11DeviceContext1_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D11DeviceContext1_ExecuteCommandList(This,pCommandList,RestoreContextState) \ - ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) + ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) #define ID3D11DeviceContext1_HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext1_CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext1_CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D11DeviceContext1_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext1_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext1_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D11DeviceContext1_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D11DeviceContext1_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D11DeviceContext1_OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext1_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D11DeviceContext1_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D11DeviceContext1_SOGetTargets(This,NumBuffers,ppSOTargets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) #define ID3D11DeviceContext1_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D11DeviceContext1_RSGetViewports(This,pNumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) #define ID3D11DeviceContext1_RSGetScissorRects(This,pNumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) #define ID3D11DeviceContext1_HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext1_CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext1_CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext1_CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext1_CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext1_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D11DeviceContext1_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D11DeviceContext1_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D11DeviceContext1_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #define ID3D11DeviceContext1_FinishCommandList(This,RestoreDeferredContextState,ppCommandList) \ - ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) + ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) #define ID3D11DeviceContext1_CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) \ - ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) + ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) #define ID3D11DeviceContext1_UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) \ - ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) + ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) #define ID3D11DeviceContext1_DiscardResource(This,pResource) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource) ) #define ID3D11DeviceContext1_DiscardView(This,pResourceView) \ - ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) + ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) #define ID3D11DeviceContext1_VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext1_SwapDeviceContextState(This,pState,ppPreviousState) \ - ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) + ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) #define ID3D11DeviceContext1_ClearView(This,pView,Color,pRect,NumRects) \ - ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) + ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) #define ID3D11DeviceContext1_DiscardView1(This,pResourceView,pRects,NumRects) \ - ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) + ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) #endif /* COBJMACROS */ @@ -2471,7 +2459,7 @@ EXTERN_C const IID IID_ID3D11DeviceContext1; #endif /* __ID3D11DeviceContext1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_1_0000_0004 */ -/* [local] */ +/* [local] */ typedef struct D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK { @@ -2484,10 +2472,10 @@ typedef struct D3D11_VIDEO_DECODER_BUFFER_DESC1 D3D11_VIDEO_DECODER_BUFFER_TYPE BufferType; UINT DataOffset; UINT DataSize; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(IVSize) void *pIV; UINT IVSize; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(SubSampleMappingCount) D3D11_VIDEO_DECODER_SUB_SAMPLE_MAPPING_BLOCK *pSubSampleMappingBlock; UINT SubSampleMappingCount; } D3D11_VIDEO_DECODER_BUFFER_DESC1; @@ -2496,15 +2484,15 @@ typedef struct D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION { ID3D11CryptoSession *pCryptoSession; UINT BlobSize; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(BlobSize) void *pBlob; GUID *pKeyInfoId; UINT PrivateDataSize; - /* [annotation] */ + /* [annotation] */ _Field_size_opt_(PrivateDataSize) void *pPrivateData; } D3D11_VIDEO_DECODER_BEGIN_FRAME_CRYPTO_SESSION; -typedef +typedef enum D3D11_VIDEO_DECODER_CAPS { D3D11_VIDEO_DECODER_CAPS_DOWNSAMPLE = 0x1, @@ -2514,7 +2502,7 @@ enum D3D11_VIDEO_DECODER_CAPS D3D11_VIDEO_DECODER_CAPS_UNSUPPORTED = 0x10 } D3D11_VIDEO_DECODER_CAPS; -typedef +typedef enum D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINTS { D3D11_VIDEO_PROCESSOR_BEHAVIOR_HINT_MULTIPLANE_OVERLAY_ROTATION = 0x1, @@ -2531,7 +2519,7 @@ typedef struct D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT DXGI_FORMAT Format; } D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT; -typedef +typedef enum D3D11_CRYPTO_SESSION_STATUS { D3D11_CRYPTO_SESSION_STATUS_OK = 0, @@ -2579,933 +2567,932 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_1_0000_0004_v0_0_s_ifspec; #define __ID3D11VideoContext1_INTERFACE_DEFINED__ /* interface ID3D11VideoContext1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoContext1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("A7F026DA-A5F8-4487-A564-15E34357651E") ID3D11VideoContext1 : public ID3D11VideoContext { public: - virtual HRESULT STDMETHODCALLTYPE SubmitDecoderBuffers1( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE SubmitDecoderBuffers1( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC1 *pBufferDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDataForNewHardwareKey( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetDataForNewHardwareKey( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT PrivateInputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_(PrivateInputSize) const void *pPrivatInputData, - /* [annotation] */ + /* [annotation] */ _Out_ UINT64 *pPrivateOutputData) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckCryptoSessionStatus( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckCryptoSessionStatus( + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_CRYPTO_SESSION_STATUS *pStatus) = 0; - - virtual HRESULT STDMETHODCALLTYPE DecoderEnableDownsampling( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE DecoderEnableDownsampling( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT ReferenceFrameCount) = 0; - - virtual HRESULT STDMETHODCALLTYPE DecoderUpdateDownsampling( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE DecoderUpdateDownsampling( + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputColorSpace1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputColorSpace1( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputShaderUsage( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputShaderUsage( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL ShaderUsage) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputColorSpace1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputColorSpace1( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputShaderUsage( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputShaderUsage( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pShaderUsage) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamColorSpace1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamColorSpace1( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamMirror( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamMirror( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipHorizontal, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipVertical) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamColorSpace1( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamColorSpace1( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamMirror( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamMirror( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipHorizontal, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipVertical) = 0; - - virtual HRESULT STDMETHODCALLTYPE VideoProcessorGetBehaviorHints( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE VideoProcessorGetBehaviorHints( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputWidth, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputHeight, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT OutputFormat, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT *pStreams, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBehaviorHints) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoContext1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoContext1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoContext1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoContext1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, D3D11_VIDEO_DECODER_BUFFER_TYPE Type, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBufferSize, - /* [annotation] */ + /* [annotation] */ _Outptr_result_bytebuffer_(*pBufferSize) void **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_DECODER_BUFFER_TYPE Type); - - HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoderOutputView *pView, UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey); - - HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder); - - HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( + + HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_EXTENSION *pExtensionData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL YCbCr, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE AlphaFillMode, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ SIZE Size); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *Enabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pYCbCr, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE *pAlphaFillMode, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pStreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ SIZE *pSize); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_FRAME_FORMAT FrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE OutputRate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL RepeatFrame, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Alpha); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(Count) const UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Lower, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Upper); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ BOOL LeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ BOOL BaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE FlipMode, - /* [annotation] */ + /* [annotation] */ _In_ int MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ int Level); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_FRAME_FORMAT *pFrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE *pOutputRate, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRepeatFrame, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pAlpha); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _Out_writes_(Count) UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pLower, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pUpper); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT *pFormat, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pLeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pBaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE *pFlipMode, - /* [annotation] */ + /* [annotation] */ _Out_ int *MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ int *pLevel); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( + + HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorOutputView *pView, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputFrame, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM *pStreams); - - HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *EncryptionBlt )( + + void ( STDMETHODCALLTYPE *EncryptionBlt )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *DecryptionBlt )( + + void ( STDMETHODCALLTYPE *DecryptionBlt )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_opt_ D3D11_ENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, - /* [annotation] */ + /* [annotation] */ _In_ UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT RandomNumberSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(RandomNumberSize) void *pRandomNumber); - - void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession); - - HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( + + HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT KeySize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(KeySize) void *pReadbackKey); - - HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(OutputSize) void *pOutput); - - HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_AUTHENTICATED_CONFIGURE_OUTPUT *pOutput); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ROTATION Rotation); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ROTATION *pRotation); - - HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers1 )( + + HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers1 )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC1 *pBufferDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDataForNewHardwareKey )( + + HRESULT ( STDMETHODCALLTYPE *GetDataForNewHardwareKey )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT PrivateInputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_(PrivateInputSize) const void *pPrivatInputData, - /* [annotation] */ + /* [annotation] */ _Out_ UINT64 *pPrivateOutputData); - - HRESULT ( STDMETHODCALLTYPE *CheckCryptoSessionStatus )( + + HRESULT ( STDMETHODCALLTYPE *CheckCryptoSessionStatus )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_CRYPTO_SESSION_STATUS *pStatus); - - HRESULT ( STDMETHODCALLTYPE *DecoderEnableDownsampling )( + + HRESULT ( STDMETHODCALLTYPE *DecoderEnableDownsampling )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT ReferenceFrameCount); - - HRESULT ( STDMETHODCALLTYPE *DecoderUpdateDownsampling )( + + HRESULT ( STDMETHODCALLTYPE *DecoderUpdateDownsampling )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace1 )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputShaderUsage )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputShaderUsage )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL ShaderUsage); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace1 )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputShaderUsage )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputShaderUsage )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pShaderUsage); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace1 )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamMirror )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamMirror )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipHorizontal, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipVertical); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace1 )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamMirror )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamMirror )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipHorizontal, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipVertical); - - HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetBehaviorHints )( + + HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetBehaviorHints )( ID3D11VideoContext1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputWidth, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputHeight, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT OutputFormat, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT *pStreams, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBehaviorHints); - + END_INTERFACE } ID3D11VideoContext1Vtbl; @@ -3514,246 +3501,244 @@ EXTERN_C const IID IID_ID3D11VideoContext1; CONST_VTBL struct ID3D11VideoContext1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoContext1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoContext1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoContext1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoContext1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoContext1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoContext1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoContext1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoContext1_GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) \ - ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) + ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) #define ID3D11VideoContext1_ReleaseDecoderBuffer(This,pDecoder,Type) \ - ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) + ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) #define ID3D11VideoContext1_DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) \ - ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) + ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) #define ID3D11VideoContext1_DecoderEndFrame(This,pDecoder) \ - ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) + ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) #define ID3D11VideoContext1_SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) \ - ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) + ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) #define ID3D11VideoContext1_DecoderExtension(This,pDecoder,pExtensionData) \ - ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) + ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) #define ID3D11VideoContext1_VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) #define ID3D11VideoContext1_VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) #define ID3D11VideoContext1_VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) #define ID3D11VideoContext1_VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) #define ID3D11VideoContext1_VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) #define ID3D11VideoContext1_VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext1_VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) #define ID3D11VideoContext1_VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) #define ID3D11VideoContext1_VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) #define ID3D11VideoContext1_VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) #define ID3D11VideoContext1_VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) #define ID3D11VideoContext1_VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext1_VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) #define ID3D11VideoContext1_VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) #define ID3D11VideoContext1_VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext1_VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext1_VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) #define ID3D11VideoContext1_VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext1_VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext1_VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) #define ID3D11VideoContext1_VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) #define ID3D11VideoContext1_VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) #define ID3D11VideoContext1_VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) #define ID3D11VideoContext1_VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext1_VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) #define ID3D11VideoContext1_VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) #define ID3D11VideoContext1_VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext1_VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext1_VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) #define ID3D11VideoContext1_VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext1_VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext1_VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) #define ID3D11VideoContext1_VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) #define ID3D11VideoContext1_VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) #define ID3D11VideoContext1_VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) #define ID3D11VideoContext1_VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext1_VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) \ - ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) + ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) #define ID3D11VideoContext1_NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) #define ID3D11VideoContext1_EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) \ - ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) + ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) #define ID3D11VideoContext1_DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) \ - ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) + ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) #define ID3D11VideoContext1_StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) \ - ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) + ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) #define ID3D11VideoContext1_FinishSessionKeyRefresh(This,pCryptoSession) \ - ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) + ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) #define ID3D11VideoContext1_GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) \ - ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) + ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) #define ID3D11VideoContext1_NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) #define ID3D11VideoContext1_QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) \ - ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) + ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) #define ID3D11VideoContext1_ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) \ - ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) + ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) #define ID3D11VideoContext1_VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) #define ID3D11VideoContext1_VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) #define ID3D11VideoContext1_SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) \ - ( (This)->lpVtbl -> SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) ) + ( (This)->lpVtbl -> SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) ) #define ID3D11VideoContext1_GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) \ - ( (This)->lpVtbl -> GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) ) + ( (This)->lpVtbl -> GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) ) #define ID3D11VideoContext1_CheckCryptoSessionStatus(This,pCryptoSession,pStatus) \ - ( (This)->lpVtbl -> CheckCryptoSessionStatus(This,pCryptoSession,pStatus) ) + ( (This)->lpVtbl -> CheckCryptoSessionStatus(This,pCryptoSession,pStatus) ) #define ID3D11VideoContext1_DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) \ - ( (This)->lpVtbl -> DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) ) + ( (This)->lpVtbl -> DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) ) #define ID3D11VideoContext1_DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) \ - ( (This)->lpVtbl -> DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) ) + ( (This)->lpVtbl -> DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) ) #define ID3D11VideoContext1_VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) ) #define ID3D11VideoContext1_VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) ) #define ID3D11VideoContext1_VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) ) #define ID3D11VideoContext1_VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) ) #define ID3D11VideoContext1_VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) ) #define ID3D11VideoContext1_VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext1_VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) ) #define ID3D11VideoContext1_VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) \ - ( (This)->lpVtbl -> VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) ) + ( (This)->lpVtbl -> VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) ) #endif /* COBJMACROS */ @@ -3765,298 +3750,297 @@ EXTERN_C const IID IID_ID3D11VideoContext1; #define __ID3D11VideoDevice1_INTERFACE_DEFINED__ /* interface ID3D11VideoDevice1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoDevice1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("29DA1D51-1321-4454-804B-F5FC9F861F0F") ID3D11VideoDevice1 : public ID3D11VideoDevice { public: - virtual HRESULT STDMETHODCALLTYPE GetCryptoSessionPrivateDataSize( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE GetCryptoSessionPrivateDataSize( + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pKeyExchangeType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pPrivateInputSize, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pPrivateOutputSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderCaps( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetVideoDecoderCaps( + /* [annotation] */ _In_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleWidth, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleHeight, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _In_ UINT BitRate, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pDecoderCaps) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckVideoDecoderDownsampling( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckVideoDecoderDownsampling( + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pInputDesc, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pInputConfig, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRealTimeHint) = 0; - - virtual HRESULT STDMETHODCALLTYPE RecommendVideoDecoderDownsampleParameters( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE RecommendVideoDecoderDownsampleParameters( + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pInputDesc, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pInputConfig, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_SAMPLE_DESC *pRecommendedOutputDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoDevice1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoDevice1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoDevice1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoDevice1 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pVideoDesc, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pConfig, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoDecoder **ppDecoder); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ UINT RateConversionIndex, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessor **ppVideoProcessor); - - HRESULT ( STDMETHODCALLTYPE *CreateAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *CreateAuthenticatedChannel )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_AUTHENTICATED_CHANNEL_TYPE ChannelType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11AuthenticatedChannel **ppAuthenticatedChannel); - - HRESULT ( STDMETHODCALLTYPE *CreateCryptoSession )( + + HRESULT ( STDMETHODCALLTYPE *CreateCryptoSession )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pKeyExchangeType, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11CryptoSession **ppCryptoSession); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderOutputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderOutputView )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoDecoderOutputView **ppVDOVView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorInputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorInputView )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorInputView **ppVPIView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorOutputView )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorOutputView )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorEnumerator *pEnum, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VideoProcessorOutputView **ppVPOView); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorEnumerator )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessorEnumerator )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11VideoProcessorEnumerator **ppEnum); - - UINT ( STDMETHODCALLTYPE *GetVideoDecoderProfileCount )( + + UINT ( STDMETHODCALLTYPE *GetVideoDecoderProfileCount )( ID3D11VideoDevice1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderProfile )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderProfile )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pDecoderProfile); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderFormat )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderFormat )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfigCount )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfigCount )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCount); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfig )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderConfig )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_DECODER_CONFIG *pConfig); - - HRESULT ( STDMETHODCALLTYPE *GetContentProtectionCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetContentProtectionCaps )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_CONTENT_PROTECTION_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *CheckCryptoKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *CheckCryptoKeyExchange )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ UINT Index, - /* [annotation] */ + /* [annotation] */ _Out_ GUID *pKeyExchangeType); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetCryptoSessionPrivateDataSize )( + + HRESULT ( STDMETHODCALLTYPE *GetCryptoSessionPrivateDataSize )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pKeyExchangeType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pPrivateInputSize, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pPrivateOutputSize); - - HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoDecoderCaps )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pDecoderProfile, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleWidth, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleHeight, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _In_ UINT BitRate, - /* [annotation] */ + /* [annotation] */ _In_opt_ const GUID *pCryptoType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pDecoderCaps); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderDownsampling )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoDecoderDownsampling )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pInputDesc, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pInputConfig, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRealTimeHint); - - HRESULT ( STDMETHODCALLTYPE *RecommendVideoDecoderDownsampleParameters )( + + HRESULT ( STDMETHODCALLTYPE *RecommendVideoDecoderDownsampleParameters )( ID3D11VideoDevice1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_DESC *pInputDesc, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_CONFIG *pInputConfig, - /* [annotation] */ + /* [annotation] */ _In_ const DXGI_RATIONAL *pFrameRate, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_SAMPLE_DESC *pRecommendedOutputDesc); - + END_INTERFACE } ID3D11VideoDevice1Vtbl; @@ -4065,81 +4049,79 @@ EXTERN_C const IID IID_ID3D11VideoDevice1; CONST_VTBL struct ID3D11VideoDevice1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoDevice1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoDevice1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoDevice1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoDevice1_CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) \ - ( (This)->lpVtbl -> CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) ) + ( (This)->lpVtbl -> CreateVideoDecoder(This,pVideoDesc,pConfig,ppDecoder) ) #define ID3D11VideoDevice1_CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) \ - ( (This)->lpVtbl -> CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) ) + ( (This)->lpVtbl -> CreateVideoProcessor(This,pEnum,RateConversionIndex,ppVideoProcessor) ) #define ID3D11VideoDevice1_CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) \ - ( (This)->lpVtbl -> CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) ) + ( (This)->lpVtbl -> CreateAuthenticatedChannel(This,ChannelType,ppAuthenticatedChannel) ) #define ID3D11VideoDevice1_CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) \ - ( (This)->lpVtbl -> CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) ) + ( (This)->lpVtbl -> CreateCryptoSession(This,pCryptoType,pDecoderProfile,pKeyExchangeType,ppCryptoSession) ) #define ID3D11VideoDevice1_CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) \ - ( (This)->lpVtbl -> CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) ) + ( (This)->lpVtbl -> CreateVideoDecoderOutputView(This,pResource,pDesc,ppVDOVView) ) #define ID3D11VideoDevice1_CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) \ - ( (This)->lpVtbl -> CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) ) + ( (This)->lpVtbl -> CreateVideoProcessorInputView(This,pResource,pEnum,pDesc,ppVPIView) ) #define ID3D11VideoDevice1_CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) \ - ( (This)->lpVtbl -> CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) ) + ( (This)->lpVtbl -> CreateVideoProcessorOutputView(This,pResource,pEnum,pDesc,ppVPOView) ) #define ID3D11VideoDevice1_CreateVideoProcessorEnumerator(This,pDesc,ppEnum) \ - ( (This)->lpVtbl -> CreateVideoProcessorEnumerator(This,pDesc,ppEnum) ) + ( (This)->lpVtbl -> CreateVideoProcessorEnumerator(This,pDesc,ppEnum) ) #define ID3D11VideoDevice1_GetVideoDecoderProfileCount(This) \ - ( (This)->lpVtbl -> GetVideoDecoderProfileCount(This) ) + ( (This)->lpVtbl -> GetVideoDecoderProfileCount(This) ) #define ID3D11VideoDevice1_GetVideoDecoderProfile(This,Index,pDecoderProfile) \ - ( (This)->lpVtbl -> GetVideoDecoderProfile(This,Index,pDecoderProfile) ) + ( (This)->lpVtbl -> GetVideoDecoderProfile(This,Index,pDecoderProfile) ) #define ID3D11VideoDevice1_CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) \ - ( (This)->lpVtbl -> CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) ) + ( (This)->lpVtbl -> CheckVideoDecoderFormat(This,pDecoderProfile,Format,pSupported) ) #define ID3D11VideoDevice1_GetVideoDecoderConfigCount(This,pDesc,pCount) \ - ( (This)->lpVtbl -> GetVideoDecoderConfigCount(This,pDesc,pCount) ) + ( (This)->lpVtbl -> GetVideoDecoderConfigCount(This,pDesc,pCount) ) #define ID3D11VideoDevice1_GetVideoDecoderConfig(This,pDesc,Index,pConfig) \ - ( (This)->lpVtbl -> GetVideoDecoderConfig(This,pDesc,Index,pConfig) ) + ( (This)->lpVtbl -> GetVideoDecoderConfig(This,pDesc,Index,pConfig) ) #define ID3D11VideoDevice1_GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) \ - ( (This)->lpVtbl -> GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) ) + ( (This)->lpVtbl -> GetContentProtectionCaps(This,pCryptoType,pDecoderProfile,pCaps) ) #define ID3D11VideoDevice1_CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) \ - ( (This)->lpVtbl -> CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) ) + ( (This)->lpVtbl -> CheckCryptoKeyExchange(This,pCryptoType,pDecoderProfile,Index,pKeyExchangeType) ) #define ID3D11VideoDevice1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoDevice1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoDevice1_GetCryptoSessionPrivateDataSize(This,pCryptoType,pDecoderProfile,pKeyExchangeType,pPrivateInputSize,pPrivateOutputSize) \ - ( (This)->lpVtbl -> GetCryptoSessionPrivateDataSize(This,pCryptoType,pDecoderProfile,pKeyExchangeType,pPrivateInputSize,pPrivateOutputSize) ) + ( (This)->lpVtbl -> GetCryptoSessionPrivateDataSize(This,pCryptoType,pDecoderProfile,pKeyExchangeType,pPrivateInputSize,pPrivateOutputSize) ) #define ID3D11VideoDevice1_GetVideoDecoderCaps(This,pDecoderProfile,SampleWidth,SampleHeight,pFrameRate,BitRate,pCryptoType,pDecoderCaps) \ - ( (This)->lpVtbl -> GetVideoDecoderCaps(This,pDecoderProfile,SampleWidth,SampleHeight,pFrameRate,BitRate,pCryptoType,pDecoderCaps) ) + ( (This)->lpVtbl -> GetVideoDecoderCaps(This,pDecoderProfile,SampleWidth,SampleHeight,pFrameRate,BitRate,pCryptoType,pDecoderCaps) ) #define ID3D11VideoDevice1_CheckVideoDecoderDownsampling(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pOutputDesc,pSupported,pRealTimeHint) \ - ( (This)->lpVtbl -> CheckVideoDecoderDownsampling(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pOutputDesc,pSupported,pRealTimeHint) ) + ( (This)->lpVtbl -> CheckVideoDecoderDownsampling(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pOutputDesc,pSupported,pRealTimeHint) ) #define ID3D11VideoDevice1_RecommendVideoDecoderDownsampleParameters(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pRecommendedOutputDesc) \ - ( (This)->lpVtbl -> RecommendVideoDecoderDownsampleParameters(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pRecommendedOutputDesc) ) + ( (This)->lpVtbl -> RecommendVideoDecoderDownsampleParameters(This,pInputDesc,InputColorSpace,pInputConfig,pFrameRate,pRecommendedOutputDesc) ) #endif /* COBJMACROS */ @@ -4151,132 +4133,131 @@ EXTERN_C const IID IID_ID3D11VideoDevice1; #define __ID3D11VideoProcessorEnumerator1_INTERFACE_DEFINED__ /* interface ID3D11VideoProcessorEnumerator1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("465217F2-5568-43CF-B5B9-F61D54531CA1") ID3D11VideoProcessorEnumerator1 : public ID3D11VideoProcessorEnumerator { public: - virtual HRESULT STDMETHODCALLTYPE CheckVideoProcessorFormatConversion( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CheckVideoProcessorFormatConversion( + /* [annotation] */ _In_ DXGI_FORMAT InputFormat, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT OutputFormat, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE OutputColorSpace, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoProcessorEnumerator1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoProcessorEnumerator1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoProcessorEnumerator1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoProcessorEnumerator1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorContentDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorContentDesc )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CONTENT_DESC *pContentDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormat )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormat )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCaps )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorRateConversionCaps )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorRateConversionCaps )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS *pCaps); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCustomRate )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorCustomRate )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT TypeIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT CustomRateIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_CUSTOM_RATE *pRate); - - HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorFilterRange )( + + HRESULT ( STDMETHODCALLTYPE *GetVideoProcessorFilterRange )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_FILTER_RANGE *pRange); - - HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormatConversion )( + + HRESULT ( STDMETHODCALLTYPE *CheckVideoProcessorFormatConversion )( ID3D11VideoProcessorEnumerator1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT InputFormat, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT OutputFormat, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE OutputColorSpace, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pSupported); - + END_INTERFACE } ID3D11VideoProcessorEnumerator1Vtbl; @@ -4285,51 +4266,49 @@ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator1; CONST_VTBL struct ID3D11VideoProcessorEnumerator1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoProcessorEnumerator1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoProcessorEnumerator1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoProcessorEnumerator1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoProcessorEnumerator1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoProcessorEnumerator1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoProcessorEnumerator1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoProcessorEnumerator1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoProcessorEnumerator1_GetVideoProcessorContentDesc(This,pContentDesc) \ - ( (This)->lpVtbl -> GetVideoProcessorContentDesc(This,pContentDesc) ) + ( (This)->lpVtbl -> GetVideoProcessorContentDesc(This,pContentDesc) ) #define ID3D11VideoProcessorEnumerator1_CheckVideoProcessorFormat(This,Format,pFlags) \ - ( (This)->lpVtbl -> CheckVideoProcessorFormat(This,Format,pFlags) ) + ( (This)->lpVtbl -> CheckVideoProcessorFormat(This,Format,pFlags) ) #define ID3D11VideoProcessorEnumerator1_GetVideoProcessorCaps(This,pCaps) \ - ( (This)->lpVtbl -> GetVideoProcessorCaps(This,pCaps) ) + ( (This)->lpVtbl -> GetVideoProcessorCaps(This,pCaps) ) #define ID3D11VideoProcessorEnumerator1_GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) \ - ( (This)->lpVtbl -> GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) ) + ( (This)->lpVtbl -> GetVideoProcessorRateConversionCaps(This,TypeIndex,pCaps) ) #define ID3D11VideoProcessorEnumerator1_GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) \ - ( (This)->lpVtbl -> GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) ) + ( (This)->lpVtbl -> GetVideoProcessorCustomRate(This,TypeIndex,CustomRateIndex,pRate) ) #define ID3D11VideoProcessorEnumerator1_GetVideoProcessorFilterRange(This,Filter,pRange) \ - ( (This)->lpVtbl -> GetVideoProcessorFilterRange(This,Filter,pRange) ) + ( (This)->lpVtbl -> GetVideoProcessorFilterRange(This,Filter,pRange) ) #define ID3D11VideoProcessorEnumerator1_CheckVideoProcessorFormatConversion(This,InputFormat,InputColorSpace,OutputFormat,OutputColorSpace,pSupported) \ - ( (This)->lpVtbl -> CheckVideoProcessorFormatConversion(This,InputFormat,InputColorSpace,OutputFormat,OutputColorSpace,pSupported) ) + ( (This)->lpVtbl -> CheckVideoProcessorFormatConversion(This,InputFormat,InputColorSpace,OutputFormat,OutputColorSpace,pSupported) ) #endif /* COBJMACROS */ @@ -4341,482 +4320,481 @@ EXTERN_C const IID IID_ID3D11VideoProcessorEnumerator1; #define __ID3D11Device1_INTERFACE_DEFINED__ /* interface ID3D11Device1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a04bfb29-08ef-43d6-a49c-a9bdbdcbe686") ID3D11Device1 : public ID3D11Device { public: - virtual void STDMETHODCALLTYPE GetImmediateContext1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetImmediateContext1( + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext1( + + virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext1( UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateBlendState1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateBlendState1( + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState1( + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDeviceContextState( + + virtual HRESULT STDMETHODCALLTYPE CreateDeviceContextState( UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedResource1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE OpenSharedResource1( + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedResourceByName( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE OpenSharedResourceByName( + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Device1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device1 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device1 * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device1 * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device1 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device1 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device1 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext1 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext1 )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( ID3D11Device1 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( ID3D11Device1 * This, UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( ID3D11Device1 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - + END_INTERFACE } ID3D11Device1Vtbl; @@ -4825,159 +4803,157 @@ EXTERN_C const IID IID_ID3D11Device1; CONST_VTBL struct ID3D11Device1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device1_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device1_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device1_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device1_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device1_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device1_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device1_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device1_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device1_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device1_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device1_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device1_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device1_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device1_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device1_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device1_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device1_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device1_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device1_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device1_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device1_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device1_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device1_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device1_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device1_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device1_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device1_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device1_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device1_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device1_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device1_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device1_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device1_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device1_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device1_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device1_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device1_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D11Device1_GetImmediateContext1(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) #define ID3D11Device1_CreateDeferredContext1(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device1_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device1_CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device1_CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) \ - ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) + ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) #define ID3D11Device1_OpenSharedResource1(This,hResource,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) #define ID3D11Device1_OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) #endif /* COBJMACROS */ @@ -4989,65 +4965,64 @@ EXTERN_C const IID IID_ID3D11Device1; #define __ID3DUserDefinedAnnotation_INTERFACE_DEFINED__ /* interface ID3DUserDefinedAnnotation */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3DUserDefinedAnnotation; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("b2daad8b-03d4-4dbf-95eb-32ab4b63d0ab") ID3DUserDefinedAnnotation : public IUnknown { public: - virtual INT STDMETHODCALLTYPE BeginEvent( - /* [annotation] */ + virtual INT STDMETHODCALLTYPE BeginEvent( + /* [annotation] */ _In_ LPCWSTR Name) = 0; - + virtual INT STDMETHODCALLTYPE EndEvent( void) = 0; - - virtual void STDMETHODCALLTYPE SetMarker( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetMarker( + /* [annotation] */ _In_ LPCWSTR Name) = 0; - + virtual BOOL STDMETHODCALLTYPE GetStatus( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3DUserDefinedAnnotationVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3DUserDefinedAnnotation * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3DUserDefinedAnnotation * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3DUserDefinedAnnotation * This); - - INT ( STDMETHODCALLTYPE *BeginEvent )( + + INT ( STDMETHODCALLTYPE *BeginEvent )( ID3DUserDefinedAnnotation * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR Name); - - INT ( STDMETHODCALLTYPE *EndEvent )( + + INT ( STDMETHODCALLTYPE *EndEvent )( ID3DUserDefinedAnnotation * This); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3DUserDefinedAnnotation * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR Name); - - BOOL ( STDMETHODCALLTYPE *GetStatus )( + + BOOL ( STDMETHODCALLTYPE *GetStatus )( ID3DUserDefinedAnnotation * This); - + END_INTERFACE } ID3DUserDefinedAnnotationVtbl; @@ -5056,30 +5031,28 @@ EXTERN_C const IID IID_ID3DUserDefinedAnnotation; CONST_VTBL struct ID3DUserDefinedAnnotationVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3DUserDefinedAnnotation_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3DUserDefinedAnnotation_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3DUserDefinedAnnotation_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3DUserDefinedAnnotation_BeginEvent(This,Name) \ - ( (This)->lpVtbl -> BeginEvent(This,Name) ) + ( (This)->lpVtbl -> BeginEvent(This,Name) ) #define ID3DUserDefinedAnnotation_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3DUserDefinedAnnotation_SetMarker(This,Name) \ - ( (This)->lpVtbl -> SetMarker(This,Name) ) + ( (This)->lpVtbl -> SetMarker(This,Name) ) #define ID3DUserDefinedAnnotation_GetStatus(This) \ - ( (This)->lpVtbl -> GetStatus(This) ) + ( (This)->lpVtbl -> GetStatus(This) ) #endif /* COBJMACROS */ @@ -5088,7 +5061,7 @@ EXTERN_C const IID IID_ID3DUserDefinedAnnotation; #endif /* __ID3DUserDefinedAnnotation_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_1_0000_0009 */ -/* [local] */ +/* [local] */ DEFINE_GUID(IID_ID3D11BlendState1,0xcc86fabe,0xda55,0x401d,0x85,0xe7,0xe3,0xc9,0xde,0x28,0x77,0xe9); DEFINE_GUID(IID_ID3D11RasterizerState1,0x1217d7a6,0x5039,0x418c,0xb0,0x42,0x9c,0xbe,0x25,0x6a,0xfd,0x6e); diff --git a/gfx/include/dxsdk/d3d11_2.h b/gfx/include/dxsdk/d3d11_2.h index 1d485b24c6..3688f2cfa8 100644 --- a/gfx/include/dxsdk/d3d11_2.h +++ b/gfx/include/dxsdk/d3d11_2.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11DeviceContext2_FWD_DEFINED__ #define __ID3D11DeviceContext2_FWD_DEFINED__ @@ -61,10 +61,10 @@ typedef interface ID3D11Device2 ID3D11Device2; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11_2_0000_0000 */ -/* [local] */ +/* [local] */ #ifdef __cplusplus } @@ -90,13 +90,13 @@ typedef struct D3D11_TILE_REGION_SIZE UINT16 Depth; } D3D11_TILE_REGION_SIZE; -typedef +typedef enum D3D11_TILE_MAPPING_FLAG { D3D11_TILE_MAPPING_NO_OVERWRITE = 0x1 } D3D11_TILE_MAPPING_FLAG; -typedef +typedef enum D3D11_TILE_RANGE_FLAG { D3D11_TILE_RANGE_NULL = 0x1, @@ -129,13 +129,13 @@ typedef struct D3D11_PACKED_MIP_DESC UINT StartTileIndexInOverallResource; } D3D11_PACKED_MIP_DESC; -typedef +typedef enum D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_FLAG { D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_TILED_RESOURCE = 0x1 } D3D11_CHECK_MULTISAMPLE_QUALITY_LEVELS_FLAG; -typedef +typedef enum D3D11_TILE_COPY_FLAG { D3D11_TILE_COPY_NO_OVERWRITE = 0x1, @@ -150,1391 +150,1390 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_2_0000_0000_v0_0_s_ifspec; #define __ID3D11DeviceContext2_INTERFACE_DEFINED__ /* interface ID3D11DeviceContext2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceContext2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("420d5b32-b90c-4da4-bef0-359f6a24a83a") ID3D11DeviceContext2 : public ID3D11DeviceContext1 { public: - virtual HRESULT STDMETHODCALLTYPE UpdateTileMappings( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE UpdateTileMappings( + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumTiledResourceRegions, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILED_RESOURCE_COORDINATE *pTiledResourceRegionStartCoordinates, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILE_REGION_SIZE *pTiledResourceRegionSizes, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRanges, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeFlags, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pTilePoolStartOffsets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE CopyTileMappings( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CopyTileMappings( + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSourceTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pSourceRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags) = 0; - - virtual void STDMETHODCALLTYPE CopyTiles( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE CopyTiles( + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 BufferStartOffsetInBytes, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags) = 0; - - virtual void STDMETHODCALLTYPE UpdateTiles( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE UpdateTiles( + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pDestTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSourceTileData, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE ResizeTilePool( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE ResizeTilePool( + /* [annotation] */ _In_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 NewSizeInBytes) = 0; - - virtual void STDMETHODCALLTYPE TiledResourceBarrier( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE TiledResourceBarrier( + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessBeforeBarrier, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessAfterBarrier) = 0; - + virtual BOOL STDMETHODCALLTYPE IsAnnotationEnabled( void) = 0; - - virtual void STDMETHODCALLTYPE SetMarkerInt( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetMarkerInt( + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data) = 0; - - virtual void STDMETHODCALLTYPE BeginEventInt( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE BeginEventInt( + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data) = 0; - + virtual void STDMETHODCALLTYPE EndEvent( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceContext2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceContext2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceContext2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceContext2 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D11DeviceContext2 * This); - - void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *DispatchIndirect )( + + void ( STDMETHODCALLTYPE *DispatchIndirect )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *CopyStructureCount )( + + void ( STDMETHODCALLTYPE *CopyStructureCount )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *SetResourceMinLOD )( + + void ( STDMETHODCALLTYPE *SetResourceMinLOD )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD); - - FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( + + FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *ExecuteCommandList )( + + void ( STDMETHODCALLTYPE *ExecuteCommandList )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState); - - void ( STDMETHODCALLTYPE *HSSetShaderResources )( + + void ( STDMETHODCALLTYPE *HSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSSetShader )( + + void ( STDMETHODCALLTYPE *HSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *HSSetSamplers )( + + void ( STDMETHODCALLTYPE *HSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSSetShaderResources )( + + void ( STDMETHODCALLTYPE *DSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSSetShader )( + + void ( STDMETHODCALLTYPE *DSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DSSetSamplers )( + + void ( STDMETHODCALLTYPE *DSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSSetShaderResources )( + + void ( STDMETHODCALLTYPE *CSSetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *CSSetShader )( + + void ( STDMETHODCALLTYPE *CSSetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *CSSetSamplers )( + + void ( STDMETHODCALLTYPE *CSSetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *HSGetShaderResources )( + + void ( STDMETHODCALLTYPE *HSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSGetShader )( + + void ( STDMETHODCALLTYPE *HSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *HSGetSamplers )( + + void ( STDMETHODCALLTYPE *HSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSGetShaderResources )( + + void ( STDMETHODCALLTYPE *DSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSGetShader )( + + void ( STDMETHODCALLTYPE *DSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *DSGetSamplers )( + + void ( STDMETHODCALLTYPE *DSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSGetShaderResources )( + + void ( STDMETHODCALLTYPE *CSGetShaderResources )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *CSGetShader )( + + void ( STDMETHODCALLTYPE *CSGetShader )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *CSGetSamplers )( + + void ( STDMETHODCALLTYPE *CSGetSamplers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D11DeviceContext2 * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D11DeviceContext2 * This); - - D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D11DeviceContext2 * This); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11DeviceContext2 * This); - - HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( + + HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( ID3D11DeviceContext2 * This, BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *UpdateSubresource1 )( + + void ( STDMETHODCALLTYPE *UpdateSubresource1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *DiscardView )( + + void ( STDMETHODCALLTYPE *DiscardView )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *SwapDeviceContextState )( + + void ( STDMETHODCALLTYPE *SwapDeviceContextState )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3DDeviceContextState *pState, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_ ID3DDeviceContextState **ppPreviousState); - - void ( STDMETHODCALLTYPE *ClearView )( + + void ( STDMETHODCALLTYPE *ClearView )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Color[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRect, UINT NumRects); - - void ( STDMETHODCALLTYPE *DiscardView1 )( + + void ( STDMETHODCALLTYPE *DiscardView1 )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects, UINT NumRects); - - HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumTiledResourceRegions, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILED_RESOURCE_COORDINATE *pTiledResourceRegionStartCoordinates, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILE_REGION_SIZE *pTiledResourceRegionSizes, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRanges, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeFlags, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pTilePoolStartOffsets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSourceTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pSourceRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 BufferStartOffsetInBytes, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *UpdateTiles )( + + void ( STDMETHODCALLTYPE *UpdateTiles )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pDestTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSourceTileData, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 NewSizeInBytes); - - void ( STDMETHODCALLTYPE *TiledResourceBarrier )( + + void ( STDMETHODCALLTYPE *TiledResourceBarrier )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessBeforeBarrier, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessAfterBarrier); - - BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( ID3D11DeviceContext2 * This); - - void ( STDMETHODCALLTYPE *SetMarkerInt )( + + void ( STDMETHODCALLTYPE *SetMarkerInt )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *BeginEventInt )( + + void ( STDMETHODCALLTYPE *BeginEventInt )( ID3D11DeviceContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D11DeviceContext2 * This); - + END_INTERFACE } ID3D11DeviceContext2Vtbl; @@ -1543,441 +1542,439 @@ EXTERN_C const IID IID_ID3D11DeviceContext2; CONST_VTBL struct ID3D11DeviceContext2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceContext2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceContext2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceContext2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceContext2_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceContext2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceContext2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceContext2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DeviceContext2_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D11DeviceContext2_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D11DeviceContext2_Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) \ - ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) + ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) #define ID3D11DeviceContext2_Unmap(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) #define ID3D11DeviceContext2_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D11DeviceContext2_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext2_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext2_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext2_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext2_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_GSSetShader(This,pShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D11DeviceContext2_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_Begin(This,pAsync) \ - ( (This)->lpVtbl -> Begin(This,pAsync) ) + ( (This)->lpVtbl -> Begin(This,pAsync) ) #define ID3D11DeviceContext2_End(This,pAsync) \ - ( (This)->lpVtbl -> End(This,pAsync) ) + ( (This)->lpVtbl -> End(This,pAsync) ) #define ID3D11DeviceContext2_GetData(This,pAsync,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) #define ID3D11DeviceContext2_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D11DeviceContext2_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D11DeviceContext2_OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext2_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D11DeviceContext2_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D11DeviceContext2_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D11DeviceContext2_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D11DeviceContext2_DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext2_DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext2_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D11DeviceContext2_DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext2_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D11DeviceContext2_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D11DeviceContext2_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D11DeviceContext2_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11DeviceContext2_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D11DeviceContext2_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11DeviceContext2_CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) \ - ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) + ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) #define ID3D11DeviceContext2_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D11DeviceContext2_ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext2_ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext2_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D11DeviceContext2_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D11DeviceContext2_SetResourceMinLOD(This,pResource,MinLOD) \ - ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) + ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) #define ID3D11DeviceContext2_GetResourceMinLOD(This,pResource) \ - ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) + ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) #define ID3D11DeviceContext2_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D11DeviceContext2_ExecuteCommandList(This,pCommandList,RestoreContextState) \ - ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) + ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) #define ID3D11DeviceContext2_HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext2_CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext2_CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D11DeviceContext2_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext2_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext2_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D11DeviceContext2_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D11DeviceContext2_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D11DeviceContext2_OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext2_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D11DeviceContext2_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D11DeviceContext2_SOGetTargets(This,NumBuffers,ppSOTargets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) #define ID3D11DeviceContext2_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D11DeviceContext2_RSGetViewports(This,pNumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) #define ID3D11DeviceContext2_RSGetScissorRects(This,pNumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) #define ID3D11DeviceContext2_HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext2_CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext2_CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext2_CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext2_CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext2_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D11DeviceContext2_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D11DeviceContext2_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D11DeviceContext2_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #define ID3D11DeviceContext2_FinishCommandList(This,RestoreDeferredContextState,ppCommandList) \ - ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) + ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) #define ID3D11DeviceContext2_CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) \ - ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) + ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) #define ID3D11DeviceContext2_UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) \ - ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) + ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) #define ID3D11DeviceContext2_DiscardResource(This,pResource) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource) ) #define ID3D11DeviceContext2_DiscardView(This,pResourceView) \ - ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) + ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) #define ID3D11DeviceContext2_VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext2_SwapDeviceContextState(This,pState,ppPreviousState) \ - ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) + ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) #define ID3D11DeviceContext2_ClearView(This,pView,Color,pRect,NumRects) \ - ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) + ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) #define ID3D11DeviceContext2_DiscardView1(This,pResourceView,pRects,NumRects) \ - ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) + ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) #define ID3D11DeviceContext2_UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) \ - ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) + ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) #define ID3D11DeviceContext2_CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) \ - ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) + ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) #define ID3D11DeviceContext2_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D11DeviceContext2_UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) \ - ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) + ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) #define ID3D11DeviceContext2_ResizeTilePool(This,pTilePool,NewSizeInBytes) \ - ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) + ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) #define ID3D11DeviceContext2_TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) \ - ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) + ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) #define ID3D11DeviceContext2_IsAnnotationEnabled(This) \ - ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) + ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) #define ID3D11DeviceContext2_SetMarkerInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) #define ID3D11DeviceContext2_BeginEventInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) #define ID3D11DeviceContext2_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #endif /* COBJMACROS */ @@ -1989,505 +1986,504 @@ EXTERN_C const IID IID_ID3D11DeviceContext2; #define __ID3D11Device2_INTERFACE_DEFINED__ /* interface ID3D11Device2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9d06dffa-d1e5-4d07-83a8-1bb123f2f841") ID3D11Device2 : public ID3D11Device1 { public: - virtual void STDMETHODCALLTYPE GetImmediateContext2( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetImmediateContext2( + /* [annotation] */ _Outptr_ ID3D11DeviceContext2 **ppImmediateContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext2( + + virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext2( UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext2 **ppDeferredContext) = 0; - - virtual void STDMETHODCALLTYPE GetResourceTiling( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetResourceTiling( + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pNumTilesForEntireResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_PACKED_MIP_DESC *pPackedMipDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_TILE_SHAPE *pStandardTileShapeForNonPackedMips, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumSubresourceTilings, - /* [annotation] */ + /* [annotation] */ _In_ UINT FirstSubresourceTilingToGet, - /* [annotation] */ + /* [annotation] */ _Out_writes_(*pNumSubresourceTilings) D3D11_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CheckMultisampleQualityLevels1( + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Device2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device2 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device2 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device2 * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device2 * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device2 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device2 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device2 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext1 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext1 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( ID3D11Device2 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( ID3D11Device2 * This, UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - void ( STDMETHODCALLTYPE *GetImmediateContext2 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext2 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext2 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( ID3D11Device2 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext2 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pNumTilesForEntireResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_PACKED_MIP_DESC *pPackedMipDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_TILE_SHAPE *pStandardTileShapeForNonPackedMips, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumSubresourceTilings, - /* [annotation] */ + /* [annotation] */ _In_ UINT FirstSubresourceTilingToGet, - /* [annotation] */ + /* [annotation] */ _Out_writes_(*pNumSubresourceTilings) D3D11_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( ID3D11Device2 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - + END_INTERFACE } ID3D11Device2Vtbl; @@ -2496,171 +2492,169 @@ EXTERN_C const IID IID_ID3D11Device2; CONST_VTBL struct ID3D11Device2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device2_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device2_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device2_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device2_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device2_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device2_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device2_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device2_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device2_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device2_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device2_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device2_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device2_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device2_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device2_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device2_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device2_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device2_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device2_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device2_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device2_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device2_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device2_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device2_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device2_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device2_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device2_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device2_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device2_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device2_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device2_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device2_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device2_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device2_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device2_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device2_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device2_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D11Device2_GetImmediateContext1(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) #define ID3D11Device2_CreateDeferredContext1(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device2_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device2_CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device2_CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) \ - ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) + ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) #define ID3D11Device2_OpenSharedResource1(This,hResource,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) #define ID3D11Device2_OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) #define ID3D11Device2_GetImmediateContext2(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) #define ID3D11Device2_CreateDeferredContext2(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device2_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D11Device2_CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) #endif /* COBJMACROS */ @@ -2669,7 +2663,7 @@ EXTERN_C const IID IID_ID3D11Device2; #endif /* __ID3D11Device2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_2_0000_0002 */ -/* [local] */ +/* [local] */ DEFINE_GUID(IID_ID3D11DeviceContext2,0x420d5b32,0xb90c,0x4da4,0xbe,0xf0,0x35,0x9f,0x6a,0x24,0xa8,0x3a); DEFINE_GUID(IID_ID3D11Device2,0x9d06dffa,0xd1e5,0x4d07,0x83,0xa8,0x1b,0xb1,0x23,0xf2,0xf8,0x41); diff --git a/gfx/include/dxsdk/d3d11_3.h b/gfx/include/dxsdk/d3d11_3.h index d36b4f449f..6fc17cc828 100644 --- a/gfx/include/dxsdk/d3d11_3.h +++ b/gfx/include/dxsdk/d3d11_3.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11Texture2D1_FWD_DEFINED__ #define __ID3D11Texture2D1_FWD_DEFINED__ @@ -115,10 +115,10 @@ typedef interface ID3D11Device3 ID3D11Device3; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11_3_0000_0000 */ -/* [local] */ +/* [local] */ #ifdef __cplusplus } @@ -127,7 +127,7 @@ extern "C"{ #ifdef __cplusplus extern "C"{ #endif -typedef +typedef enum D3D11_CONTEXT_TYPE { D3D11_CONTEXT_TYPE_ALL = 0, @@ -137,7 +137,7 @@ enum D3D11_CONTEXT_TYPE D3D11_CONTEXT_TYPE_VIDEO = 4 } D3D11_CONTEXT_TYPE; -typedef +typedef enum D3D11_TEXTURE_LAYOUT { D3D11_TEXTURE_LAYOUT_UNDEFINED = 0, @@ -226,94 +226,93 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0000_v0_0_s_ifspec; #define __ID3D11Texture2D1_INTERFACE_DEFINED__ /* interface ID3D11Texture2D1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Texture2D1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("51218251-1E33-4617-9CCB-4D3A4367E7BB") ID3D11Texture2D1 : public ID3D11Texture2D { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_TEXTURE2D_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Texture2D1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Texture2D1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Texture2D1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Texture2D1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Texture2D1 * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE2D_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11Texture2D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE2D_DESC1 *pDesc); - + END_INTERFACE } ID3D11Texture2D1Vtbl; @@ -322,45 +321,43 @@ EXTERN_C const IID IID_ID3D11Texture2D1; CONST_VTBL struct ID3D11Texture2D1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Texture2D1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Texture2D1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Texture2D1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Texture2D1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Texture2D1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Texture2D1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Texture2D1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Texture2D1_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Texture2D1_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Texture2D1_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Texture2D1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11Texture2D1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -369,7 +366,7 @@ EXTERN_C const IID IID_ID3D11Texture2D1; #endif /* __ID3D11Texture2D1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEXTURE3D_DESC1 { @@ -445,94 +442,93 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0001_v0_0_s_ifspec; #define __ID3D11Texture3D1_INTERFACE_DEFINED__ /* interface ID3D11Texture3D1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Texture3D1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0C711683-2853-4846-9BB0-F3E60639E46A") ID3D11Texture3D1 : public ID3D11Texture3D { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_TEXTURE3D_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Texture3D1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Texture3D1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Texture3D1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Texture3D1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetType )( + + void ( STDMETHODCALLTYPE *GetType )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RESOURCE_DIMENSION *pResourceDimension); - - void ( STDMETHODCALLTYPE *SetEvictionPriority )( + + void ( STDMETHODCALLTYPE *SetEvictionPriority )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT EvictionPriority); - - UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + UINT ( STDMETHODCALLTYPE *GetEvictionPriority )( ID3D11Texture3D1 * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE3D_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11Texture3D1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TEXTURE3D_DESC1 *pDesc); - + END_INTERFACE } ID3D11Texture3D1Vtbl; @@ -541,45 +537,43 @@ EXTERN_C const IID IID_ID3D11Texture3D1; CONST_VTBL struct ID3D11Texture3D1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Texture3D1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Texture3D1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Texture3D1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Texture3D1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Texture3D1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Texture3D1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Texture3D1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Texture3D1_GetType(This,pResourceDimension) \ - ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) + ( (This)->lpVtbl -> GetType(This,pResourceDimension) ) #define ID3D11Texture3D1_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define ID3D11Texture3D1_GetEvictionPriority(This) \ - ( (This)->lpVtbl -> GetEvictionPriority(This) ) + ( (This)->lpVtbl -> GetEvictionPriority(This) ) #define ID3D11Texture3D1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11Texture3D1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -588,9 +582,9 @@ EXTERN_C const IID IID_ID3D11Texture3D1; #endif /* __ID3D11Texture3D1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_CONSERVATIVE_RASTERIZATION_MODE { D3D11_CONSERVATIVE_RASTERIZATION_MODE_OFF = 0, @@ -647,8 +641,8 @@ struct CD3D11_RASTERIZER_DESC2 : public D3D11_RASTERIZER_DESC2 BOOL depthClipEnable, BOOL scissorEnable, BOOL multisampleEnable, - BOOL antialiasedLineEnable, - UINT forcedSampleCount, + BOOL antialiasedLineEnable, + UINT forcedSampleCount, D3D11_CONSERVATIVE_RASTERIZATION_MODE conservativeRaster ) { FillMode = fillMode; @@ -677,86 +671,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0002_v0_0_s_ifspec; #define __ID3D11RasterizerState2_INTERFACE_DEFINED__ /* interface ID3D11RasterizerState2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RasterizerState2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6fbd02fb-209f-46c4-b059-2ed15586a6ac") ID3D11RasterizerState2 : public ID3D11RasterizerState1 { public: - virtual void STDMETHODCALLTYPE GetDesc2( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc2( + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC2 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RasterizerState2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RasterizerState2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RasterizerState2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RasterizerState2 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC1 *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc2 )( + + void ( STDMETHODCALLTYPE *GetDesc2 )( ID3D11RasterizerState2 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RASTERIZER_DESC2 *pDesc); - + END_INTERFACE } ID3D11RasterizerState2Vtbl; @@ -765,39 +758,37 @@ EXTERN_C const IID IID_ID3D11RasterizerState2; CONST_VTBL struct ID3D11RasterizerState2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RasterizerState2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RasterizerState2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RasterizerState2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RasterizerState2_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11RasterizerState2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11RasterizerState2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11RasterizerState2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11RasterizerState2_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11RasterizerState2_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define ID3D11RasterizerState2_GetDesc2(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) #endif /* COBJMACROS */ @@ -806,7 +797,7 @@ EXTERN_C const IID IID_ID3D11RasterizerState2; #endif /* __ID3D11RasterizerState2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0003 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEX2D_SRV1 { @@ -828,7 +819,7 @@ typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC1 { DXGI_FORMAT Format; D3D11_SRV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_SRV Buffer; D3D11_TEX1D_SRV Texture1D; @@ -980,7 +971,7 @@ struct CD3D11_SHADER_RESOURCE_VIEW_DESC1 : public D3D11_SHADER_RESOURCE_VIEW_DES UINT planeSlice = 0 ) // PlaneSlice for TEXTURE2D or TEXTURE2DARRAY { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == mipLevels && D3D11_SRV_DIMENSION_TEXTURE2DMS != viewDimension && D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY != viewDimension) || @@ -1064,86 +1055,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0003_v0_0_s_ifspec; #define __ID3D11ShaderResourceView1_INTERFACE_DEFINED__ /* interface ID3D11ShaderResourceView1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ShaderResourceView1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("91308b87-9040-411d-8c67-c39253ce3802") ID3D11ShaderResourceView1 : public ID3D11ShaderResourceView { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ShaderResourceView1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ShaderResourceView1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ShaderResourceView1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ShaderResourceView1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11ShaderResourceView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1); - + END_INTERFACE } ID3D11ShaderResourceView1Vtbl; @@ -1152,39 +1142,37 @@ EXTERN_C const IID IID_ID3D11ShaderResourceView1; CONST_VTBL struct ID3D11ShaderResourceView1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ShaderResourceView1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ShaderResourceView1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ShaderResourceView1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ShaderResourceView1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11ShaderResourceView1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11ShaderResourceView1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11ShaderResourceView1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11ShaderResourceView1_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11ShaderResourceView1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11ShaderResourceView1_GetDesc1(This,pDesc1) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) #endif /* COBJMACROS */ @@ -1193,7 +1181,7 @@ EXTERN_C const IID IID_ID3D11ShaderResourceView1; #endif /* __ID3D11ShaderResourceView1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0004 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEX2D_RTV1 { @@ -1213,7 +1201,7 @@ typedef struct D3D11_RENDER_TARGET_VIEW_DESC1 { DXGI_FORMAT Format; D3D11_RTV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_RTV Buffer; D3D11_TEX1D_RTV Texture1D; @@ -1335,7 +1323,7 @@ struct CD3D11_RENDER_TARGET_VIEW_DESC1 : public D3D11_RENDER_TARGET_VIEW_DESC1 UINT planeSlice = 0 ) { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == arraySize && (D3D11_RTV_DIMENSION_TEXTURE2DARRAY == viewDimension || D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY == viewDimension))) @@ -1400,86 +1388,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0004_v0_0_s_ifspec; #define __ID3D11RenderTargetView1_INTERFACE_DEFINED__ /* interface ID3D11RenderTargetView1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RenderTargetView1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("ffbe2e23-f011-418a-ac56-5ceed7c5b94b") ID3D11RenderTargetView1 : public ID3D11RenderTargetView { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RenderTargetView1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RenderTargetView1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RenderTargetView1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RenderTargetView1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RENDER_TARGET_VIEW_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11RenderTargetView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1); - + END_INTERFACE } ID3D11RenderTargetView1Vtbl; @@ -1488,39 +1475,37 @@ EXTERN_C const IID IID_ID3D11RenderTargetView1; CONST_VTBL struct ID3D11RenderTargetView1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RenderTargetView1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RenderTargetView1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RenderTargetView1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RenderTargetView1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11RenderTargetView1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11RenderTargetView1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11RenderTargetView1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11RenderTargetView1_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11RenderTargetView1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11RenderTargetView1_GetDesc1(This,pDesc1) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) #endif /* COBJMACROS */ @@ -1529,7 +1514,7 @@ EXTERN_C const IID IID_ID3D11RenderTargetView1; #endif /* __ID3D11RenderTargetView1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0005 */ -/* [local] */ +/* [local] */ typedef struct D3D11_TEX2D_UAV1 { @@ -1549,7 +1534,7 @@ typedef struct D3D11_UNORDERED_ACCESS_VIEW_DESC1 { DXGI_FORMAT Format; D3D11_UAV_DIMENSION ViewDimension; - union + union { D3D11_BUFFER_UAV Buffer; D3D11_TEX1D_UAV Texture1D; @@ -1663,11 +1648,11 @@ struct CD3D11_UNORDERED_ACCESS_VIEW_DESC1 : public D3D11_UNORDERED_ACCESS_VIEW_D DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT mipSlice = 0, UINT firstArraySlice = 0, - UINT arraySize = -1, - UINT planeSlice = 0 ) + UINT arraySize = -1, + UINT planeSlice = 0 ) { ViewDimension = viewDimension; - if (DXGI_FORMAT_UNKNOWN == format || + if (DXGI_FORMAT_UNKNOWN == format || (-1 == arraySize && D3D11_UAV_DIMENSION_TEXTURE2DARRAY == viewDimension)) { D3D11_TEXTURE2D_DESC TexDesc; @@ -1724,86 +1709,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0005_v0_0_s_ifspec; #define __ID3D11UnorderedAccessView1_INTERFACE_DEFINED__ /* interface ID3D11UnorderedAccessView1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11UnorderedAccessView1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7b3b6153-a886-4544-ab37-6537c8500403") ID3D11UnorderedAccessView1 : public ID3D11UnorderedAccessView { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11UnorderedAccessView1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11UnorderedAccessView1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11UnorderedAccessView1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11UnorderedAccessView1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *GetResource )( + + void ( STDMETHODCALLTYPE *GetResource )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Resource **ppResource); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11UnorderedAccessView1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1); - + END_INTERFACE } ID3D11UnorderedAccessView1Vtbl; @@ -1812,39 +1796,37 @@ EXTERN_C const IID IID_ID3D11UnorderedAccessView1; CONST_VTBL struct ID3D11UnorderedAccessView1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11UnorderedAccessView1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11UnorderedAccessView1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11UnorderedAccessView1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11UnorderedAccessView1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11UnorderedAccessView1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11UnorderedAccessView1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11UnorderedAccessView1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11UnorderedAccessView1_GetResource(This,ppResource) \ - ( (This)->lpVtbl -> GetResource(This,ppResource) ) + ( (This)->lpVtbl -> GetResource(This,ppResource) ) #define ID3D11UnorderedAccessView1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11UnorderedAccessView1_GetDesc1(This,pDesc1) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) #endif /* COBJMACROS */ @@ -1853,7 +1835,7 @@ EXTERN_C const IID IID_ID3D11UnorderedAccessView1; #endif /* __ID3D11UnorderedAccessView1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0006 */ -/* [local] */ +/* [local] */ typedef struct D3D11_QUERY_DESC1 { @@ -1893,84 +1875,83 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0006_v0_0_s_ifspec; #define __ID3D11Query1_INTERFACE_DEFINED__ /* interface ID3D11Query1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Query1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("631b4766-36dc-461d-8db6-c47e13e60916") ID3D11Query1 : public ID3D11Query { public: - virtual void STDMETHODCALLTYPE GetDesc1( - /* [annotation] */ + virtual void STDMETHODCALLTYPE GetDesc1( + /* [annotation] */ _Out_ D3D11_QUERY_DESC1 *pDesc1) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Query1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Query1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Query1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Query1 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - UINT ( STDMETHODCALLTYPE *GetDataSize )( + + UINT ( STDMETHODCALLTYPE *GetDataSize )( ID3D11Query1 * This); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_QUERY_DESC *pDesc); - - void ( STDMETHODCALLTYPE *GetDesc1 )( + + void ( STDMETHODCALLTYPE *GetDesc1 )( ID3D11Query1 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_QUERY_DESC1 *pDesc1); - + END_INTERFACE } ID3D11Query1Vtbl; @@ -1979,39 +1960,37 @@ EXTERN_C const IID IID_ID3D11Query1; CONST_VTBL struct ID3D11Query1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Query1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Query1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Query1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Query1_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Query1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Query1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Query1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Query1_GetDataSize(This) \ - ( (This)->lpVtbl -> GetDataSize(This) ) + ( (This)->lpVtbl -> GetDataSize(This) ) #define ID3D11Query1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define ID3D11Query1_GetDesc1(This,pDesc1) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc1) ) #endif /* COBJMACROS */ @@ -2020,9 +1999,9 @@ EXTERN_C const IID IID_ID3D11Query1; #endif /* __ID3D11Query1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0007 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_FENCE_FLAG { D3D11_FENCE_FLAG_NONE = 0x1, @@ -2039,1332 +2018,1331 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_3_0000_0007_v0_0_s_ifspec; #define __ID3D11DeviceContext3_INTERFACE_DEFINED__ /* interface ID3D11DeviceContext3 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceContext3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("b4e3c01d-e79e-4637-91b2-510e9f4c9b8f") ID3D11DeviceContext3 : public ID3D11DeviceContext2 { public: - virtual void STDMETHODCALLTYPE Flush1( + virtual void STDMETHODCALLTYPE Flush1( D3D11_CONTEXT_TYPE ContextType, - /* [annotation] */ + /* [annotation] */ _In_opt_ HANDLE hEvent) = 0; - - virtual void STDMETHODCALLTYPE SetHardwareProtectionState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetHardwareProtectionState( + /* [annotation] */ _In_ BOOL HwProtectionEnable) = 0; - - virtual void STDMETHODCALLTYPE GetHardwareProtectionState( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetHardwareProtectionState( + /* [annotation] */ _Out_ BOOL *pHwProtectionEnable) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceContext3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceContext3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceContext3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceContext3 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D11DeviceContext3 * This); - - void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *DispatchIndirect )( + + void ( STDMETHODCALLTYPE *DispatchIndirect )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *CopyStructureCount )( + + void ( STDMETHODCALLTYPE *CopyStructureCount )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *SetResourceMinLOD )( + + void ( STDMETHODCALLTYPE *SetResourceMinLOD )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD); - - FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( + + FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *ExecuteCommandList )( + + void ( STDMETHODCALLTYPE *ExecuteCommandList )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState); - - void ( STDMETHODCALLTYPE *HSSetShaderResources )( + + void ( STDMETHODCALLTYPE *HSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSSetShader )( + + void ( STDMETHODCALLTYPE *HSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *HSSetSamplers )( + + void ( STDMETHODCALLTYPE *HSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSSetShaderResources )( + + void ( STDMETHODCALLTYPE *DSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSSetShader )( + + void ( STDMETHODCALLTYPE *DSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DSSetSamplers )( + + void ( STDMETHODCALLTYPE *DSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSSetShaderResources )( + + void ( STDMETHODCALLTYPE *CSSetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *CSSetShader )( + + void ( STDMETHODCALLTYPE *CSSetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *CSSetSamplers )( + + void ( STDMETHODCALLTYPE *CSSetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *HSGetShaderResources )( + + void ( STDMETHODCALLTYPE *HSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSGetShader )( + + void ( STDMETHODCALLTYPE *HSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *HSGetSamplers )( + + void ( STDMETHODCALLTYPE *HSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSGetShaderResources )( + + void ( STDMETHODCALLTYPE *DSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSGetShader )( + + void ( STDMETHODCALLTYPE *DSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *DSGetSamplers )( + + void ( STDMETHODCALLTYPE *DSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSGetShaderResources )( + + void ( STDMETHODCALLTYPE *CSGetShaderResources )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *CSGetShader )( + + void ( STDMETHODCALLTYPE *CSGetShader )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *CSGetSamplers )( + + void ( STDMETHODCALLTYPE *CSGetSamplers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D11DeviceContext3 * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D11DeviceContext3 * This); - - D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D11DeviceContext3 * This); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11DeviceContext3 * This); - - HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( + + HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( ID3D11DeviceContext3 * This, BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *UpdateSubresource1 )( + + void ( STDMETHODCALLTYPE *UpdateSubresource1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *DiscardView )( + + void ( STDMETHODCALLTYPE *DiscardView )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *SwapDeviceContextState )( + + void ( STDMETHODCALLTYPE *SwapDeviceContextState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3DDeviceContextState *pState, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_ ID3DDeviceContextState **ppPreviousState); - - void ( STDMETHODCALLTYPE *ClearView )( + + void ( STDMETHODCALLTYPE *ClearView )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Color[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRect, UINT NumRects); - - void ( STDMETHODCALLTYPE *DiscardView1 )( + + void ( STDMETHODCALLTYPE *DiscardView1 )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects, UINT NumRects); - - HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumTiledResourceRegions, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILED_RESOURCE_COORDINATE *pTiledResourceRegionStartCoordinates, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILE_REGION_SIZE *pTiledResourceRegionSizes, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRanges, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeFlags, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pTilePoolStartOffsets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSourceTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pSourceRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 BufferStartOffsetInBytes, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *UpdateTiles )( + + void ( STDMETHODCALLTYPE *UpdateTiles )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pDestTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSourceTileData, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 NewSizeInBytes); - - void ( STDMETHODCALLTYPE *TiledResourceBarrier )( + + void ( STDMETHODCALLTYPE *TiledResourceBarrier )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessBeforeBarrier, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessAfterBarrier); - - BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( ID3D11DeviceContext3 * This); - - void ( STDMETHODCALLTYPE *SetMarkerInt )( + + void ( STDMETHODCALLTYPE *SetMarkerInt )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *BeginEventInt )( + + void ( STDMETHODCALLTYPE *BeginEventInt )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D11DeviceContext3 * This); - - void ( STDMETHODCALLTYPE *Flush1 )( + + void ( STDMETHODCALLTYPE *Flush1 )( ID3D11DeviceContext3 * This, D3D11_CONTEXT_TYPE ContextType, - /* [annotation] */ + /* [annotation] */ _In_opt_ HANDLE hEvent); - - void ( STDMETHODCALLTYPE *SetHardwareProtectionState )( + + void ( STDMETHODCALLTYPE *SetHardwareProtectionState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL HwProtectionEnable); - - void ( STDMETHODCALLTYPE *GetHardwareProtectionState )( + + void ( STDMETHODCALLTYPE *GetHardwareProtectionState )( ID3D11DeviceContext3 * This, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pHwProtectionEnable); - + END_INTERFACE } ID3D11DeviceContext3Vtbl; @@ -3373,450 +3351,448 @@ EXTERN_C const IID IID_ID3D11DeviceContext3; CONST_VTBL struct ID3D11DeviceContext3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceContext3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceContext3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceContext3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceContext3_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceContext3_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceContext3_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceContext3_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DeviceContext3_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D11DeviceContext3_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D11DeviceContext3_Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) \ - ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) + ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) #define ID3D11DeviceContext3_Unmap(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) #define ID3D11DeviceContext3_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D11DeviceContext3_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext3_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext3_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext3_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext3_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_GSSetShader(This,pShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D11DeviceContext3_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_Begin(This,pAsync) \ - ( (This)->lpVtbl -> Begin(This,pAsync) ) + ( (This)->lpVtbl -> Begin(This,pAsync) ) #define ID3D11DeviceContext3_End(This,pAsync) \ - ( (This)->lpVtbl -> End(This,pAsync) ) + ( (This)->lpVtbl -> End(This,pAsync) ) #define ID3D11DeviceContext3_GetData(This,pAsync,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) #define ID3D11DeviceContext3_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D11DeviceContext3_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D11DeviceContext3_OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext3_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D11DeviceContext3_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D11DeviceContext3_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D11DeviceContext3_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D11DeviceContext3_DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext3_DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext3_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D11DeviceContext3_DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext3_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D11DeviceContext3_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D11DeviceContext3_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D11DeviceContext3_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11DeviceContext3_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D11DeviceContext3_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11DeviceContext3_CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) \ - ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) + ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) #define ID3D11DeviceContext3_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D11DeviceContext3_ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext3_ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext3_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D11DeviceContext3_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D11DeviceContext3_SetResourceMinLOD(This,pResource,MinLOD) \ - ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) + ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) #define ID3D11DeviceContext3_GetResourceMinLOD(This,pResource) \ - ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) + ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) #define ID3D11DeviceContext3_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D11DeviceContext3_ExecuteCommandList(This,pCommandList,RestoreContextState) \ - ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) + ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) #define ID3D11DeviceContext3_HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext3_CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext3_CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D11DeviceContext3_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext3_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext3_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D11DeviceContext3_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D11DeviceContext3_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D11DeviceContext3_OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext3_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D11DeviceContext3_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D11DeviceContext3_SOGetTargets(This,NumBuffers,ppSOTargets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) #define ID3D11DeviceContext3_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D11DeviceContext3_RSGetViewports(This,pNumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) #define ID3D11DeviceContext3_RSGetScissorRects(This,pNumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) #define ID3D11DeviceContext3_HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext3_CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext3_CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext3_CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext3_CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext3_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D11DeviceContext3_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D11DeviceContext3_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D11DeviceContext3_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #define ID3D11DeviceContext3_FinishCommandList(This,RestoreDeferredContextState,ppCommandList) \ - ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) + ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) #define ID3D11DeviceContext3_CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) \ - ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) + ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) #define ID3D11DeviceContext3_UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) \ - ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) + ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) #define ID3D11DeviceContext3_DiscardResource(This,pResource) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource) ) #define ID3D11DeviceContext3_DiscardView(This,pResourceView) \ - ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) + ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) #define ID3D11DeviceContext3_VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext3_SwapDeviceContextState(This,pState,ppPreviousState) \ - ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) + ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) #define ID3D11DeviceContext3_ClearView(This,pView,Color,pRect,NumRects) \ - ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) + ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) #define ID3D11DeviceContext3_DiscardView1(This,pResourceView,pRects,NumRects) \ - ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) + ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) #define ID3D11DeviceContext3_UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) \ - ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) + ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) #define ID3D11DeviceContext3_CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) \ - ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) + ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) #define ID3D11DeviceContext3_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D11DeviceContext3_UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) \ - ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) + ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) #define ID3D11DeviceContext3_ResizeTilePool(This,pTilePool,NewSizeInBytes) \ - ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) + ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) #define ID3D11DeviceContext3_TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) \ - ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) + ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) #define ID3D11DeviceContext3_IsAnnotationEnabled(This) \ - ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) + ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) #define ID3D11DeviceContext3_SetMarkerInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) #define ID3D11DeviceContext3_BeginEventInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) #define ID3D11DeviceContext3_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D11DeviceContext3_Flush1(This,ContextType,hEvent) \ - ( (This)->lpVtbl -> Flush1(This,ContextType,hEvent) ) + ( (This)->lpVtbl -> Flush1(This,ContextType,hEvent) ) #define ID3D11DeviceContext3_SetHardwareProtectionState(This,HwProtectionEnable) \ - ( (This)->lpVtbl -> SetHardwareProtectionState(This,HwProtectionEnable) ) + ( (This)->lpVtbl -> SetHardwareProtectionState(This,HwProtectionEnable) ) #define ID3D11DeviceContext3_GetHardwareProtectionState(This,pHwProtectionEnable) \ - ( (This)->lpVtbl -> GetHardwareProtectionState(This,pHwProtectionEnable) ) + ( (This)->lpVtbl -> GetHardwareProtectionState(This,pHwProtectionEnable) ) #endif /* COBJMACROS */ @@ -3828,106 +3804,105 @@ EXTERN_C const IID IID_ID3D11DeviceContext3; #define __ID3D11Fence_INTERFACE_DEFINED__ /* interface ID3D11Fence */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Fence; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("affde9d1-1df7-4bb7-8a34-0f46251dab80") ID3D11Fence : public ID3D11DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( + /* [annotation] */ _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwAccess, - /* [annotation] */ + /* [annotation] */ _In_opt_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _Out_ HANDLE *pHandle) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetCompletedValue( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetEventOnCompletion( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetEventOnCompletion( + /* [annotation] */ _In_ UINT64 Value, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hEvent) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11FenceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Fence * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Fence * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Fence * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwAccess, - /* [annotation] */ + /* [annotation] */ _In_opt_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _Out_ HANDLE *pHandle); - - UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( + + UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( ID3D11Fence * This); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( ID3D11Fence * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 Value, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hEvent); - + END_INTERFACE } ID3D11FenceVtbl; @@ -3936,39 +3911,37 @@ EXTERN_C const IID IID_ID3D11Fence; CONST_VTBL struct ID3D11FenceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Fence_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Fence_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Fence_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Fence_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11Fence_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Fence_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Fence_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Fence_CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) ) #define ID3D11Fence_GetCompletedValue(This) \ - ( (This)->lpVtbl -> GetCompletedValue(This) ) + ( (This)->lpVtbl -> GetCompletedValue(This) ) #define ID3D11Fence_SetEventOnCompletion(This,Value,hEvent) \ - ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) + ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) #endif /* COBJMACROS */ @@ -3980,1345 +3953,1344 @@ EXTERN_C const IID IID_ID3D11Fence; #define __ID3D11DeviceContext4_INTERFACE_DEFINED__ /* interface ID3D11DeviceContext4 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11DeviceContext4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("917600da-f58c-4c33-98d8-3e15b390fa24") ID3D11DeviceContext4 : public ID3D11DeviceContext3 { public: - virtual HRESULT STDMETHODCALLTYPE Signal( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE Signal( + /* [annotation] */ _In_ ID3D11Fence *pFence, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 Value) = 0; - - virtual HRESULT STDMETHODCALLTYPE Wait( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE Wait( + /* [annotation] */ _In_ ID3D11Fence *pFence, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 Value) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DeviceContext4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11DeviceContext4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11DeviceContext4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11DeviceContext4 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSSetShaderResources )( + + void ( STDMETHODCALLTYPE *PSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSSetShader )( + + void ( STDMETHODCALLTYPE *PSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11PixelShader *pPixelShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *PSSetSamplers )( + + void ( STDMETHODCALLTYPE *PSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *VSSetShader )( + + void ( STDMETHODCALLTYPE *VSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11VertexShader *pVertexShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DrawIndexed )( + + void ( STDMETHODCALLTYPE *DrawIndexed )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation); - - void ( STDMETHODCALLTYPE *Draw )( + + void ( STDMETHODCALLTYPE *Draw )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MAP MapType, - /* [annotation] */ + /* [annotation] */ _In_ UINT MapFlags, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_MAPPED_SUBRESOURCE *pMappedResource); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT Subresource); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IASetInputLayout )( + + void ( STDMETHODCALLTYPE *IASetInputLayout )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11InputLayout *pInputLayout); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT Offset); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT IndexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartIndexLocation, - /* [annotation] */ + /* [annotation] */ _In_ INT BaseVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT VertexCountPerInstance, - /* [annotation] */ + /* [annotation] */ _In_ UINT InstanceCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartVertexLocation, - /* [annotation] */ + /* [annotation] */ _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSSetShader )( + + void ( STDMETHODCALLTYPE *GSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11GeometryShader *pShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_PRIMITIVE_TOPOLOGY Topology); - - void ( STDMETHODCALLTYPE *VSSetShaderResources )( + + void ( STDMETHODCALLTYPE *VSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSSetSamplers )( + + void ( STDMETHODCALLTYPE *VSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *Begin )( + + void ( STDMETHODCALLTYPE *Begin )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - void ( STDMETHODCALLTYPE *End )( + + void ( STDMETHODCALLTYPE *End )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync); - - HRESULT ( STDMETHODCALLTYPE *GetData )( + + HRESULT ( STDMETHODCALLTYPE *GetData )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Asynchronous *pAsync, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( DataSize ) void *pData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT GetDataFlags); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Predicate *pPredicate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL PredicateValue); - - void ( STDMETHODCALLTYPE *GSSetShaderResources )( + + void ( STDMETHODCALLTYPE *GSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSSetSamplers )( + + void ( STDMETHODCALLTYPE *GSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView); - - void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRTVs) ID3D11RenderTargetView *const *ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *OMSetBlendState )( + + void ( STDMETHODCALLTYPE *OMSetBlendState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11BlendState *pBlendState, - /* [annotation] */ + /* [annotation] */ _In_opt_ const FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleMask); - - void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMSetDepthStencilState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DepthStencilState *pDepthStencilState, - /* [annotation] */ + /* [annotation] */ _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppSOTargets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pOffsets); - - void ( STDMETHODCALLTYPE *DrawAuto )( + + void ( STDMETHODCALLTYPE *DrawAuto )( ID3D11DeviceContext4 * This); - - void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstancedIndirect )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( + + void ( STDMETHODCALLTYPE *DrawInstancedIndirect )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountX, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountY, - /* [annotation] */ + /* [annotation] */ _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *DispatchIndirect )( + + void ( STDMETHODCALLTYPE *DispatchIndirect )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBufferForArgs, - /* [annotation] */ + /* [annotation] */ _In_ UINT AlignedByteOffsetForArgs); - - void ( STDMETHODCALLTYPE *RSSetState )( + + void ( STDMETHODCALLTYPE *RSSetState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11RasterizerState *pRasterizerState); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViewports) const D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *UpdateSubresource )( + + void ( STDMETHODCALLTYPE *UpdateSubresource )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *CopyStructureCount )( + + void ( STDMETHODCALLTYPE *CopyStructureCount )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pDstBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstAlignedByteOffset, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pSrcView); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11RenderTargetView *pRenderTargetView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT ColorRGBA[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const UINT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11UnorderedAccessView *pUnorderedAccessView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Values[ 4 ]); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DepthStencilView *pDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_ UINT ClearFlags, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Depth, - /* [annotation] */ + /* [annotation] */ _In_ UINT8 Stencil); - - void ( STDMETHODCALLTYPE *GenerateMips )( + + void ( STDMETHODCALLTYPE *GenerateMips )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11ShaderResourceView *pShaderResourceView); - - void ( STDMETHODCALLTYPE *SetResourceMinLOD )( + + void ( STDMETHODCALLTYPE *SetResourceMinLOD )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, FLOAT MinLOD); - - FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( + + FLOAT ( STDMETHODCALLTYPE *GetResourceMinLOD )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *ExecuteCommandList )( + + void ( STDMETHODCALLTYPE *ExecuteCommandList )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CommandList *pCommandList, BOOL RestoreContextState); - - void ( STDMETHODCALLTYPE *HSSetShaderResources )( + + void ( STDMETHODCALLTYPE *HSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSSetShader )( + + void ( STDMETHODCALLTYPE *HSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11HullShader *pHullShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *HSSetSamplers )( + + void ( STDMETHODCALLTYPE *HSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSSetShaderResources )( + + void ( STDMETHODCALLTYPE *DSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSSetShader )( + + void ( STDMETHODCALLTYPE *DSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DomainShader *pDomainShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *DSSetSamplers )( + + void ( STDMETHODCALLTYPE *DSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSSetShaderResources )( + + void ( STDMETHODCALLTYPE *CSSetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumViews) ID3D11ShaderResourceView *const *ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSSetUnorderedAccessViews )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) ID3D11UnorderedAccessView *const *ppUnorderedAccessViews, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumUAVs) const UINT *pUAVInitialCounts); - - void ( STDMETHODCALLTYPE *CSSetShader )( + + void ( STDMETHODCALLTYPE *CSSetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ComputeShader *pComputeShader, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumClassInstances) ID3D11ClassInstance *const *ppClassInstances, UINT NumClassInstances); - - void ( STDMETHODCALLTYPE *CSSetSamplers )( + + void ( STDMETHODCALLTYPE *CSSetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumSamplers) ID3D11SamplerState *const *ppSamplers); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *PSGetShaderResources )( + + void ( STDMETHODCALLTYPE *PSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *PSGetShader )( + + void ( STDMETHODCALLTYPE *PSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11PixelShader **ppPixelShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetSamplers )( + + void ( STDMETHODCALLTYPE *PSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *VSGetShader )( + + void ( STDMETHODCALLTYPE *VSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11VertexShader **ppVertexShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *IAGetInputLayout )( + + void ( STDMETHODCALLTYPE *IAGetInputLayout )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11InputLayout **ppInputLayout); - - void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IAGetVertexBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppVertexBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pStrides, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pOffsets); - - void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IAGetIndexBuffer )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Buffer **pIndexBuffer, - /* [annotation] */ + /* [annotation] */ _Out_opt_ DXGI_FORMAT *Format, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *Offset); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *GSGetShader )( + + void ( STDMETHODCALLTYPE *GSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11GeometryShader **ppGeometryShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IAGetPrimitiveTopology )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_PRIMITIVE_TOPOLOGY *pTopology); - - void ( STDMETHODCALLTYPE *VSGetShaderResources )( + + void ( STDMETHODCALLTYPE *VSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *VSGetSamplers )( + + void ( STDMETHODCALLTYPE *VSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *GetPredication )( + + void ( STDMETHODCALLTYPE *GetPredication )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11Predicate **ppPredicate, - /* [annotation] */ + /* [annotation] */ _Out_opt_ BOOL *pPredicateValue); - - void ( STDMETHODCALLTYPE *GSGetShaderResources )( + + void ( STDMETHODCALLTYPE *GSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *GSGetSamplers )( + + void ( STDMETHODCALLTYPE *GSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *OMGetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargets )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView); - - void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *OMGetRenderTargetsAndUnorderedAccessViews )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT ) UINT NumRTVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumRTVs) ID3D11RenderTargetView **ppRenderTargetViews, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilView **ppDepthStencilView, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - 1 ) UINT UAVStartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_PS_CS_UAV_REGISTER_COUNT - UAVStartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *OMGetBlendState )( + + void ( STDMETHODCALLTYPE *OMGetBlendState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11BlendState **ppBlendState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ FLOAT BlendFactor[ 4 ], - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pSampleMask); - - void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( + + void ( STDMETHODCALLTYPE *OMGetDepthStencilState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_result_maybenull_ ID3D11DepthStencilState **ppDepthStencilState, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pStencilRef); - - void ( STDMETHODCALLTYPE *SOGetTargets )( + + void ( STDMETHODCALLTYPE *SOGetTargets )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppSOTargets); - - void ( STDMETHODCALLTYPE *RSGetState )( + + void ( STDMETHODCALLTYPE *RSGetState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11RasterizerState **ppRasterizerState); - - void ( STDMETHODCALLTYPE *RSGetViewports )( + + void ( STDMETHODCALLTYPE *RSGetViewports )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumViewports, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumViewports) D3D11_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSGetScissorRects )( + + void ( STDMETHODCALLTYPE *RSGetScissorRects )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Inout_ /*_range(0, D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE )*/ UINT *pNumRects, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumRects) D3D11_RECT *pRects); - - void ( STDMETHODCALLTYPE *HSGetShaderResources )( + + void ( STDMETHODCALLTYPE *HSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *HSGetShader )( + + void ( STDMETHODCALLTYPE *HSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11HullShader **ppHullShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *HSGetSamplers )( + + void ( STDMETHODCALLTYPE *HSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *DSGetShaderResources )( + + void ( STDMETHODCALLTYPE *DSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *DSGetShader )( + + void ( STDMETHODCALLTYPE *DSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11DomainShader **ppDomainShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *DSGetSamplers )( + + void ( STDMETHODCALLTYPE *DSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *CSGetShaderResources )( + + void ( STDMETHODCALLTYPE *CSGetShaderResources )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT - StartSlot ) UINT NumViews, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumViews) ID3D11ShaderResourceView **ppShaderResourceViews); - - void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( + + void ( STDMETHODCALLTYPE *CSGetUnorderedAccessViews )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_1_UAV_SLOT_COUNT - StartSlot ) UINT NumUAVs, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumUAVs) ID3D11UnorderedAccessView **ppUnorderedAccessViews); - - void ( STDMETHODCALLTYPE *CSGetShader )( + + void ( STDMETHODCALLTYPE *CSGetShader )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_result_maybenull_ ID3D11ComputeShader **ppComputeShader, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNumClassInstances) ID3D11ClassInstance **ppClassInstances, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumClassInstances); - - void ( STDMETHODCALLTYPE *CSGetSamplers )( + + void ( STDMETHODCALLTYPE *CSGetSamplers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT - StartSlot ) UINT NumSamplers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumSamplers) ID3D11SamplerState **ppSamplers); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D11DeviceContext4 * This); - - void ( STDMETHODCALLTYPE *Flush )( + + void ( STDMETHODCALLTYPE *Flush )( ID3D11DeviceContext4 * This); - - D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D11_DEVICE_CONTEXT_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D11DeviceContext4 * This); - - UINT ( STDMETHODCALLTYPE *GetContextFlags )( + + UINT ( STDMETHODCALLTYPE *GetContextFlags )( ID3D11DeviceContext4 * This); - - HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( + + HRESULT ( STDMETHODCALLTYPE *FinishCommandList )( ID3D11DeviceContext4 * This, BOOL RestoreDeferredContextState, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11CommandList **ppCommandList); - - void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( + + void ( STDMETHODCALLTYPE *CopySubresourceRegion1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstX, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstY, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstZ, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *UpdateSubresource1 )( + + void ( STDMETHODCALLTYPE *UpdateSubresource1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT CopyFlags); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource); - - void ( STDMETHODCALLTYPE *DiscardView )( + + void ( STDMETHODCALLTYPE *DiscardView )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView); - - void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSSetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) ID3D11Buffer *const *ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumBuffers) const UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *VSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *HSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *DSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *GSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *PSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( + + void ( STDMETHODCALLTYPE *CSGetConstantBuffers1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - 1 ) UINT StartSlot, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT - StartSlot ) UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) ID3D11Buffer **ppConstantBuffers, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pFirstConstant, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(NumBuffers) UINT *pNumConstants); - - void ( STDMETHODCALLTYPE *SwapDeviceContextState )( + + void ( STDMETHODCALLTYPE *SwapDeviceContextState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3DDeviceContextState *pState, - /* [annotation] */ + /* [annotation] */ _Outptr_opt_ ID3DDeviceContextState **ppPreviousState); - - void ( STDMETHODCALLTYPE *ClearView )( + + void ( STDMETHODCALLTYPE *ClearView )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pView, - /* [annotation] */ + /* [annotation] */ _In_ const FLOAT Color[ 4 ], - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRect, UINT NumRects); - - void ( STDMETHODCALLTYPE *DiscardView1 )( + + void ( STDMETHODCALLTYPE *DiscardView1 )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11View *pResourceView, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRects) const D3D11_RECT *pRects, UINT NumRects); - - HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *UpdateTileMappings )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumTiledResourceRegions, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILED_RESOURCE_COORDINATE *pTiledResourceRegionStartCoordinates, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumTiledResourceRegions) const D3D11_TILE_REGION_SIZE *pTiledResourceRegionSizes, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumRanges, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeFlags, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pTilePoolStartOffsets, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( + + HRESULT ( STDMETHODCALLTYPE *CopyTileMappings )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSourceTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pSourceRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pBuffer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 BufferStartOffsetInBytes, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - void ( STDMETHODCALLTYPE *UpdateTiles )( + + void ( STDMETHODCALLTYPE *UpdateTiles )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDestTiledResource, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILED_RESOURCE_COORDINATE *pDestTileRegionStartCoordinate, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TILE_REGION_SIZE *pDestTileRegionSize, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSourceTileData, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTilePool )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Buffer *pTilePool, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 NewSizeInBytes); - - void ( STDMETHODCALLTYPE *TiledResourceBarrier )( + + void ( STDMETHODCALLTYPE *TiledResourceBarrier )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessBeforeBarrier, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11DeviceChild *pTiledResourceOrViewAccessAfterBarrier); - - BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsAnnotationEnabled )( ID3D11DeviceContext4 * This); - - void ( STDMETHODCALLTYPE *SetMarkerInt )( + + void ( STDMETHODCALLTYPE *SetMarkerInt )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *BeginEventInt )( + + void ( STDMETHODCALLTYPE *BeginEventInt )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR pLabel, INT Data); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D11DeviceContext4 * This); - - void ( STDMETHODCALLTYPE *Flush1 )( + + void ( STDMETHODCALLTYPE *Flush1 )( ID3D11DeviceContext4 * This, D3D11_CONTEXT_TYPE ContextType, - /* [annotation] */ + /* [annotation] */ _In_opt_ HANDLE hEvent); - - void ( STDMETHODCALLTYPE *SetHardwareProtectionState )( + + void ( STDMETHODCALLTYPE *SetHardwareProtectionState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL HwProtectionEnable); - - void ( STDMETHODCALLTYPE *GetHardwareProtectionState )( + + void ( STDMETHODCALLTYPE *GetHardwareProtectionState )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pHwProtectionEnable); - - HRESULT ( STDMETHODCALLTYPE *Signal )( + + HRESULT ( STDMETHODCALLTYPE *Signal )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Fence *pFence, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 Value); - - HRESULT ( STDMETHODCALLTYPE *Wait )( + + HRESULT ( STDMETHODCALLTYPE *Wait )( ID3D11DeviceContext4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Fence *pFence, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 Value); - + END_INTERFACE } ID3D11DeviceContext4Vtbl; @@ -5327,456 +5299,454 @@ EXTERN_C const IID IID_ID3D11DeviceContext4; CONST_VTBL struct ID3D11DeviceContext4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11DeviceContext4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11DeviceContext4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11DeviceContext4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11DeviceContext4_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11DeviceContext4_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11DeviceContext4_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11DeviceContext4_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11DeviceContext4_VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> PSSetShader(This,pPixelShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> VSSetShader(This,pVertexShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) \ - ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) + ( (This)->lpVtbl -> DrawIndexed(This,IndexCount,StartIndexLocation,BaseVertexLocation) ) #define ID3D11DeviceContext4_Draw(This,VertexCount,StartVertexLocation) \ - ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) + ( (This)->lpVtbl -> Draw(This,VertexCount,StartVertexLocation) ) #define ID3D11DeviceContext4_Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) \ - ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) + ( (This)->lpVtbl -> Map(This,pResource,Subresource,MapType,MapFlags,pMappedResource) ) #define ID3D11DeviceContext4_Unmap(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Unmap(This,pResource,Subresource) ) #define ID3D11DeviceContext4_PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_IASetInputLayout(This,pInputLayout) \ - ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) + ( (This)->lpVtbl -> IASetInputLayout(This,pInputLayout) ) #define ID3D11DeviceContext4_IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext4_IASetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext4_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext4_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D11DeviceContext4_GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_GSSetShader(This,pShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> GSSetShader(This,pShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_IASetPrimitiveTopology(This,Topology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,Topology) ) #define ID3D11DeviceContext4_VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_Begin(This,pAsync) \ - ( (This)->lpVtbl -> Begin(This,pAsync) ) + ( (This)->lpVtbl -> Begin(This,pAsync) ) #define ID3D11DeviceContext4_End(This,pAsync) \ - ( (This)->lpVtbl -> End(This,pAsync) ) + ( (This)->lpVtbl -> End(This,pAsync) ) #define ID3D11DeviceContext4_GetData(This,pAsync,pData,DataSize,GetDataFlags) \ - ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) + ( (This)->lpVtbl -> GetData(This,pAsync,pData,DataSize,GetDataFlags) ) #define ID3D11DeviceContext4_SetPredication(This,pPredicate,PredicateValue) \ - ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) + ( (This)->lpVtbl -> SetPredication(This,pPredicate,PredicateValue) ) #define ID3D11DeviceContext4_GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumViews,ppRenderTargetViews,pDepthStencilView) ) #define ID3D11DeviceContext4_OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> OMSetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,pDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext4_OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) \ - ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) + ( (This)->lpVtbl -> OMSetBlendState(This,pBlendState,BlendFactor,SampleMask) ) #define ID3D11DeviceContext4_OMSetDepthStencilState(This,pDepthStencilState,StencilRef) \ - ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) + ( (This)->lpVtbl -> OMSetDepthStencilState(This,pDepthStencilState,StencilRef) ) #define ID3D11DeviceContext4_SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) \ - ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) + ( (This)->lpVtbl -> SOSetTargets(This,NumBuffers,ppSOTargets,pOffsets) ) #define ID3D11DeviceContext4_DrawAuto(This) \ - ( (This)->lpVtbl -> DrawAuto(This) ) + ( (This)->lpVtbl -> DrawAuto(This) ) #define ID3D11DeviceContext4_DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawIndexedInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext4_DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DrawInstancedIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext4_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D11DeviceContext4_DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) \ - ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) + ( (This)->lpVtbl -> DispatchIndirect(This,pBufferForArgs,AlignedByteOffsetForArgs) ) #define ID3D11DeviceContext4_RSSetState(This,pRasterizerState) \ - ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) + ( (This)->lpVtbl -> RSSetState(This,pRasterizerState) ) #define ID3D11DeviceContext4_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D11DeviceContext4_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D11DeviceContext4_CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> CopySubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11DeviceContext4_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D11DeviceContext4_UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> UpdateSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11DeviceContext4_CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) \ - ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) + ( (This)->lpVtbl -> CopyStructureCount(This,pDstBuffer,DstAlignedByteOffset,pSrcView) ) #define ID3D11DeviceContext4_ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,pRenderTargetView,ColorRGBA) ) #define ID3D11DeviceContext4_ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext4_ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,pUnorderedAccessView,Values) ) #define ID3D11DeviceContext4_ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,pDepthStencilView,ClearFlags,Depth,Stencil) ) #define ID3D11DeviceContext4_GenerateMips(This,pShaderResourceView) \ - ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) + ( (This)->lpVtbl -> GenerateMips(This,pShaderResourceView) ) #define ID3D11DeviceContext4_SetResourceMinLOD(This,pResource,MinLOD) \ - ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) + ( (This)->lpVtbl -> SetResourceMinLOD(This,pResource,MinLOD) ) #define ID3D11DeviceContext4_GetResourceMinLOD(This,pResource) \ - ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) + ( (This)->lpVtbl -> GetResourceMinLOD(This,pResource) ) #define ID3D11DeviceContext4_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D11DeviceContext4_ExecuteCommandList(This,pCommandList,RestoreContextState) \ - ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) + ( (This)->lpVtbl -> ExecuteCommandList(This,pCommandList,RestoreContextState) ) #define ID3D11DeviceContext4_HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> HSSetShader(This,pHullShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> DSSetShader(This,pDomainShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSSetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) \ - ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) + ( (This)->lpVtbl -> CSSetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews,pUAVInitialCounts) ) #define ID3D11DeviceContext4_CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) \ - ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) + ( (This)->lpVtbl -> CSSetShader(This,pComputeShader,ppClassInstances,NumClassInstances) ) #define ID3D11DeviceContext4_CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSSetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSSetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> VSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> PSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> PSGetShader(This,ppPixelShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> PSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> VSGetShader(This,ppVertexShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> PSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_IAGetInputLayout(This,ppInputLayout) \ - ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) + ( (This)->lpVtbl -> IAGetInputLayout(This,ppInputLayout) ) #define ID3D11DeviceContext4_IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) \ - ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) + ( (This)->lpVtbl -> IAGetVertexBuffers(This,StartSlot,NumBuffers,ppVertexBuffers,pStrides,pOffsets) ) #define ID3D11DeviceContext4_IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) \ - ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) + ( (This)->lpVtbl -> IAGetIndexBuffer(This,pIndexBuffer,Format,Offset) ) #define ID3D11DeviceContext4_GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> GSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> GSGetShader(This,ppGeometryShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_IAGetPrimitiveTopology(This,pTopology) \ - ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) + ( (This)->lpVtbl -> IAGetPrimitiveTopology(This,pTopology) ) #define ID3D11DeviceContext4_VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> VSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> VSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_GetPredication(This,ppPredicate,pPredicateValue) \ - ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) + ( (This)->lpVtbl -> GetPredication(This,ppPredicate,pPredicateValue) ) #define ID3D11DeviceContext4_GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> GSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> GSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) \ - ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) + ( (This)->lpVtbl -> OMGetRenderTargets(This,NumViews,ppRenderTargetViews,ppDepthStencilView) ) #define ID3D11DeviceContext4_OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> OMGetRenderTargetsAndUnorderedAccessViews(This,NumRTVs,ppRenderTargetViews,ppDepthStencilView,UAVStartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext4_OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) \ - ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) + ( (This)->lpVtbl -> OMGetBlendState(This,ppBlendState,BlendFactor,pSampleMask) ) #define ID3D11DeviceContext4_OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) \ - ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) + ( (This)->lpVtbl -> OMGetDepthStencilState(This,ppDepthStencilState,pStencilRef) ) #define ID3D11DeviceContext4_SOGetTargets(This,NumBuffers,ppSOTargets) \ - ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) + ( (This)->lpVtbl -> SOGetTargets(This,NumBuffers,ppSOTargets) ) #define ID3D11DeviceContext4_RSGetState(This,ppRasterizerState) \ - ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) + ( (This)->lpVtbl -> RSGetState(This,ppRasterizerState) ) #define ID3D11DeviceContext4_RSGetViewports(This,pNumViewports,pViewports) \ - ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) + ( (This)->lpVtbl -> RSGetViewports(This,pNumViewports,pViewports) ) #define ID3D11DeviceContext4_RSGetScissorRects(This,pNumRects,pRects) \ - ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) + ( (This)->lpVtbl -> RSGetScissorRects(This,pNumRects,pRects) ) #define ID3D11DeviceContext4_HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> HSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> HSGetShader(This,ppHullShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> HSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> HSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> DSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> DSGetShader(This,ppDomainShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> DSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> DSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) \ - ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) + ( (This)->lpVtbl -> CSGetShaderResources(This,StartSlot,NumViews,ppShaderResourceViews) ) #define ID3D11DeviceContext4_CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) \ - ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) + ( (This)->lpVtbl -> CSGetUnorderedAccessViews(This,StartSlot,NumUAVs,ppUnorderedAccessViews) ) #define ID3D11DeviceContext4_CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) \ - ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) + ( (This)->lpVtbl -> CSGetShader(This,ppComputeShader,ppClassInstances,pNumClassInstances) ) #define ID3D11DeviceContext4_CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) \ - ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) + ( (This)->lpVtbl -> CSGetSamplers(This,StartSlot,NumSamplers,ppSamplers) ) #define ID3D11DeviceContext4_CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) \ - ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) + ( (This)->lpVtbl -> CSGetConstantBuffers(This,StartSlot,NumBuffers,ppConstantBuffers) ) #define ID3D11DeviceContext4_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D11DeviceContext4_Flush(This) \ - ( (This)->lpVtbl -> Flush(This) ) + ( (This)->lpVtbl -> Flush(This) ) #define ID3D11DeviceContext4_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D11DeviceContext4_GetContextFlags(This) \ - ( (This)->lpVtbl -> GetContextFlags(This) ) + ( (This)->lpVtbl -> GetContextFlags(This) ) #define ID3D11DeviceContext4_FinishCommandList(This,RestoreDeferredContextState,ppCommandList) \ - ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) + ( (This)->lpVtbl -> FinishCommandList(This,RestoreDeferredContextState,ppCommandList) ) #define ID3D11DeviceContext4_CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) \ - ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) + ( (This)->lpVtbl -> CopySubresourceRegion1(This,pDstResource,DstSubresource,DstX,DstY,DstZ,pSrcResource,SrcSubresource,pSrcBox,CopyFlags) ) #define ID3D11DeviceContext4_UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) \ - ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) + ( (This)->lpVtbl -> UpdateSubresource1(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch,CopyFlags) ) #define ID3D11DeviceContext4_DiscardResource(This,pResource) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource) ) #define ID3D11DeviceContext4_DiscardView(This,pResourceView) \ - ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) + ( (This)->lpVtbl -> DiscardView(This,pResourceView) ) #define ID3D11DeviceContext4_VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSSetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> VSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> HSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> DSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> GSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> PSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) \ - ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) + ( (This)->lpVtbl -> CSGetConstantBuffers1(This,StartSlot,NumBuffers,ppConstantBuffers,pFirstConstant,pNumConstants) ) #define ID3D11DeviceContext4_SwapDeviceContextState(This,pState,ppPreviousState) \ - ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) + ( (This)->lpVtbl -> SwapDeviceContextState(This,pState,ppPreviousState) ) #define ID3D11DeviceContext4_ClearView(This,pView,Color,pRect,NumRects) \ - ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) + ( (This)->lpVtbl -> ClearView(This,pView,Color,pRect,NumRects) ) #define ID3D11DeviceContext4_DiscardView1(This,pResourceView,pRects,NumRects) \ - ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) + ( (This)->lpVtbl -> DiscardView1(This,pResourceView,pRects,NumRects) ) #define ID3D11DeviceContext4_UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) \ - ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) + ( (This)->lpVtbl -> UpdateTileMappings(This,pTiledResource,NumTiledResourceRegions,pTiledResourceRegionStartCoordinates,pTiledResourceRegionSizes,pTilePool,NumRanges,pRangeFlags,pTilePoolStartOffsets,pRangeTileCounts,Flags) ) #define ID3D11DeviceContext4_CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) \ - ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) + ( (This)->lpVtbl -> CopyTileMappings(This,pDestTiledResource,pDestRegionStartCoordinate,pSourceTiledResource,pSourceRegionStartCoordinate,pTileRegionSize,Flags) ) #define ID3D11DeviceContext4_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D11DeviceContext4_UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) \ - ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) + ( (This)->lpVtbl -> UpdateTiles(This,pDestTiledResource,pDestTileRegionStartCoordinate,pDestTileRegionSize,pSourceTileData,Flags) ) #define ID3D11DeviceContext4_ResizeTilePool(This,pTilePool,NewSizeInBytes) \ - ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) + ( (This)->lpVtbl -> ResizeTilePool(This,pTilePool,NewSizeInBytes) ) #define ID3D11DeviceContext4_TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) \ - ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) + ( (This)->lpVtbl -> TiledResourceBarrier(This,pTiledResourceOrViewAccessBeforeBarrier,pTiledResourceOrViewAccessAfterBarrier) ) #define ID3D11DeviceContext4_IsAnnotationEnabled(This) \ - ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) + ( (This)->lpVtbl -> IsAnnotationEnabled(This) ) #define ID3D11DeviceContext4_SetMarkerInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> SetMarkerInt(This,pLabel,Data) ) #define ID3D11DeviceContext4_BeginEventInt(This,pLabel,Data) \ - ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) + ( (This)->lpVtbl -> BeginEventInt(This,pLabel,Data) ) #define ID3D11DeviceContext4_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D11DeviceContext4_Flush1(This,ContextType,hEvent) \ - ( (This)->lpVtbl -> Flush1(This,ContextType,hEvent) ) + ( (This)->lpVtbl -> Flush1(This,ContextType,hEvent) ) #define ID3D11DeviceContext4_SetHardwareProtectionState(This,HwProtectionEnable) \ - ( (This)->lpVtbl -> SetHardwareProtectionState(This,HwProtectionEnable) ) + ( (This)->lpVtbl -> SetHardwareProtectionState(This,HwProtectionEnable) ) #define ID3D11DeviceContext4_GetHardwareProtectionState(This,pHwProtectionEnable) \ - ( (This)->lpVtbl -> GetHardwareProtectionState(This,pHwProtectionEnable) ) + ( (This)->lpVtbl -> GetHardwareProtectionState(This,pHwProtectionEnable) ) #define ID3D11DeviceContext4_Signal(This,pFence,Value) \ - ( (This)->lpVtbl -> Signal(This,pFence,Value) ) + ( (This)->lpVtbl -> Signal(This,pFence,Value) ) #define ID3D11DeviceContext4_Wait(This,pFence,Value) \ - ( (This)->lpVtbl -> Wait(This,pFence,Value) ) + ( (This)->lpVtbl -> Wait(This,pFence,Value) ) #endif /* COBJMACROS */ @@ -5788,659 +5758,658 @@ EXTERN_C const IID IID_ID3D11DeviceContext4; #define __ID3D11Device3_INTERFACE_DEFINED__ /* interface ID3D11Device3 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("A05C8C37-D2C6-4732-B3A0-9CE0B0DC9AE6") ID3D11Device3 : public ID3D11Device2 { public: - virtual HRESULT STDMETHODCALLTYPE CreateTexture2D1( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateTexture2D1( + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels * pDesc1->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D1 **ppTexture2D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateTexture3D1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateTexture3D1( + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D1 **ppTexture3D) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState2( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRasterizerState2( + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC2 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState2 **ppRasterizerState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateShaderResourceView1( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView1 **ppSRView1) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateUnorderedAccessView1( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView1 **ppUAView1) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateRenderTargetView1( + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView1 **ppRTView1) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateQuery1( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateQuery1( + /* [annotation] */ _In_ const D3D11_QUERY_DESC1 *pQueryDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query1 **ppQuery1) = 0; - - virtual void STDMETHODCALLTYPE GetImmediateContext3( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE GetImmediateContext3( + /* [annotation] */ _Outptr_ ID3D11DeviceContext3 **ppImmediateContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext3( + + virtual HRESULT STDMETHODCALLTYPE CreateDeferredContext3( UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext3 **ppDeferredContext) = 0; - - virtual void STDMETHODCALLTYPE WriteToSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE WriteToSubresource( + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch) = 0; - - virtual void STDMETHODCALLTYPE ReadFromSubresource( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ReadFromSubresource( + /* [annotation] */ _Out_ void *pDstData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Device3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device3 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device3 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device3 * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device3 * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device3 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device3 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device3 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device3 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext1 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( ID3D11Device3 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( ID3D11Device3 * This, UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - void ( STDMETHODCALLTYPE *GetImmediateContext2 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext2 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext2 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( ID3D11Device3 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext2 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pNumTilesForEntireResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_PACKED_MIP_DESC *pPackedMipDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_TILE_SHAPE *pStandardTileShapeForNonPackedMips, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumSubresourceTilings, - /* [annotation] */ + /* [annotation] */ _In_ UINT FirstSubresourceTilingToGet, - /* [annotation] */ + /* [annotation] */ _Out_writes_(*pNumSubresourceTilings) D3D11_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels * pDesc1->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D1 **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D1 **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC2 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState2 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView1 **ppSRView1); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView1 **ppUAView1); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView1 **ppRTView1); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC1 *pQueryDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query1 **ppQuery1); - - void ( STDMETHODCALLTYPE *GetImmediateContext3 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext3 )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext3 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( ID3D11Device3 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext3 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *WriteToSubresource )( + + void ( STDMETHODCALLTYPE *WriteToSubresource )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *ReadFromSubresource )( + + void ( STDMETHODCALLTYPE *ReadFromSubresource )( ID3D11Device3 * This, - /* [annotation] */ + /* [annotation] */ _Out_ void *pDstData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - + END_INTERFACE } ID3D11Device3Vtbl; @@ -6449,204 +6418,202 @@ EXTERN_C const IID IID_ID3D11Device3; CONST_VTBL struct ID3D11Device3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device3_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device3_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device3_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device3_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device3_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device3_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device3_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device3_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device3_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device3_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device3_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device3_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device3_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device3_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device3_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device3_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device3_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device3_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device3_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device3_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device3_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device3_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device3_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device3_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device3_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device3_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device3_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device3_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device3_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device3_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device3_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device3_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device3_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device3_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device3_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device3_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device3_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device3_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device3_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device3_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D11Device3_GetImmediateContext1(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) #define ID3D11Device3_CreateDeferredContext1(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device3_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device3_CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device3_CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) \ - ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) + ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) #define ID3D11Device3_OpenSharedResource1(This,hResource,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) #define ID3D11Device3_OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) #define ID3D11Device3_GetImmediateContext2(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) #define ID3D11Device3_CreateDeferredContext2(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device3_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D11Device3_CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) #define ID3D11Device3_CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) #define ID3D11Device3_CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) #define ID3D11Device3_CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device3_CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) \ - ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) + ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) #define ID3D11Device3_CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) #define ID3D11Device3_CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) \ - ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) + ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) #define ID3D11Device3_CreateQuery1(This,pQueryDesc1,ppQuery1) \ - ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) + ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) #define ID3D11Device3_GetImmediateContext3(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) #define ID3D11Device3_CreateDeferredContext3(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device3_WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11Device3_ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) #endif /* COBJMACROS */ @@ -6655,7 +6622,7 @@ EXTERN_C const IID IID_ID3D11Device3; #endif /* __ID3D11Device3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_3_0000_0011 */ -/* [local] */ +/* [local] */ DEFINE_GUID(IID_ID3D11Texture2D1,0x51218251,0x1E33,0x4617,0x9C,0xCB,0x4D,0x3A,0x43,0x67,0xE7,0xBB); DEFINE_GUID(IID_ID3D11Texture3D1,0x0C711683,0x2853,0x4846,0x9B,0xB0,0xF3,0xE6,0x06,0x39,0xE4,0x6A); diff --git a/gfx/include/dxsdk/d3d11_4.h b/gfx/include/dxsdk/d3d11_4.h index 8b883c7946..fae1a72429 100644 --- a/gfx/include/dxsdk/d3d11_4.h +++ b/gfx/include/dxsdk/d3d11_4.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11Device4_FWD_DEFINED__ #define __ID3D11Device4_FWD_DEFINED__ @@ -73,10 +73,10 @@ typedef interface ID3D11VideoContext2 ID3D11VideoContext2; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11_4_0000_0000 */ -/* [local] */ +/* [local] */ #ifdef __cplusplus } @@ -95,592 +95,591 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11_4_0000_0000_v0_0_s_ifspec; #define __ID3D11Device4_INTERFACE_DEFINED__ /* interface ID3D11Device4 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8992ab71-02e6-4b8d-ba48-b056dcda42c4") ID3D11Device4 : public ID3D11Device3 { public: - virtual HRESULT STDMETHODCALLTYPE RegisterDeviceRemovedEvent( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE RegisterDeviceRemovedEvent( + /* [annotation] */ _In_ HANDLE hEvent, - /* [annotation] */ + /* [annotation] */ _Out_ DWORD *pdwCookie) = 0; - - virtual void STDMETHODCALLTYPE UnregisterDeviceRemoved( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE UnregisterDeviceRemoved( + /* [annotation] */ _In_ DWORD dwCookie) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Device4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device4 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device4 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device4 * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device4 * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device4 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device4 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device4 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device4 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext1 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( ID3D11Device4 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( ID3D11Device4 * This, UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - void ( STDMETHODCALLTYPE *GetImmediateContext2 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext2 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext2 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( ID3D11Device4 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext2 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pNumTilesForEntireResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_PACKED_MIP_DESC *pPackedMipDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_TILE_SHAPE *pStandardTileShapeForNonPackedMips, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumSubresourceTilings, - /* [annotation] */ + /* [annotation] */ _In_ UINT FirstSubresourceTilingToGet, - /* [annotation] */ + /* [annotation] */ _Out_writes_(*pNumSubresourceTilings) D3D11_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels * pDesc1->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D1 **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D1 **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC2 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState2 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView1 **ppSRView1); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView1 **ppUAView1); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView1 **ppRTView1); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC1 *pQueryDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query1 **ppQuery1); - - void ( STDMETHODCALLTYPE *GetImmediateContext3 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext3 )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext3 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( ID3D11Device4 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext3 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *WriteToSubresource )( + + void ( STDMETHODCALLTYPE *WriteToSubresource )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *ReadFromSubresource )( + + void ( STDMETHODCALLTYPE *ReadFromSubresource )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _Out_ void *pDstData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - HRESULT ( STDMETHODCALLTYPE *RegisterDeviceRemovedEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterDeviceRemovedEvent )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hEvent, - /* [annotation] */ + /* [annotation] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterDeviceRemoved )( + + void ( STDMETHODCALLTYPE *UnregisterDeviceRemoved )( ID3D11Device4 * This, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwCookie); - + END_INTERFACE } ID3D11Device4Vtbl; @@ -689,210 +688,208 @@ EXTERN_C const IID IID_ID3D11Device4; CONST_VTBL struct ID3D11Device4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device4_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device4_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device4_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device4_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device4_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device4_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device4_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device4_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device4_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device4_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device4_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device4_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device4_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device4_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device4_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device4_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device4_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device4_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device4_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device4_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device4_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device4_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device4_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device4_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device4_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device4_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device4_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device4_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device4_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device4_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device4_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device4_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device4_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device4_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device4_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device4_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device4_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device4_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device4_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device4_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D11Device4_GetImmediateContext1(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) #define ID3D11Device4_CreateDeferredContext1(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device4_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device4_CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device4_CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) \ - ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) + ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) #define ID3D11Device4_OpenSharedResource1(This,hResource,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) #define ID3D11Device4_OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) #define ID3D11Device4_GetImmediateContext2(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) #define ID3D11Device4_CreateDeferredContext2(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device4_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D11Device4_CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) #define ID3D11Device4_CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) #define ID3D11Device4_CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) #define ID3D11Device4_CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device4_CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) \ - ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) + ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) #define ID3D11Device4_CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) #define ID3D11Device4_CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) \ - ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) + ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) #define ID3D11Device4_CreateQuery1(This,pQueryDesc1,ppQuery1) \ - ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) + ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) #define ID3D11Device4_GetImmediateContext3(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) #define ID3D11Device4_CreateDeferredContext3(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device4_WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11Device4_ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11Device4_RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) ) #define ID3D11Device4_UnregisterDeviceRemoved(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterDeviceRemoved(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterDeviceRemoved(This,dwCookie) ) #endif /* COBJMACROS */ @@ -904,620 +901,619 @@ EXTERN_C const IID IID_ID3D11Device4; #define __ID3D11Device5_INTERFACE_DEFINED__ /* interface ID3D11Device5 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Device5; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8ffde202-a0e7-45df-9e01-e837801b5ea0") ID3D11Device5 : public ID3D11Device4 { public: - virtual HRESULT STDMETHODCALLTYPE OpenSharedFence( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE OpenSharedFence( + /* [annotation] */ _In_ HANDLE hFence, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppFence) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateFence( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE CreateFence( + /* [annotation] */ _In_ UINT64 InitialValue, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_FENCE_FLAG Flags, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppFence) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11Device5Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Device5 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Device5 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Device5 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( + + HRESULT ( STDMETHODCALLTYPE *CreateBuffer )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BUFFER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Buffer **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture1D )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE1D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture1D **ppTexture1D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels * pDesc->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView **ppSRView); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView **ppUAView); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView **ppRTView); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_DEPTH_STENCIL_VIEW_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilView **ppDepthStencilView); - - HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( + + HRESULT ( STDMETHODCALLTYPE *CreateInputLayout )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumElements) const D3D11_INPUT_ELEMENT_DESC *pInputElementDescs, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT ) UINT NumElements, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecodeWithInputSignature, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11InputLayout **ppInputLayout); - - HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateVertexShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11VertexShader **ppVertexShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( + + HRESULT ( STDMETHODCALLTYPE *CreateGeometryShaderWithStreamOutput )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumEntries) const D3D11_SO_DECLARATION_ENTRY *pSODeclaration, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_STREAM_COUNT * D3D11_SO_OUTPUT_COMPONENT_COUNT ) UINT NumEntries, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(NumStrides) const UINT *pBufferStrides, - /* [annotation] */ + /* [annotation] */ _In_range_( 0, D3D11_SO_BUFFER_SLOT_COUNT ) UINT NumStrides, - /* [annotation] */ + /* [annotation] */ _In_ UINT RasterizedStream, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11GeometryShader **ppGeometryShader); - - HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( + + HRESULT ( STDMETHODCALLTYPE *CreatePixelShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11PixelShader **ppPixelShader); - - HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateHullShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11HullShader **ppHullShader); - - HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateDomainShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DomainShader **ppDomainShader); - - HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputeShader )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_reads_(BytecodeLength) const void *pShaderBytecode, - /* [annotation] */ + /* [annotation] */ _In_ SIZE_T BytecodeLength, - /* [annotation] */ + /* [annotation] */ _In_opt_ ID3D11ClassLinkage *pClassLinkage, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ComputeShader **ppComputeShader); - - HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( + + HRESULT ( STDMETHODCALLTYPE *CreateClassLinkage )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ClassLinkage **ppLinkage); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDepthStencilState )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_DEPTH_STENCIL_DESC *pDepthStencilDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DepthStencilState **ppDepthStencilState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( + + HRESULT ( STDMETHODCALLTYPE *CreateSamplerState )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_SAMPLER_DESC *pSamplerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11SamplerState **ppSamplerState); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pQueryDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query **ppQuery); - - HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( + + HRESULT ( STDMETHODCALLTYPE *CreatePredicate )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC *pPredicateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Predicate **ppPredicate); - - HRESULT ( STDMETHODCALLTYPE *CreateCounter )( + + HRESULT ( STDMETHODCALLTYPE *CreateCounter )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pCounterDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Counter **ppCounter); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext )( ID3D11Device5 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFormatSupport )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pFormatSupport); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - void ( STDMETHODCALLTYPE *CheckCounterInfo )( + + void ( STDMETHODCALLTYPE *CheckCounterInfo )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_INFO *pCounterInfo); - - HRESULT ( STDMETHODCALLTYPE *CheckCounter )( + + HRESULT ( STDMETHODCALLTYPE *CheckCounter )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_COUNTER_DESC *pDesc, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_COUNTER_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pActiveCounters, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pNameLength) LPSTR szName, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNameLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pUnitsLength) LPSTR szUnits, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pUnitsLength, - /* [annotation] */ + /* [annotation] */ _Out_writes_opt_(*pDescriptionLength) LPSTR szDescription, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pDescriptionLength); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D11Device5 * This, D3D11_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( + + D3D_FEATURE_LEVEL ( STDMETHODCALLTYPE *GetFeatureLevel )( ID3D11Device5 * This); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D11Device5 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D11Device5 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext )( + + void ( STDMETHODCALLTYPE *GetImmediateContext )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( + + HRESULT ( STDMETHODCALLTYPE *SetExceptionMode )( ID3D11Device5 * This, UINT RaiseFlags); - - UINT ( STDMETHODCALLTYPE *GetExceptionMode )( + + UINT ( STDMETHODCALLTYPE *GetExceptionMode )( ID3D11Device5 * This); - - void ( STDMETHODCALLTYPE *GetImmediateContext1 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext1 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext1 )( ID3D11Device5 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext1 **ppDeferredContext); - - HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateBlendState1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_BLEND_DESC1 *pBlendStateDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11BlendState1 **ppBlendState); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC1 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState1 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeviceContextState )( ID3D11Device5 * This, UINT Flags, - /* [annotation] */ + /* [annotation] */ _In_reads_( FeatureLevels ) const D3D_FEATURE_LEVEL *pFeatureLevels, UINT FeatureLevels, UINT SDKVersion, REFIID EmulatedInterface, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D_FEATURE_LEVEL *pChosenFeatureLevel, - /* [annotation] */ + /* [annotation] */ _Out_opt_ ID3DDeviceContextState **ppContextState); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResource1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedResourceByName )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ LPCWSTR lpName, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwDesiredAccess, - /* [annotation] */ + /* [annotation] */ _In_ REFIID returnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppResource); - - void ( STDMETHODCALLTYPE *GetImmediateContext2 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext2 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext2 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext2 )( ID3D11Device5 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext2 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pTiledResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT *pNumTilesForEntireResource, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_PACKED_MIP_DESC *pPackedMipDesc, - /* [annotation] */ + /* [annotation] */ _Out_opt_ D3D11_TILE_SHAPE *pStandardTileShapeForNonPackedMips, - /* [annotation] */ + /* [annotation] */ _Inout_opt_ UINT *pNumSubresourceTilings, - /* [annotation] */ + /* [annotation] */ _In_ UINT FirstSubresourceTilingToGet, - /* [annotation] */ + /* [annotation] */ _Out_writes_(*pNumSubresourceTilings) D3D11_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( + + HRESULT ( STDMETHODCALLTYPE *CheckMultisampleQualityLevels1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ UINT SampleCount, - /* [annotation] */ + /* [annotation] */ _In_ UINT Flags, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pNumQualityLevels); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture2D1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE2D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels * pDesc1->ArraySize)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture2D1 **ppTexture2D); - - HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateTexture3D1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_TEXTURE3D_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(_Inexpressible_(pDesc1->MipLevels)) const D3D11_SUBRESOURCE_DATA *pInitialData, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Texture3D1 **ppTexture3D); - - HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRasterizerState2 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_RASTERIZER_DESC2 *pRasterizerDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RasterizerState2 **ppRasterizerState); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderResourceView1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_SHADER_RESOURCE_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11ShaderResourceView1 **ppSRView1); - - HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateUnorderedAccessView1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_UNORDERED_ACCESS_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11UnorderedAccessView1 **ppUAView1); - - HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateRenderTargetView1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pResource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_RENDER_TARGET_VIEW_DESC1 *pDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11RenderTargetView1 **ppRTView1); - - HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( + + HRESULT ( STDMETHODCALLTYPE *CreateQuery1 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_QUERY_DESC1 *pQueryDesc1, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11Query1 **ppQuery1); - - void ( STDMETHODCALLTYPE *GetImmediateContext3 )( + + void ( STDMETHODCALLTYPE *GetImmediateContext3 )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11DeviceContext3 **ppImmediateContext); - - HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( + + HRESULT ( STDMETHODCALLTYPE *CreateDeferredContext3 )( ID3D11Device5 * This, UINT ContextFlags, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ ID3D11DeviceContext3 **ppDeferredContext); - - void ( STDMETHODCALLTYPE *WriteToSubresource )( + + void ( STDMETHODCALLTYPE *WriteToSubresource )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pDstResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pDstBox, - /* [annotation] */ + /* [annotation] */ _In_ const void *pSrcData, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcDepthPitch); - - void ( STDMETHODCALLTYPE *ReadFromSubresource )( + + void ( STDMETHODCALLTYPE *ReadFromSubresource )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _Out_ void *pDstData, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstRowPitch, - /* [annotation] */ + /* [annotation] */ _In_ UINT DstDepthPitch, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Resource *pSrcResource, - /* [annotation] */ + /* [annotation] */ _In_ UINT SrcSubresource, - /* [annotation] */ + /* [annotation] */ _In_opt_ const D3D11_BOX *pSrcBox); - - HRESULT ( STDMETHODCALLTYPE *RegisterDeviceRemovedEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterDeviceRemovedEvent )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hEvent, - /* [annotation] */ + /* [annotation] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterDeviceRemoved )( + + void ( STDMETHODCALLTYPE *UnregisterDeviceRemoved )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedFence )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedFence )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hFence, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppFence); - - HRESULT ( STDMETHODCALLTYPE *CreateFence )( + + HRESULT ( STDMETHODCALLTYPE *CreateFence )( ID3D11Device5 * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 InitialValue, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_FENCE_FLAG Flags, - /* [annotation] */ + /* [annotation] */ _In_ REFIID ReturnedInterface, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_opt_ void **ppFence); - + END_INTERFACE } ID3D11Device5Vtbl; @@ -1526,216 +1522,214 @@ EXTERN_C const IID IID_ID3D11Device5; CONST_VTBL struct ID3D11Device5Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Device5_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Device5_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Device5_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Device5_CreateBuffer(This,pDesc,pInitialData,ppBuffer) \ - ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) + ( (This)->lpVtbl -> CreateBuffer(This,pDesc,pInitialData,ppBuffer) ) #define ID3D11Device5_CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) \ - ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) + ( (This)->lpVtbl -> CreateTexture1D(This,pDesc,pInitialData,ppTexture1D) ) #define ID3D11Device5_CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D(This,pDesc,pInitialData,ppTexture2D) ) #define ID3D11Device5_CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D(This,pDesc,pInitialData,ppTexture3D) ) #define ID3D11Device5_CreateShaderResourceView(This,pResource,pDesc,ppSRView) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,ppSRView) ) #define ID3D11Device5_CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pDesc,ppUAView) ) #define ID3D11Device5_CreateRenderTargetView(This,pResource,pDesc,ppRTView) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,ppRTView) ) #define ID3D11Device5_CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,ppDepthStencilView) ) #define ID3D11Device5_CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) \ - ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) + ( (This)->lpVtbl -> CreateInputLayout(This,pInputElementDescs,NumElements,pShaderBytecodeWithInputSignature,BytecodeLength,ppInputLayout) ) #define ID3D11Device5_CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) \ - ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) + ( (This)->lpVtbl -> CreateVertexShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppVertexShader) ) #define ID3D11Device5_CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppGeometryShader) ) #define ID3D11Device5_CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) \ - ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) + ( (This)->lpVtbl -> CreateGeometryShaderWithStreamOutput(This,pShaderBytecode,BytecodeLength,pSODeclaration,NumEntries,pBufferStrides,NumStrides,RasterizedStream,pClassLinkage,ppGeometryShader) ) #define ID3D11Device5_CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) \ - ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) + ( (This)->lpVtbl -> CreatePixelShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppPixelShader) ) #define ID3D11Device5_CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) \ - ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) + ( (This)->lpVtbl -> CreateHullShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppHullShader) ) #define ID3D11Device5_CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) \ - ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) + ( (This)->lpVtbl -> CreateDomainShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppDomainShader) ) #define ID3D11Device5_CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) \ - ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) + ( (This)->lpVtbl -> CreateComputeShader(This,pShaderBytecode,BytecodeLength,pClassLinkage,ppComputeShader) ) #define ID3D11Device5_CreateClassLinkage(This,ppLinkage) \ - ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) + ( (This)->lpVtbl -> CreateClassLinkage(This,ppLinkage) ) #define ID3D11Device5_CreateBlendState(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device5_CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) \ - ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) + ( (This)->lpVtbl -> CreateDepthStencilState(This,pDepthStencilDesc,ppDepthStencilState) ) #define ID3D11Device5_CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device5_CreateSamplerState(This,pSamplerDesc,ppSamplerState) \ - ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) + ( (This)->lpVtbl -> CreateSamplerState(This,pSamplerDesc,ppSamplerState) ) #define ID3D11Device5_CreateQuery(This,pQueryDesc,ppQuery) \ - ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) + ( (This)->lpVtbl -> CreateQuery(This,pQueryDesc,ppQuery) ) #define ID3D11Device5_CreatePredicate(This,pPredicateDesc,ppPredicate) \ - ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) + ( (This)->lpVtbl -> CreatePredicate(This,pPredicateDesc,ppPredicate) ) #define ID3D11Device5_CreateCounter(This,pCounterDesc,ppCounter) \ - ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) + ( (This)->lpVtbl -> CreateCounter(This,pCounterDesc,ppCounter) ) #define ID3D11Device5_CreateDeferredContext(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device5_OpenSharedResource(This,hResource,ReturnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource(This,hResource,ReturnedInterface,ppResource) ) #define ID3D11Device5_CheckFormatSupport(This,Format,pFormatSupport) \ - ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) + ( (This)->lpVtbl -> CheckFormatSupport(This,Format,pFormatSupport) ) #define ID3D11Device5_CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels(This,Format,SampleCount,pNumQualityLevels) ) #define ID3D11Device5_CheckCounterInfo(This,pCounterInfo) \ - ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) + ( (This)->lpVtbl -> CheckCounterInfo(This,pCounterInfo) ) #define ID3D11Device5_CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) \ - ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) + ( (This)->lpVtbl -> CheckCounter(This,pDesc,pType,pActiveCounters,szName,pNameLength,szUnits,pUnitsLength,szDescription,pDescriptionLength) ) #define ID3D11Device5_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D11Device5_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11Device5_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11Device5_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11Device5_GetFeatureLevel(This) \ - ( (This)->lpVtbl -> GetFeatureLevel(This) ) + ( (This)->lpVtbl -> GetFeatureLevel(This) ) #define ID3D11Device5_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define ID3D11Device5_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D11Device5_GetImmediateContext(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext(This,ppImmediateContext) ) #define ID3D11Device5_SetExceptionMode(This,RaiseFlags) \ - ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) + ( (This)->lpVtbl -> SetExceptionMode(This,RaiseFlags) ) #define ID3D11Device5_GetExceptionMode(This) \ - ( (This)->lpVtbl -> GetExceptionMode(This) ) + ( (This)->lpVtbl -> GetExceptionMode(This) ) #define ID3D11Device5_GetImmediateContext1(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext1(This,ppImmediateContext) ) #define ID3D11Device5_CreateDeferredContext1(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext1(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device5_CreateBlendState1(This,pBlendStateDesc,ppBlendState) \ - ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) + ( (This)->lpVtbl -> CreateBlendState1(This,pBlendStateDesc,ppBlendState) ) #define ID3D11Device5_CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState1(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device5_CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) \ - ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) + ( (This)->lpVtbl -> CreateDeviceContextState(This,Flags,pFeatureLevels,FeatureLevels,SDKVersion,EmulatedInterface,pChosenFeatureLevel,ppContextState) ) #define ID3D11Device5_OpenSharedResource1(This,hResource,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResource1(This,hResource,returnedInterface,ppResource) ) #define ID3D11Device5_OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) \ - ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) + ( (This)->lpVtbl -> OpenSharedResourceByName(This,lpName,dwDesiredAccess,returnedInterface,ppResource) ) #define ID3D11Device5_GetImmediateContext2(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext2(This,ppImmediateContext) ) #define ID3D11Device5_CreateDeferredContext2(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext2(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device5_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D11Device5_CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) \ - ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) + ( (This)->lpVtbl -> CheckMultisampleQualityLevels1(This,Format,SampleCount,Flags,pNumQualityLevels) ) #define ID3D11Device5_CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) \ - ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) + ( (This)->lpVtbl -> CreateTexture2D1(This,pDesc1,pInitialData,ppTexture2D) ) #define ID3D11Device5_CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) \ - ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) + ( (This)->lpVtbl -> CreateTexture3D1(This,pDesc1,pInitialData,ppTexture3D) ) #define ID3D11Device5_CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) \ - ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) + ( (This)->lpVtbl -> CreateRasterizerState2(This,pRasterizerDesc,ppRasterizerState) ) #define ID3D11Device5_CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) \ - ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) + ( (This)->lpVtbl -> CreateShaderResourceView1(This,pResource,pDesc1,ppSRView1) ) #define ID3D11Device5_CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView1(This,pResource,pDesc1,ppUAView1) ) #define ID3D11Device5_CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) \ - ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) + ( (This)->lpVtbl -> CreateRenderTargetView1(This,pResource,pDesc1,ppRTView1) ) #define ID3D11Device5_CreateQuery1(This,pQueryDesc1,ppQuery1) \ - ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) + ( (This)->lpVtbl -> CreateQuery1(This,pQueryDesc1,ppQuery1) ) #define ID3D11Device5_GetImmediateContext3(This,ppImmediateContext) \ - ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) + ( (This)->lpVtbl -> GetImmediateContext3(This,ppImmediateContext) ) #define ID3D11Device5_CreateDeferredContext3(This,ContextFlags,ppDeferredContext) \ - ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) + ( (This)->lpVtbl -> CreateDeferredContext3(This,ContextFlags,ppDeferredContext) ) #define ID3D11Device5_WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> WriteToSubresource(This,pDstResource,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D11Device5_ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,pSrcResource,SrcSubresource,pSrcBox) ) #define ID3D11Device5_RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterDeviceRemovedEvent(This,hEvent,pdwCookie) ) #define ID3D11Device5_UnregisterDeviceRemoved(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterDeviceRemoved(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterDeviceRemoved(This,dwCookie) ) #define ID3D11Device5_OpenSharedFence(This,hFence,ReturnedInterface,ppFence) \ - ( (This)->lpVtbl -> OpenSharedFence(This,hFence,ReturnedInterface,ppFence) ) + ( (This)->lpVtbl -> OpenSharedFence(This,hFence,ReturnedInterface,ppFence) ) #define ID3D11Device5_CreateFence(This,InitialValue,Flags,ReturnedInterface,ppFence) \ - ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,ReturnedInterface,ppFence) ) + ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,ReturnedInterface,ppFence) ) #endif /* COBJMACROS */ @@ -1747,61 +1741,60 @@ EXTERN_C const IID IID_ID3D11Device5; #define __ID3D11Multithread_INTERFACE_DEFINED__ /* interface ID3D11Multithread */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Multithread; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9B7E4E00-342C-4106-A19F-4F2704F689F0") ID3D11Multithread : public IUnknown { public: virtual void STDMETHODCALLTYPE Enter( void) = 0; - + virtual void STDMETHODCALLTYPE Leave( void) = 0; - - virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE SetMultithreadProtected( + /* [annotation] */ _In_ BOOL bMTProtect) = 0; - + virtual BOOL STDMETHODCALLTYPE GetMultithreadProtected( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11MultithreadVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Multithread * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Multithread * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Multithread * This); - - void ( STDMETHODCALLTYPE *Enter )( + + void ( STDMETHODCALLTYPE *Enter )( ID3D11Multithread * This); - - void ( STDMETHODCALLTYPE *Leave )( + + void ( STDMETHODCALLTYPE *Leave )( ID3D11Multithread * This); - - BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )( + + BOOL ( STDMETHODCALLTYPE *SetMultithreadProtected )( ID3D11Multithread * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMTProtect); - - BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )( + + BOOL ( STDMETHODCALLTYPE *GetMultithreadProtected )( ID3D11Multithread * This); - + END_INTERFACE } ID3D11MultithreadVtbl; @@ -1810,30 +1803,28 @@ EXTERN_C const IID IID_ID3D11Multithread; CONST_VTBL struct ID3D11MultithreadVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Multithread_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Multithread_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Multithread_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Multithread_Enter(This) \ - ( (This)->lpVtbl -> Enter(This) ) + ( (This)->lpVtbl -> Enter(This) ) #define ID3D11Multithread_Leave(This) \ - ( (This)->lpVtbl -> Leave(This) ) + ( (This)->lpVtbl -> Leave(This) ) #define ID3D11Multithread_SetMultithreadProtected(This,bMTProtect) \ - ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) ) + ( (This)->lpVtbl -> SetMultithreadProtected(This,bMTProtect) ) #define ID3D11Multithread_GetMultithreadProtected(This) \ - ( (This)->lpVtbl -> GetMultithreadProtected(This) ) + ( (This)->lpVtbl -> GetMultithreadProtected(This) ) #endif /* COBJMACROS */ @@ -1845,905 +1836,904 @@ EXTERN_C const IID IID_ID3D11Multithread; #define __ID3D11VideoContext2_INTERFACE_DEFINED__ /* interface ID3D11VideoContext2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11VideoContext2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("C4E7374C-6243-4D1B-AE87-52B4F740E261") ID3D11VideoContext2 : public ID3D11VideoContext1 { public: - virtual void STDMETHODCALLTYPE VideoProcessorSetOutputHDRMetaData( - /* [annotation] */ + virtual void STDMETHODCALLTYPE VideoProcessorSetOutputHDRMetaData( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(Size) const void *pHDRMetaData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetOutputHDRMetaData( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetOutputHDRMetaData( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_HDR_METADATA_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(Size) void *pMetaData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorSetStreamHDRMetaData( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorSetStreamHDRMetaData( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(Size) const void *pHDRMetaData) = 0; - - virtual void STDMETHODCALLTYPE VideoProcessorGetStreamHDRMetaData( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE VideoProcessorGetStreamHDRMetaData( + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_HDR_METADATA_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(Size) void *pMetaData) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11VideoContext2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11VideoContext2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11VideoContext2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11VideoContext2 * This); - - void ( STDMETHODCALLTYPE *GetDevice )( + + void ( STDMETHODCALLTYPE *GetDevice )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _Outptr_ ID3D11Device **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _Inout_ UINT *pDataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFGUID guid, - /* [annotation] */ + /* [annotation] */ _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetDecoderBuffer )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, D3D11_VIDEO_DECODER_BUFFER_TYPE Type, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBufferSize, - /* [annotation] */ + /* [annotation] */ _Outptr_result_bytebuffer_(*pBufferSize) void **ppBuffer); - - HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseDecoderBuffer )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_DECODER_BUFFER_TYPE Type); - - HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderBeginFrame )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoderOutputView *pView, UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey); - - HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( + + HRESULT ( STDMETHODCALLTYPE *DecoderEndFrame )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder); - - HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( + + HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC *pBufferDesc); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *DecoderExtension )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_DECODER_EXTENSION *pExtensionData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputTargetRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputBackgroundColor )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL YCbCr, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputAlphaFillMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE AlphaFillMode, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputConstriction )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ SIZE Size); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputStereoMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetOutputExtension )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputTargetRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *Enabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputBackgroundColor )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pYCbCr, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_COLOR *pColor); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputAlphaFillMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE *pAlphaFillMode, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pStreamIndex); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputConstriction )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ SIZE *pSize); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputStereoMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetOutputExtension )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFrameFormat )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_FRAME_FORMAT FrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamOutputRate )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE OutputRate, - /* [annotation] */ + /* [annotation] */ _In_ BOOL RepeatFrame, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamSourceRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamDestRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAlpha )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Alpha); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPalette )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _In_reads_opt_(Count) const UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamPixelAspectRatio )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _In_opt_ const DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamLumaKey )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Lower, - /* [annotation] */ + /* [annotation] */ _In_ FLOAT Upper); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamStereoFormat )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT Format, - /* [annotation] */ + /* [annotation] */ _In_ BOOL LeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ BOOL BaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE FlipMode, - /* [annotation] */ + /* [annotation] */ _In_ int MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamAutoProcessingMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamFilter )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ int Level); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorSetStreamExtension )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _In_ void *pData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFrameFormat )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_FRAME_FORMAT *pFrameFormat); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_COLOR_SPACE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamOutputRate )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_OUTPUT_RATE *pOutputRate, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pRepeatFrame, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pCustomRate); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamSourceRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamDestRect )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ RECT *pRect); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAlpha )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pAlpha); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPalette )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT Count, - /* [annotation] */ + /* [annotation] */ _Out_writes_(Count) UINT *pEntries); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamPixelAspectRatio )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pSourceAspectRatio, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_RATIONAL *pDestinationAspectRatio); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamLumaKey )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pLower, - /* [annotation] */ + /* [annotation] */ _Out_ FLOAT *pUpper); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamStereoFormat )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FORMAT *pFormat, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pLeftViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pBaseViewFrame0, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE *pFlipMode, - /* [annotation] */ + /* [annotation] */ _Out_ int *MonoOffset); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamAutoProcessingMode )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamFilter )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_FILTER Filter, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnabled, - /* [annotation] */ + /* [annotation] */ _Out_ int *pLevel); - - APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( + + APP_DEPRECATED_HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetStreamExtension )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ const GUID *pExtensionGuid, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( + + HRESULT ( STDMETHODCALLTYPE *VideoProcessorBlt )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessorOutputView *pView, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputFrame, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM *pStreams); - - HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateCryptoSessionKeyExchange )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - void ( STDMETHODCALLTYPE *EncryptionBlt )( + + void ( STDMETHODCALLTYPE *EncryptionBlt )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *DecryptionBlt )( + + void ( STDMETHODCALLTYPE *DecryptionBlt )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pSrcSurface, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11Texture2D *pDstSurface, - /* [annotation] */ + /* [annotation] */ _In_opt_ D3D11_ENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, - /* [annotation] */ + /* [annotation] */ _In_ UINT ContentKeySize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(ContentKeySize) const void *pContentKey, - /* [annotation] */ + /* [annotation] */ _In_ UINT IVSize, - /* [annotation] */ + /* [annotation] */ _Inout_opt_bytecount_(IVSize) void *pIV); - - void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *StartSessionKeyRefresh )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT RandomNumberSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(RandomNumberSize) void *pRandomNumber); - - void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( + + void ( STDMETHODCALLTYPE *FinishSessionKeyRefresh )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession); - - HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( + + HRESULT ( STDMETHODCALLTYPE *GetEncryptionBltKey )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT KeySize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(KeySize) void *pReadbackKey); - - HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( + + HRESULT ( STDMETHODCALLTYPE *NegotiateAuthenticatedChannelKeyExchange )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT DataSize, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(DataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *QueryAuthenticatedChannel )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputSize, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_(OutputSize) void *pOutput); - - HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( + + HRESULT ( STDMETHODCALLTYPE *ConfigureAuthenticatedChannel )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11AuthenticatedChannel *pChannel, - /* [annotation] */ + /* [annotation] */ _In_ UINT InputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_(InputSize) const void *pInput, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_AUTHENTICATED_CONFIGURE_OUTPUT *pOutput); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamRotation )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_VIDEO_PROCESSOR_ROTATION Rotation); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamRotation )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_VIDEO_PROCESSOR_ROTATION *pRotation); - - HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers1 )( + + HRESULT ( STDMETHODCALLTYPE *SubmitDecoderBuffers1 )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ UINT NumBuffers, - /* [annotation] */ + /* [annotation] */ _In_reads_(NumBuffers) const D3D11_VIDEO_DECODER_BUFFER_DESC1 *pBufferDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDataForNewHardwareKey )( + + HRESULT ( STDMETHODCALLTYPE *GetDataForNewHardwareKey )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _In_ UINT PrivateInputSize, - /* [annotation] */ + /* [annotation] */ _In_reads_(PrivateInputSize) const void *pPrivatInputData, - /* [annotation] */ + /* [annotation] */ _Out_ UINT64 *pPrivateOutputData); - - HRESULT ( STDMETHODCALLTYPE *CheckCryptoSessionStatus )( + + HRESULT ( STDMETHODCALLTYPE *CheckCryptoSessionStatus )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11CryptoSession *pCryptoSession, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_CRYPTO_SESSION_STATUS *pStatus); - - HRESULT ( STDMETHODCALLTYPE *DecoderEnableDownsampling )( + + HRESULT ( STDMETHODCALLTYPE *DecoderEnableDownsampling )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE InputColorSpace, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc, - /* [annotation] */ + /* [annotation] */ _In_ UINT ReferenceFrameCount); - - HRESULT ( STDMETHODCALLTYPE *DecoderUpdateDownsampling )( + + HRESULT ( STDMETHODCALLTYPE *DecoderUpdateDownsampling )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoDecoder *pDecoder, - /* [annotation] */ + /* [annotation] */ _In_ const D3D11_VIDEO_SAMPLE_DESC *pOutputDesc); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputColorSpace1 )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputShaderUsage )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputShaderUsage )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ BOOL ShaderUsage); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputColorSpace1 )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputShaderUsage )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputShaderUsage )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pShaderUsage); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamColorSpace1 )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamMirror )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamMirror )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ BOOL Enable, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipHorizontal, - /* [annotation] */ + /* [annotation] */ _In_ BOOL FlipVertical); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace1 )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamColorSpace1 )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_COLOR_SPACE_TYPE *pColorSpace); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamMirror )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamMirror )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pEnable, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipHorizontal, - /* [annotation] */ + /* [annotation] */ _Out_ BOOL *pFlipVertical); - - HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetBehaviorHints )( + + HRESULT ( STDMETHODCALLTYPE *VideoProcessorGetBehaviorHints )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputWidth, - /* [annotation] */ + /* [annotation] */ _In_ UINT OutputHeight, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_FORMAT OutputFormat, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamCount, - /* [annotation] */ + /* [annotation] */ _In_reads_(StreamCount) const D3D11_VIDEO_PROCESSOR_STREAM_BEHAVIOR_HINT *pStreams, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pBehaviorHints); - - void ( STDMETHODCALLTYPE *VideoProcessorSetOutputHDRMetaData )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetOutputHDRMetaData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(Size) const void *pHDRMetaData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetOutputHDRMetaData )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetOutputHDRMetaData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_HDR_METADATA_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(Size) void *pMetaData); - - void ( STDMETHODCALLTYPE *VideoProcessorSetStreamHDRMetaData )( + + void ( STDMETHODCALLTYPE *VideoProcessorSetStreamHDRMetaData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _In_reads_bytes_opt_(Size) const void *pHDRMetaData); - - void ( STDMETHODCALLTYPE *VideoProcessorGetStreamHDRMetaData )( + + void ( STDMETHODCALLTYPE *VideoProcessorGetStreamHDRMetaData )( ID3D11VideoContext2 * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11VideoProcessor *pVideoProcessor, - /* [annotation] */ + /* [annotation] */ _In_ UINT StreamIndex, - /* [annotation] */ + /* [annotation] */ _Out_ DXGI_HDR_METADATA_TYPE *pType, - /* [annotation] */ + /* [annotation] */ _In_ UINT Size, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(Size) void *pMetaData); - + END_INTERFACE } ID3D11VideoContext2Vtbl; @@ -2752,258 +2742,256 @@ EXTERN_C const IID IID_ID3D11VideoContext2; CONST_VTBL struct ID3D11VideoContext2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11VideoContext2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11VideoContext2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11VideoContext2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11VideoContext2_GetDevice(This,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,ppDevice) ) #define ID3D11VideoContext2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D11VideoContext2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D11VideoContext2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D11VideoContext2_GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) \ - ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) + ( (This)->lpVtbl -> GetDecoderBuffer(This,pDecoder,Type,pBufferSize,ppBuffer) ) #define ID3D11VideoContext2_ReleaseDecoderBuffer(This,pDecoder,Type) \ - ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) + ( (This)->lpVtbl -> ReleaseDecoderBuffer(This,pDecoder,Type) ) #define ID3D11VideoContext2_DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) \ - ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) + ( (This)->lpVtbl -> DecoderBeginFrame(This,pDecoder,pView,ContentKeySize,pContentKey) ) #define ID3D11VideoContext2_DecoderEndFrame(This,pDecoder) \ - ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) + ( (This)->lpVtbl -> DecoderEndFrame(This,pDecoder) ) #define ID3D11VideoContext2_SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) \ - ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) + ( (This)->lpVtbl -> SubmitDecoderBuffers(This,pDecoder,NumBuffers,pBufferDesc) ) #define ID3D11VideoContext2_DecoderExtension(This,pDecoder,pExtensionData) \ - ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) + ( (This)->lpVtbl -> DecoderExtension(This,pDecoder,pExtensionData) ) #define ID3D11VideoContext2_VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputTargetRect(This,pVideoProcessor,Enable,pRect) ) #define ID3D11VideoContext2_VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputBackgroundColor(This,pVideoProcessor,YCbCr,pColor) ) #define ID3D11VideoContext2_VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputAlphaFillMode(This,pVideoProcessor,AlphaFillMode,StreamIndex) ) #define ID3D11VideoContext2_VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputConstriction(This,pVideoProcessor,Enable,Size) ) #define ID3D11VideoContext2_VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputStereoMode(This,pVideoProcessor,Enable) ) #define ID3D11VideoContext2_VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext2_VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputTargetRect(This,pVideoProcessor,Enabled,pRect) ) #define ID3D11VideoContext2_VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputBackgroundColor(This,pVideoProcessor,pYCbCr,pColor) ) #define ID3D11VideoContext2_VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputAlphaFillMode(This,pVideoProcessor,pAlphaFillMode,pStreamIndex) ) #define ID3D11VideoContext2_VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputConstriction(This,pVideoProcessor,pEnabled,pSize) ) #define ID3D11VideoContext2_VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputStereoMode(This,pVideoProcessor,pEnabled) ) #define ID3D11VideoContext2_VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputExtension(This,pVideoProcessor,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext2_VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFrameFormat(This,pVideoProcessor,StreamIndex,FrameFormat) ) #define ID3D11VideoContext2_VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamOutputRate(This,pVideoProcessor,StreamIndex,OutputRate,RepeatFrame,pCustomRate) ) #define ID3D11VideoContext2_VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamSourceRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext2_VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamDestRect(This,pVideoProcessor,StreamIndex,Enable,pRect) ) #define ID3D11VideoContext2_VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAlpha(This,pVideoProcessor,StreamIndex,Enable,Alpha) ) #define ID3D11VideoContext2_VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext2_VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,Enable,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext2_VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamLumaKey(This,pVideoProcessor,StreamIndex,Enable,Lower,Upper) ) #define ID3D11VideoContext2_VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamStereoFormat(This,pVideoProcessor,StreamIndex,Enable,Format,LeftViewFrame0,BaseViewFrame0,FlipMode,MonoOffset) ) #define ID3D11VideoContext2_VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,Enable) ) #define ID3D11VideoContext2_VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,Enable,Level) ) #define ID3D11VideoContext2_VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext2_VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFrameFormat(This,pVideoProcessor,StreamIndex,pFrameFormat) ) #define ID3D11VideoContext2_VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamOutputRate(This,pVideoProcessor,StreamIndex,pOutputRate,pRepeatFrame,pCustomRate) ) #define ID3D11VideoContext2_VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamSourceRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext2_VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamDestRect(This,pVideoProcessor,StreamIndex,pEnabled,pRect) ) #define ID3D11VideoContext2_VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAlpha(This,pVideoProcessor,StreamIndex,pEnabled,pAlpha) ) #define ID3D11VideoContext2_VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPalette(This,pVideoProcessor,StreamIndex,Count,pEntries) ) #define ID3D11VideoContext2_VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamPixelAspectRatio(This,pVideoProcessor,StreamIndex,pEnabled,pSourceAspectRatio,pDestinationAspectRatio) ) #define ID3D11VideoContext2_VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamLumaKey(This,pVideoProcessor,StreamIndex,pEnabled,pLower,pUpper) ) #define ID3D11VideoContext2_VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamStereoFormat(This,pVideoProcessor,StreamIndex,pEnable,pFormat,pLeftViewFrame0,pBaseViewFrame0,pFlipMode,MonoOffset) ) #define ID3D11VideoContext2_VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamAutoProcessingMode(This,pVideoProcessor,StreamIndex,pEnabled) ) #define ID3D11VideoContext2_VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamFilter(This,pVideoProcessor,StreamIndex,Filter,pEnabled,pLevel) ) #define ID3D11VideoContext2_VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamExtension(This,pVideoProcessor,StreamIndex,pExtensionGuid,DataSize,pData) ) #define ID3D11VideoContext2_VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) \ - ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) + ( (This)->lpVtbl -> VideoProcessorBlt(This,pVideoProcessor,pView,OutputFrame,StreamCount,pStreams) ) #define ID3D11VideoContext2_NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateCryptoSessionKeyExchange(This,pCryptoSession,DataSize,pData) ) #define ID3D11VideoContext2_EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) \ - ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) + ( (This)->lpVtbl -> EncryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,IVSize,pIV) ) #define ID3D11VideoContext2_DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) \ - ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) + ( (This)->lpVtbl -> DecryptionBlt(This,pCryptoSession,pSrcSurface,pDstSurface,pEncryptedBlockInfo,ContentKeySize,pContentKey,IVSize,pIV) ) #define ID3D11VideoContext2_StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) \ - ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) + ( (This)->lpVtbl -> StartSessionKeyRefresh(This,pCryptoSession,RandomNumberSize,pRandomNumber) ) #define ID3D11VideoContext2_FinishSessionKeyRefresh(This,pCryptoSession) \ - ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) + ( (This)->lpVtbl -> FinishSessionKeyRefresh(This,pCryptoSession) ) #define ID3D11VideoContext2_GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) \ - ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) + ( (This)->lpVtbl -> GetEncryptionBltKey(This,pCryptoSession,KeySize,pReadbackKey) ) #define ID3D11VideoContext2_NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) \ - ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) + ( (This)->lpVtbl -> NegotiateAuthenticatedChannelKeyExchange(This,pChannel,DataSize,pData) ) #define ID3D11VideoContext2_QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) \ - ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) + ( (This)->lpVtbl -> QueryAuthenticatedChannel(This,pChannel,InputSize,pInput,OutputSize,pOutput) ) #define ID3D11VideoContext2_ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) \ - ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) + ( (This)->lpVtbl -> ConfigureAuthenticatedChannel(This,pChannel,InputSize,pInput,pOutput) ) #define ID3D11VideoContext2_VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamRotation(This,pVideoProcessor,StreamIndex,Enable,Rotation) ) #define ID3D11VideoContext2_VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamRotation(This,pVideoProcessor,StreamIndex,pEnable,pRotation) ) #define ID3D11VideoContext2_SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) \ - ( (This)->lpVtbl -> SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) ) + ( (This)->lpVtbl -> SubmitDecoderBuffers1(This,pDecoder,NumBuffers,pBufferDesc) ) #define ID3D11VideoContext2_GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) \ - ( (This)->lpVtbl -> GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) ) + ( (This)->lpVtbl -> GetDataForNewHardwareKey(This,pCryptoSession,PrivateInputSize,pPrivatInputData,pPrivateOutputData) ) #define ID3D11VideoContext2_CheckCryptoSessionStatus(This,pCryptoSession,pStatus) \ - ( (This)->lpVtbl -> CheckCryptoSessionStatus(This,pCryptoSession,pStatus) ) + ( (This)->lpVtbl -> CheckCryptoSessionStatus(This,pCryptoSession,pStatus) ) #define ID3D11VideoContext2_DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) \ - ( (This)->lpVtbl -> DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) ) + ( (This)->lpVtbl -> DecoderEnableDownsampling(This,pDecoder,InputColorSpace,pOutputDesc,ReferenceFrameCount) ) #define ID3D11VideoContext2_DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) \ - ( (This)->lpVtbl -> DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) ) + ( (This)->lpVtbl -> DecoderUpdateDownsampling(This,pDecoder,pOutputDesc) ) #define ID3D11VideoContext2_VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputColorSpace1(This,pVideoProcessor,ColorSpace) ) #define ID3D11VideoContext2_VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputShaderUsage(This,pVideoProcessor,ShaderUsage) ) #define ID3D11VideoContext2_VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputColorSpace1(This,pVideoProcessor,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputShaderUsage(This,pVideoProcessor,pShaderUsage) ) #define ID3D11VideoContext2_VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamColorSpace1(This,pVideoProcessor,StreamIndex,ColorSpace) ) #define ID3D11VideoContext2_VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamMirror(This,pVideoProcessor,StreamIndex,Enable,FlipHorizontal,FlipVertical) ) #define ID3D11VideoContext2_VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamColorSpace1(This,pVideoProcessor,StreamIndex,pColorSpace) ) #define ID3D11VideoContext2_VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamMirror(This,pVideoProcessor,StreamIndex,pEnable,pFlipHorizontal,pFlipVertical) ) #define ID3D11VideoContext2_VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) \ - ( (This)->lpVtbl -> VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) ) + ( (This)->lpVtbl -> VideoProcessorGetBehaviorHints(This,pVideoProcessor,OutputWidth,OutputHeight,OutputFormat,StreamCount,pStreams,pBehaviorHints) ) #define ID3D11VideoContext2_VideoProcessorSetOutputHDRMetaData(This,pVideoProcessor,Type,Size,pHDRMetaData) \ - ( (This)->lpVtbl -> VideoProcessorSetOutputHDRMetaData(This,pVideoProcessor,Type,Size,pHDRMetaData) ) + ( (This)->lpVtbl -> VideoProcessorSetOutputHDRMetaData(This,pVideoProcessor,Type,Size,pHDRMetaData) ) #define ID3D11VideoContext2_VideoProcessorGetOutputHDRMetaData(This,pVideoProcessor,pType,Size,pMetaData) \ - ( (This)->lpVtbl -> VideoProcessorGetOutputHDRMetaData(This,pVideoProcessor,pType,Size,pMetaData) ) + ( (This)->lpVtbl -> VideoProcessorGetOutputHDRMetaData(This,pVideoProcessor,pType,Size,pMetaData) ) #define ID3D11VideoContext2_VideoProcessorSetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,Type,Size,pHDRMetaData) \ - ( (This)->lpVtbl -> VideoProcessorSetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,Type,Size,pHDRMetaData) ) + ( (This)->lpVtbl -> VideoProcessorSetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,Type,Size,pHDRMetaData) ) #define ID3D11VideoContext2_VideoProcessorGetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,pType,Size,pMetaData) \ - ( (This)->lpVtbl -> VideoProcessorGetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,pType,Size,pMetaData) ) + ( (This)->lpVtbl -> VideoProcessorGetStreamHDRMetaData(This,pVideoProcessor,StreamIndex,pType,Size,pMetaData) ) #endif /* COBJMACROS */ @@ -3012,7 +3000,7 @@ EXTERN_C const IID IID_ID3D11VideoContext2; #endif /* __ID3D11VideoContext2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11_4_0000_0004 */ -/* [local] */ +/* [local] */ typedef struct D3D11_FEATURE_DATA_D3D11_OPTIONS4 { diff --git a/gfx/include/dxsdk/d3d11on12.h b/gfx/include/dxsdk/d3d11on12.h index 0f65e77a5c..398c25ae69 100644 --- a/gfx/include/dxsdk/d3d11on12.h +++ b/gfx/include/dxsdk/d3d11on12.h @@ -37,7 +37,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11On12Device_FWD_DEFINED__ #define __ID3D11On12Device_FWD_DEFINED__ @@ -53,10 +53,10 @@ typedef interface ID3D11On12Device ID3D11On12Device; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11on12_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ @@ -105,14 +105,14 @@ extern "C"{ // Pointer to returned feature level. May be NULL. // // Return Values -// Any of those documented for +// Any of those documented for // D3D11CreateDevice // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D11ON12_CREATE_DEVICE)( _In_ IUnknown*, UINT, - _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, UINT FeatureLevels, - _In_reads_opt_( NumQueues ) IUnknown* CONST*, UINT NumQueues, - UINT, _COM_Outptr_opt_ ID3D11Device**, _COM_Outptr_opt_ ID3D11DeviceContext**, +typedef HRESULT (WINAPI* PFN_D3D11ON12_CREATE_DEVICE)( _In_ IUnknown*, UINT, + _In_reads_opt_( FeatureLevels ) CONST D3D_FEATURE_LEVEL*, UINT FeatureLevels, + _In_reads_opt_( NumQueues ) IUnknown* CONST*, UINT NumQueues, + UINT, _COM_Outptr_opt_ ID3D11Device**, _COM_Outptr_opt_ ID3D11DeviceContext**, _Out_opt_ D3D_FEATURE_LEVEL* ); HRESULT WINAPI D3D11On12CreateDevice( @@ -142,53 +142,52 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11on12_0000_0000_v0_0_s_ifspec; #define __ID3D11On12Device_INTERFACE_DEFINED__ /* interface ID3D11On12Device */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11On12Device; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("85611e73-70a9-490e-9614-a9e302777904") ID3D11On12Device : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CreateWrappedResource( + virtual HRESULT STDMETHODCALLTYPE CreateWrappedResource( _In_ IUnknown *pResource12, _In_ const D3D11_RESOURCE_FLAGS *pFlags11, D3D12_RESOURCE_STATES InState, D3D12_RESOURCE_STATES OutState, REFIID riid, _COM_Outptr_opt_ void **ppResource11) = 0; - - virtual void STDMETHODCALLTYPE ReleaseWrappedResources( + + virtual void STDMETHODCALLTYPE ReleaseWrappedResources( _In_reads_( NumResources ) ID3D11Resource *const *ppResources, UINT NumResources) = 0; - - virtual void STDMETHODCALLTYPE AcquireWrappedResources( + + virtual void STDMETHODCALLTYPE AcquireWrappedResources( _In_reads_( NumResources ) ID3D11Resource *const *ppResources, UINT NumResources) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11On12DeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11On12Device * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11On12Device * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11On12Device * This); - - HRESULT ( STDMETHODCALLTYPE *CreateWrappedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateWrappedResource )( ID3D11On12Device * This, _In_ IUnknown *pResource12, _In_ const D3D11_RESOURCE_FLAGS *pFlags11, @@ -196,17 +195,17 @@ EXTERN_C const IID IID_ID3D11On12Device; D3D12_RESOURCE_STATES OutState, REFIID riid, _COM_Outptr_opt_ void **ppResource11); - - void ( STDMETHODCALLTYPE *ReleaseWrappedResources )( + + void ( STDMETHODCALLTYPE *ReleaseWrappedResources )( ID3D11On12Device * This, _In_reads_( NumResources ) ID3D11Resource *const *ppResources, UINT NumResources); - - void ( STDMETHODCALLTYPE *AcquireWrappedResources )( + + void ( STDMETHODCALLTYPE *AcquireWrappedResources )( ID3D11On12Device * This, _In_reads_( NumResources ) ID3D11Resource *const *ppResources, UINT NumResources); - + END_INTERFACE } ID3D11On12DeviceVtbl; @@ -215,27 +214,25 @@ EXTERN_C const IID IID_ID3D11On12Device; CONST_VTBL struct ID3D11On12DeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11On12Device_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11On12Device_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11On12Device_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11On12Device_CreateWrappedResource(This,pResource12,pFlags11,InState,OutState,riid,ppResource11) \ - ( (This)->lpVtbl -> CreateWrappedResource(This,pResource12,pFlags11,InState,OutState,riid,ppResource11) ) + ( (This)->lpVtbl -> CreateWrappedResource(This,pResource12,pFlags11,InState,OutState,riid,ppResource11) ) #define ID3D11On12Device_ReleaseWrappedResources(This,ppResources,NumResources) \ - ( (This)->lpVtbl -> ReleaseWrappedResources(This,ppResources,NumResources) ) + ( (This)->lpVtbl -> ReleaseWrappedResources(This,ppResources,NumResources) ) #define ID3D11On12Device_AcquireWrappedResources(This,ppResources,NumResources) \ - ( (This)->lpVtbl -> AcquireWrappedResources(This,ppResources,NumResources) ) + ( (This)->lpVtbl -> AcquireWrappedResources(This,ppResources,NumResources) ) #endif /* COBJMACROS */ @@ -244,7 +241,7 @@ EXTERN_C const IID IID_ID3D11On12Device; #endif /* __ID3D11On12Device_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11on12_0000_0001 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d3d11sdklayers.h b/gfx/include/dxsdk/d3d11sdklayers.h index 7ed49f21ea..60941ad735 100644 --- a/gfx/include/dxsdk/d3d11sdklayers.h +++ b/gfx/include/dxsdk/d3d11sdklayers.h @@ -38,7 +38,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11Debug_FWD_DEFINED__ #define __ID3D11Debug_FWD_DEFINED__ @@ -83,10 +83,10 @@ typedef interface ID3D11InfoQueue ID3D11InfoQueue; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11sdklayers_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region Application Family*/ @@ -108,7 +108,7 @@ extern "C"{ #define D3D11_DEBUG_FEATURE_DISABLE_TILED_RESOURCE_MAPPING_TRACKING_AND_VALIDATION ( 0x80 ) -typedef +typedef enum D3D11_RLDO_FLAGS { D3D11_RLDO_SUMMARY = 0x1, @@ -125,104 +125,103 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11sdklayers_0000_0000_v0_0_s_ifspec; #define __ID3D11Debug_INTERFACE_DEFINED__ /* interface ID3D11Debug */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11Debug; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("79cf2233-7536-4948-9d36-1e4692dc5760") ID3D11Debug : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( + virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( UINT Mask) = 0; - + virtual UINT STDMETHODCALLTYPE GetFeatureMask( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPresentPerRenderOpDelay( + + virtual HRESULT STDMETHODCALLTYPE SetPresentPerRenderOpDelay( UINT Milliseconds) = 0; - + virtual UINT STDMETHODCALLTYPE GetPresentPerRenderOpDelay( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSwapChain( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetSwapChain( + /* [annotation] */ _In_opt_ IDXGISwapChain *pSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSwapChain( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetSwapChain( + /* [annotation] */ _Out_ IDXGISwapChain **ppSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE ValidateContext( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE ValidateContext( + /* [annotation] */ _In_ ID3D11DeviceContext *pContext) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( + + virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( D3D11_RLDO_FLAGS Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE ValidateContextForDispatch( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE ValidateContextForDispatch( + /* [annotation] */ _In_ ID3D11DeviceContext *pContext) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11DebugVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11Debug * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11Debug * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( + + HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( ID3D11Debug * This, UINT Mask); - - UINT ( STDMETHODCALLTYPE *GetFeatureMask )( + + UINT ( STDMETHODCALLTYPE *GetFeatureMask )( ID3D11Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetPresentPerRenderOpDelay )( + + HRESULT ( STDMETHODCALLTYPE *SetPresentPerRenderOpDelay )( ID3D11Debug * This, UINT Milliseconds); - - UINT ( STDMETHODCALLTYPE *GetPresentPerRenderOpDelay )( + + UINT ( STDMETHODCALLTYPE *GetPresentPerRenderOpDelay )( ID3D11Debug * This); - - HRESULT ( STDMETHODCALLTYPE *SetSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *SetSwapChain )( ID3D11Debug * This, - /* [annotation] */ + /* [annotation] */ _In_opt_ IDXGISwapChain *pSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *GetSwapChain )( ID3D11Debug * This, - /* [annotation] */ + /* [annotation] */ _Out_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *ValidateContext )( + + HRESULT ( STDMETHODCALLTYPE *ValidateContext )( ID3D11Debug * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DeviceContext *pContext); - - HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( + + HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( ID3D11Debug * This, D3D11_RLDO_FLAGS Flags); - - HRESULT ( STDMETHODCALLTYPE *ValidateContextForDispatch )( + + HRESULT ( STDMETHODCALLTYPE *ValidateContextForDispatch )( ID3D11Debug * This, - /* [annotation] */ + /* [annotation] */ _In_ ID3D11DeviceContext *pContext); - + END_INTERFACE } ID3D11DebugVtbl; @@ -231,45 +230,43 @@ EXTERN_C const IID IID_ID3D11Debug; CONST_VTBL struct ID3D11DebugVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11Debug_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11Debug_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11Debug_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11Debug_SetFeatureMask(This,Mask) \ - ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) + ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) #define ID3D11Debug_GetFeatureMask(This) \ - ( (This)->lpVtbl -> GetFeatureMask(This) ) + ( (This)->lpVtbl -> GetFeatureMask(This) ) #define ID3D11Debug_SetPresentPerRenderOpDelay(This,Milliseconds) \ - ( (This)->lpVtbl -> SetPresentPerRenderOpDelay(This,Milliseconds) ) + ( (This)->lpVtbl -> SetPresentPerRenderOpDelay(This,Milliseconds) ) #define ID3D11Debug_GetPresentPerRenderOpDelay(This) \ - ( (This)->lpVtbl -> GetPresentPerRenderOpDelay(This) ) + ( (This)->lpVtbl -> GetPresentPerRenderOpDelay(This) ) #define ID3D11Debug_SetSwapChain(This,pSwapChain) \ - ( (This)->lpVtbl -> SetSwapChain(This,pSwapChain) ) + ( (This)->lpVtbl -> SetSwapChain(This,pSwapChain) ) #define ID3D11Debug_GetSwapChain(This,ppSwapChain) \ - ( (This)->lpVtbl -> GetSwapChain(This,ppSwapChain) ) + ( (This)->lpVtbl -> GetSwapChain(This,ppSwapChain) ) #define ID3D11Debug_ValidateContext(This,pContext) \ - ( (This)->lpVtbl -> ValidateContext(This,pContext) ) + ( (This)->lpVtbl -> ValidateContext(This,pContext) ) #define ID3D11Debug_ReportLiveDeviceObjects(This,Flags) \ - ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) + ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) #define ID3D11Debug_ValidateContextForDispatch(This,pContext) \ - ( (This)->lpVtbl -> ValidateContextForDispatch(This,pContext) ) + ( (This)->lpVtbl -> ValidateContextForDispatch(This,pContext) ) #endif /* COBJMACROS */ @@ -278,7 +275,7 @@ EXTERN_C const IID IID_ID3D11Debug; #endif /* __ID3D11Debug_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11sdklayers_0000_0001 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ @@ -293,49 +290,48 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11sdklayers_0000_0001_v0_0_s_ifspec; #define __ID3D11SwitchToRef_INTERFACE_DEFINED__ /* interface ID3D11SwitchToRef */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11SwitchToRef; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1ef337e3-58e7-4f83-a692-db221f5ed47e") ID3D11SwitchToRef : public IUnknown { public: - virtual BOOL STDMETHODCALLTYPE SetUseRef( + virtual BOOL STDMETHODCALLTYPE SetUseRef( BOOL UseRef) = 0; - + virtual BOOL STDMETHODCALLTYPE GetUseRef( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11SwitchToRefVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11SwitchToRef * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11SwitchToRef * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11SwitchToRef * This); - - BOOL ( STDMETHODCALLTYPE *SetUseRef )( + + BOOL ( STDMETHODCALLTYPE *SetUseRef )( ID3D11SwitchToRef * This, BOOL UseRef); - - BOOL ( STDMETHODCALLTYPE *GetUseRef )( + + BOOL ( STDMETHODCALLTYPE *GetUseRef )( ID3D11SwitchToRef * This); - + END_INTERFACE } ID3D11SwitchToRefVtbl; @@ -344,24 +340,22 @@ EXTERN_C const IID IID_ID3D11SwitchToRef; CONST_VTBL struct ID3D11SwitchToRefVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11SwitchToRef_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11SwitchToRef_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11SwitchToRef_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11SwitchToRef_SetUseRef(This,UseRef) \ - ( (This)->lpVtbl -> SetUseRef(This,UseRef) ) + ( (This)->lpVtbl -> SetUseRef(This,UseRef) ) #define ID3D11SwitchToRef_GetUseRef(This) \ - ( (This)->lpVtbl -> GetUseRef(This) ) + ( (This)->lpVtbl -> GetUseRef(This) ) #endif /* COBJMACROS */ @@ -370,14 +364,14 @@ EXTERN_C const IID IID_ID3D11SwitchToRef; #endif /* __ID3D11SwitchToRef_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11sdklayers_0000_0002 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ /*#pragma region PC Application Family*/ /*#pragma region PC Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP)*/ -typedef +typedef enum D3D11_SHADER_TRACKING_RESOURCE_TYPE { D3D11_SHADER_TRACKING_RESOURCE_TYPE_NONE = 0, @@ -390,7 +384,7 @@ enum D3D11_SHADER_TRACKING_RESOURCE_TYPE D3D11_SHADER_TRACKING_RESOURCE_TYPE_ALL = 7 } D3D11_SHADER_TRACKING_RESOURCE_TYPE; -typedef +typedef enum D3D11_SHADER_TRACKING_OPTION { D3D11_SHADER_TRACKING_OPTION_IGNORE = 0, @@ -407,7 +401,7 @@ enum D3D11_SHADER_TRACKING_OPTION D3D11_SHADER_TRACKING_OPTION_UAV_SPECIFIC_FLAGS = ( ( ( D3D11_SHADER_TRACKING_OPTION_TRACK_RAW_ACROSS_THREADGROUPS | D3D11_SHADER_TRACKING_OPTION_TRACK_WAR_ACROSS_THREADGROUPS ) | D3D11_SHADER_TRACKING_OPTION_TRACK_WAW_ACROSS_THREADGROUPS ) | D3D11_SHADER_TRACKING_OPTION_TRACK_ATOMIC_CONSISTENCY_ACROSS_THREADGROUPS ) , D3D11_SHADER_TRACKING_OPTION_ALL_HAZARDS = ( ( ( ( ( ( ( D3D11_SHADER_TRACKING_OPTION_TRACK_RAW | D3D11_SHADER_TRACKING_OPTION_TRACK_WAR ) | D3D11_SHADER_TRACKING_OPTION_TRACK_WAW ) | D3D11_SHADER_TRACKING_OPTION_TRACK_ATOMIC_CONSISTENCY ) | D3D11_SHADER_TRACKING_OPTION_TRACK_RAW_ACROSS_THREADGROUPS ) | D3D11_SHADER_TRACKING_OPTION_TRACK_WAR_ACROSS_THREADGROUPS ) | D3D11_SHADER_TRACKING_OPTION_TRACK_WAW_ACROSS_THREADGROUPS ) | D3D11_SHADER_TRACKING_OPTION_TRACK_ATOMIC_CONSISTENCY_ACROSS_THREADGROUPS ) , D3D11_SHADER_TRACKING_OPTION_ALL_HAZARDS_ALLOWING_SAME = ( D3D11_SHADER_TRACKING_OPTION_ALL_HAZARDS | D3D11_SHADER_TRACKING_OPTION_ALLOW_SAME ) , - D3D11_SHADER_TRACKING_OPTION_ALL_OPTIONS = ( D3D11_SHADER_TRACKING_OPTION_ALL_HAZARDS_ALLOWING_SAME | D3D11_SHADER_TRACKING_OPTION_TRACK_UNINITIALIZED ) + D3D11_SHADER_TRACKING_OPTION_ALL_OPTIONS = ( D3D11_SHADER_TRACKING_OPTION_ALL_HAZARDS_ALLOWING_SAME | D3D11_SHADER_TRACKING_OPTION_TRACK_UNINITIALIZED ) } D3D11_SHADER_TRACKING_OPTIONS; extern RPC_IF_HANDLE __MIDL_itf_d3d11sdklayers_0000_0002_v0_0_c_ifspec; @@ -417,63 +411,62 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11sdklayers_0000_0002_v0_0_s_ifspec; #define __ID3D11TracingDevice_INTERFACE_DEFINED__ /* interface ID3D11TracingDevice */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11TracingDevice; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1911c771-1587-413e-a7e0-fb26c3de0268") ID3D11TracingDevice : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetShaderTrackingOptionsByType( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE SetShaderTrackingOptionsByType( + /* [annotation] */ _In_ UINT ResourceTypeFlags, - /* [annotation] */ + /* [annotation] */ _In_ UINT Options) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetShaderTrackingOptions( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetShaderTrackingOptions( + /* [annotation] */ _In_ IUnknown *pShader, - /* [annotation] */ + /* [annotation] */ _In_ UINT Options) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11TracingDeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11TracingDevice * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11TracingDevice * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11TracingDevice * This); - - HRESULT ( STDMETHODCALLTYPE *SetShaderTrackingOptionsByType )( + + HRESULT ( STDMETHODCALLTYPE *SetShaderTrackingOptionsByType )( ID3D11TracingDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT ResourceTypeFlags, - /* [annotation] */ + /* [annotation] */ _In_ UINT Options); - - HRESULT ( STDMETHODCALLTYPE *SetShaderTrackingOptions )( + + HRESULT ( STDMETHODCALLTYPE *SetShaderTrackingOptions )( ID3D11TracingDevice * This, - /* [annotation] */ + /* [annotation] */ _In_ IUnknown *pShader, - /* [annotation] */ + /* [annotation] */ _In_ UINT Options); - + END_INTERFACE } ID3D11TracingDeviceVtbl; @@ -482,24 +475,22 @@ EXTERN_C const IID IID_ID3D11TracingDevice; CONST_VTBL struct ID3D11TracingDeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11TracingDevice_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11TracingDevice_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11TracingDevice_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11TracingDevice_SetShaderTrackingOptionsByType(This,ResourceTypeFlags,Options) \ - ( (This)->lpVtbl -> SetShaderTrackingOptionsByType(This,ResourceTypeFlags,Options) ) + ( (This)->lpVtbl -> SetShaderTrackingOptionsByType(This,ResourceTypeFlags,Options) ) #define ID3D11TracingDevice_SetShaderTrackingOptions(This,pShader,Options) \ - ( (This)->lpVtbl -> SetShaderTrackingOptions(This,pShader,Options) ) + ( (This)->lpVtbl -> SetShaderTrackingOptions(This,pShader,Options) ) #endif /* COBJMACROS */ @@ -511,44 +502,43 @@ EXTERN_C const IID IID_ID3D11TracingDevice; #define __ID3D11RefTrackingOptions_INTERFACE_DEFINED__ /* interface ID3D11RefTrackingOptions */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RefTrackingOptions; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("193dacdf-0db2-4c05-a55c-ef06cac56fd9") ID3D11RefTrackingOptions : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetTrackingOptions( + virtual HRESULT STDMETHODCALLTYPE SetTrackingOptions( UINT uOptions) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RefTrackingOptionsVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RefTrackingOptions * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RefTrackingOptions * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RefTrackingOptions * This); - - HRESULT ( STDMETHODCALLTYPE *SetTrackingOptions )( + + HRESULT ( STDMETHODCALLTYPE *SetTrackingOptions )( ID3D11RefTrackingOptions * This, UINT uOptions); - + END_INTERFACE } ID3D11RefTrackingOptionsVtbl; @@ -557,21 +547,19 @@ EXTERN_C const IID IID_ID3D11RefTrackingOptions; CONST_VTBL struct ID3D11RefTrackingOptionsVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RefTrackingOptions_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RefTrackingOptions_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RefTrackingOptions_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RefTrackingOptions_SetTrackingOptions(This,uOptions) \ - ( (This)->lpVtbl -> SetTrackingOptions(This,uOptions) ) + ( (This)->lpVtbl -> SetTrackingOptions(This,uOptions) ) #endif /* COBJMACROS */ @@ -583,46 +571,45 @@ EXTERN_C const IID IID_ID3D11RefTrackingOptions; #define __ID3D11RefDefaultTrackingOptions_INTERFACE_DEFINED__ /* interface ID3D11RefDefaultTrackingOptions */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11RefDefaultTrackingOptions; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("03916615-c644-418c-9bf4-75db5be63ca0") ID3D11RefDefaultTrackingOptions : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetTrackingOptions( + virtual HRESULT STDMETHODCALLTYPE SetTrackingOptions( UINT ResourceTypeFlags, UINT Options) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11RefDefaultTrackingOptionsVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11RefDefaultTrackingOptions * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11RefDefaultTrackingOptions * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11RefDefaultTrackingOptions * This); - - HRESULT ( STDMETHODCALLTYPE *SetTrackingOptions )( + + HRESULT ( STDMETHODCALLTYPE *SetTrackingOptions )( ID3D11RefDefaultTrackingOptions * This, UINT ResourceTypeFlags, UINT Options); - + END_INTERFACE } ID3D11RefDefaultTrackingOptionsVtbl; @@ -631,21 +618,19 @@ EXTERN_C const IID IID_ID3D11RefDefaultTrackingOptions; CONST_VTBL struct ID3D11RefDefaultTrackingOptionsVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11RefDefaultTrackingOptions_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11RefDefaultTrackingOptions_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11RefDefaultTrackingOptions_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11RefDefaultTrackingOptions_SetTrackingOptions(This,ResourceTypeFlags,Options) \ - ( (This)->lpVtbl -> SetTrackingOptions(This,ResourceTypeFlags,Options) ) + ( (This)->lpVtbl -> SetTrackingOptions(This,ResourceTypeFlags,Options) ) #endif /* COBJMACROS */ @@ -654,7 +639,7 @@ EXTERN_C const IID IID_ID3D11RefDefaultTrackingOptions; #endif /* __ID3D11RefDefaultTrackingOptions_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11sdklayers_0000_0005 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) */ /*#pragma endregion*/ @@ -680,7 +665,7 @@ DEFINE_GUID(DXGI_DEBUG_D3D11, 0x4b99317b, 0xac39, 0x4aa6, 0xbb, 0xb, 0xba, 0xa0, #define D3D11_APPNAME_STRING __TEXT("Name") #define D3D11_FORCE_DEBUGGABLE __TEXT("ForceDebuggable") #define D3D11_FORCE_SHADER_SKIP_OPTIMIZATION __TEXT("ForceShaderSkipOptimization") -typedef +typedef enum D3D11_MESSAGE_CATEGORY { D3D11_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0, @@ -693,20 +678,20 @@ enum D3D11_MESSAGE_CATEGORY D3D11_MESSAGE_CATEGORY_STATE_GETTING = ( D3D11_MESSAGE_CATEGORY_STATE_SETTING + 1 ) , D3D11_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = ( D3D11_MESSAGE_CATEGORY_STATE_GETTING + 1 ) , D3D11_MESSAGE_CATEGORY_EXECUTION = ( D3D11_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 ) , - D3D11_MESSAGE_CATEGORY_SHADER = ( D3D11_MESSAGE_CATEGORY_EXECUTION + 1 ) + D3D11_MESSAGE_CATEGORY_SHADER = ( D3D11_MESSAGE_CATEGORY_EXECUTION + 1 ) } D3D11_MESSAGE_CATEGORY; -typedef +typedef enum D3D11_MESSAGE_SEVERITY { D3D11_MESSAGE_SEVERITY_CORRUPTION = 0, D3D11_MESSAGE_SEVERITY_ERROR = ( D3D11_MESSAGE_SEVERITY_CORRUPTION + 1 ) , D3D11_MESSAGE_SEVERITY_WARNING = ( D3D11_MESSAGE_SEVERITY_ERROR + 1 ) , D3D11_MESSAGE_SEVERITY_INFO = ( D3D11_MESSAGE_SEVERITY_WARNING + 1 ) , - D3D11_MESSAGE_SEVERITY_MESSAGE = ( D3D11_MESSAGE_SEVERITY_INFO + 1 ) + D3D11_MESSAGE_SEVERITY_MESSAGE = ( D3D11_MESSAGE_SEVERITY_INFO + 1 ) } D3D11_MESSAGE_SEVERITY; -typedef +typedef enum D3D11_MESSAGE_ID { D3D11_MESSAGE_ID_UNKNOWN = 0, @@ -2013,7 +1998,7 @@ enum D3D11_MESSAGE_ID D3D11_MESSAGE_ID_CREATE_FENCE = ( D3D11_MESSAGE_ID_VIDEOPROCESSORGETSTREAMMIRROR_INVALIDSTREAM + 1 ) , D3D11_MESSAGE_ID_LIVE_FENCE = ( D3D11_MESSAGE_ID_CREATE_FENCE + 1 ) , D3D11_MESSAGE_ID_DESTROY_FENCE = ( D3D11_MESSAGE_ID_LIVE_FENCE + 1 ) , - D3D11_MESSAGE_ID_D3D11_3_MESSAGES_END = ( D3D11_MESSAGE_ID_DESTROY_FENCE + 1 ) + D3D11_MESSAGE_ID_D3D11_3_MESSAGES_END = ( D3D11_MESSAGE_ID_DESTROY_FENCE + 1 ) } D3D11_MESSAGE_ID; typedef struct D3D11_MESSAGE @@ -2021,7 +2006,7 @@ typedef struct D3D11_MESSAGE D3D11_MESSAGE_CATEGORY Category; D3D11_MESSAGE_SEVERITY Severity; D3D11_MESSAGE_ID ID; - /* [annotation] */ + /* [annotation] */ _Field_size_(DescriptionByteLength) const char *pDescription; SIZE_T DescriptionByteLength; } D3D11_MESSAGE; @@ -2029,13 +2014,13 @@ typedef struct D3D11_MESSAGE typedef struct D3D11_INFO_QUEUE_FILTER_DESC { UINT NumCategories; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumCategories) D3D11_MESSAGE_CATEGORY *pCategoryList; UINT NumSeverities; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumSeverities) D3D11_MESSAGE_SEVERITY *pSeverityList; UINT NumIDs; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumIDs) D3D11_MESSAGE_ID *pIDList; } D3D11_INFO_QUEUE_FILTER_DESC; @@ -2054,324 +2039,323 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11sdklayers_0000_0005_v0_0_s_ifspec; #define __ID3D11InfoQueue_INTERFACE_DEFINED__ /* interface ID3D11InfoQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11InfoQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6543dbb6-1b48-42f5-ab82-e97ec74326f6") ID3D11InfoQueue : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( + /* [annotation] */ _In_ UINT64 MessageCountLimit) = 0; - + virtual void STDMETHODCALLTYPE ClearStoredMessages( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetMessage( + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) D3D11_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D11_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopStorageFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D11_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopRetrievalFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddMessage( + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnID( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnID( + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID) = 0; - - virtual void STDMETHODCALLTYPE SetMuteDebugOutput( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetMuteDebugOutput( + /* [annotation] */ _In_ BOOL bMute) = 0; - + virtual BOOL STDMETHODCALLTYPE GetMuteDebugOutput( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11InfoQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11InfoQueue * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11InfoQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( + + HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageCountLimit); - - void ( STDMETHODCALLTYPE *ClearStoredMessages )( + + void ( STDMETHODCALLTYPE *ClearStoredMessages )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *GetMessage )( + + HRESULT ( STDMETHODCALLTYPE *GetMessage )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) D3D11_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( ID3D11InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( ID3D11InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( ID3D11InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( ID3D11InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( ID3D11InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D11_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearStorageFilter )( + + void ( STDMETHODCALLTYPE *ClearStorageFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopStorageFilter )( + + void ( STDMETHODCALLTYPE *PopStorageFilter )( ID3D11InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) D3D11_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( + + void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopRetrievalFilter )( + + void ( STDMETHODCALLTYPE *PopRetrievalFilter )( ID3D11InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( ID3D11InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddMessage )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_CATEGORY Category); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_SEVERITY Severity); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_MESSAGE_ID ID); - - void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( + + void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( ID3D11InfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMute); - - BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( + + BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( ID3D11InfoQueue * This); - + END_INTERFACE } ID3D11InfoQueueVtbl; @@ -2380,123 +2364,121 @@ EXTERN_C const IID IID_ID3D11InfoQueue; CONST_VTBL struct ID3D11InfoQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11InfoQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11InfoQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11InfoQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11InfoQueue_SetMessageCountLimit(This,MessageCountLimit) \ - ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) + ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) #define ID3D11InfoQueue_ClearStoredMessages(This) \ - ( (This)->lpVtbl -> ClearStoredMessages(This) ) + ( (This)->lpVtbl -> ClearStoredMessages(This) ) #define ID3D11InfoQueue_GetMessage(This,MessageIndex,pMessage,pMessageByteLength) \ - ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) + ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) #define ID3D11InfoQueue_GetNumMessagesAllowedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) #define ID3D11InfoQueue_GetNumMessagesDeniedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) #define ID3D11InfoQueue_GetNumStoredMessages(This) \ - ( (This)->lpVtbl -> GetNumStoredMessages(This) ) + ( (This)->lpVtbl -> GetNumStoredMessages(This) ) #define ID3D11InfoQueue_GetNumStoredMessagesAllowedByRetrievalFilter(This) \ - ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) + ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) #define ID3D11InfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) #define ID3D11InfoQueue_GetMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetMessageCountLimit(This) ) #define ID3D11InfoQueue_AddStorageFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) #define ID3D11InfoQueue_GetStorageFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) #define ID3D11InfoQueue_ClearStorageFilter(This) \ - ( (This)->lpVtbl -> ClearStorageFilter(This) ) + ( (This)->lpVtbl -> ClearStorageFilter(This) ) #define ID3D11InfoQueue_PushEmptyStorageFilter(This) \ - ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) + ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) #define ID3D11InfoQueue_PushCopyOfStorageFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) #define ID3D11InfoQueue_PushStorageFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) #define ID3D11InfoQueue_PopStorageFilter(This) \ - ( (This)->lpVtbl -> PopStorageFilter(This) ) + ( (This)->lpVtbl -> PopStorageFilter(This) ) #define ID3D11InfoQueue_GetStorageFilterStackSize(This) \ - ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) + ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) #define ID3D11InfoQueue_AddRetrievalFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) #define ID3D11InfoQueue_GetRetrievalFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) #define ID3D11InfoQueue_ClearRetrievalFilter(This) \ - ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) + ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) #define ID3D11InfoQueue_PushEmptyRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) #define ID3D11InfoQueue_PushCopyOfRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) #define ID3D11InfoQueue_PushRetrievalFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) #define ID3D11InfoQueue_PopRetrievalFilter(This) \ - ( (This)->lpVtbl -> PopRetrievalFilter(This) ) + ( (This)->lpVtbl -> PopRetrievalFilter(This) ) #define ID3D11InfoQueue_GetRetrievalFilterStackSize(This) \ - ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) + ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) #define ID3D11InfoQueue_AddMessage(This,Category,Severity,ID,pDescription) \ - ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) + ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) #define ID3D11InfoQueue_AddApplicationMessage(This,Severity,pDescription) \ - ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) + ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) #define ID3D11InfoQueue_SetBreakOnCategory(This,Category,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) #define ID3D11InfoQueue_SetBreakOnSeverity(This,Severity,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) #define ID3D11InfoQueue_SetBreakOnID(This,ID,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) #define ID3D11InfoQueue_GetBreakOnCategory(This,Category) \ - ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) + ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) #define ID3D11InfoQueue_GetBreakOnSeverity(This,Severity) \ - ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) + ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) #define ID3D11InfoQueue_GetBreakOnID(This,ID) \ - ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) + ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) #define ID3D11InfoQueue_SetMuteDebugOutput(This,bMute) \ - ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) + ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) #define ID3D11InfoQueue_GetMuteDebugOutput(This) \ - ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) + ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) #endif /* COBJMACROS */ @@ -2505,7 +2487,7 @@ EXTERN_C const IID IID_ID3D11InfoQueue; #endif /* __ID3D11InfoQueue_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11sdklayers_0000_0006 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d3d11shader.h b/gfx/include/dxsdk/d3d11shader.h index 1b13ddeb96..78849576ae 100644 --- a/gfx/include/dxsdk/d3d11shader.h +++ b/gfx/include/dxsdk/d3d11shader.h @@ -17,7 +17,7 @@ typedef enum D3D11_SHADER_VERSION_TYPE D3D11_SHVER_PIXEL_SHADER = 0, D3D11_SHVER_VERTEX_SHADER = 1, D3D11_SHVER_GEOMETRY_SHADER = 2, - + // D3D11 Shaders D3D11_SHVER_HULL_SHADER = 3, D3D11_SHVER_DOMAIN_SHADER = 4, @@ -49,7 +49,7 @@ typedef struct _D3D11_SIGNATURE_PARAMETER_DESC D3D_REGISTER_COMPONENT_TYPE ComponentType; // Scalar type (e.g. uint, float, etc.) BYTE Mask; // Mask to indicate which components of the register // are used (combination of D3D10_COMPONENT_MASK values) - BYTE ReadWriteMask; // Mask to indicate whether a given component is + BYTE ReadWriteMask; // Mask to indicate whether a given component is // never written (if this is an output signature) or // always read (if this is an input signature). // (combination of D3D_MASK_* values) @@ -102,16 +102,16 @@ typedef struct _D3D11_SHADER_DESC UINT Version; // Shader version LPCSTR Creator; // Creator string UINT Flags; // Shader compilation/parse flags - + UINT ConstantBuffers; // Number of constant buffers UINT BoundResources; // Number of bound resources UINT InputParameters; // Number of parameters in the input signature UINT OutputParameters; // Number of parameters in the output signature UINT InstructionCount; // Number of emitted instructions - UINT TempRegisterCount; // Number of temporary registers used + UINT TempRegisterCount; // Number of temporary registers used UINT TempArrayCount; // Number of temporary arrays used - UINT DefCount; // Number of constant defines + UINT DefCount; // Number of constant defines UINT DclCount; // Number of declarations (input + output) UINT TextureNormalInstructions; // Number of non-categorized texture instructions UINT TextureLoadInstructions; // Number of texture load instructions @@ -148,7 +148,7 @@ typedef struct _D3D11_SHADER_INPUT_BIND_DESC D3D_SHADER_INPUT_TYPE Type; // Type of resource (e.g. texture, cbuffer, etc.) UINT BindPoint; // Starting bind point UINT BindCount; // Number of contiguous bind points (for arrays) - + UINT uFlags; // Input binding flags D3D_RESOURCE_RETURN_TYPE ReturnType; // Return type (if texture) D3D_SRV_DIMENSION Dimension; // Dimension (if texture) @@ -177,14 +177,14 @@ typedef struct _D3D11_FUNCTION_DESC UINT Version; // Shader version LPCSTR Creator; // Creator string UINT Flags; // Shader compilation/parse flags - + UINT ConstantBuffers; // Number of constant buffers UINT BoundResources; // Number of bound resources UINT InstructionCount; // Number of emitted instructions - UINT TempRegisterCount; // Number of temporary registers used + UINT TempRegisterCount; // Number of temporary registers used UINT TempArrayCount; // Number of temporary arrays used - UINT DefCount; // Number of constant defines + UINT DefCount; // Number of constant defines UINT DclCount; // Number of declarations (input + output) UINT TextureNormalInstructions; // Number of non-categorized texture instructions UINT TextureLoadInstructions; // Number of texture load instructions @@ -256,7 +256,7 @@ typedef interface ID3D11FunctionParameterReflection *LPD3D11FUNCTIONPARAMETERREF // {6E6FFA6A-9BAE-4613-A51E-91652D508C21} interface DECLSPEC_UUID("6E6FFA6A-9BAE-4613-A51E-91652D508C21") ID3D11ShaderReflectionType; -DEFINE_GUID(IID_ID3D11ShaderReflectionType, +DEFINE_GUID(IID_ID3D11ShaderReflectionType, 0x6e6ffa6a, 0x9bae, 0x4613, 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21); #undef INTERFACE @@ -265,7 +265,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflectionType, DECLARE_INTERFACE(ID3D11ShaderReflectionType) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D11_SHADER_TYPE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D11ShaderReflectionType*, GetMemberTypeByName)(THIS_ _In_ LPCSTR Name) PURE; STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ _In_ UINT Index) PURE; @@ -281,7 +281,7 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionType) // {51F23923-F3E5-4BD1-91CB-606177D8DB4C} interface DECLSPEC_UUID("51F23923-F3E5-4BD1-91CB-606177D8DB4C") ID3D11ShaderReflectionVariable; -DEFINE_GUID(IID_ID3D11ShaderReflectionVariable, +DEFINE_GUID(IID_ID3D11ShaderReflectionVariable, 0x51f23923, 0xf3e5, 0x4bd1, 0x91, 0xcb, 0x60, 0x61, 0x77, 0xd8, 0xdb, 0x4c); #undef INTERFACE @@ -290,7 +290,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflectionVariable, DECLARE_INTERFACE(ID3D11ShaderReflectionVariable) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D11_SHADER_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionType*, GetType)(THIS) PURE; STDMETHOD_(ID3D11ShaderReflectionConstantBuffer*, GetBuffer)(THIS) PURE; @@ -299,7 +299,7 @@ DECLARE_INTERFACE(ID3D11ShaderReflectionVariable) // {EB62D63D-93DD-4318-8AE8-C6F83AD371B8} interface DECLSPEC_UUID("EB62D63D-93DD-4318-8AE8-C6F83AD371B8") ID3D11ShaderReflectionConstantBuffer; -DEFINE_GUID(IID_ID3D11ShaderReflectionConstantBuffer, +DEFINE_GUID(IID_ID3D11ShaderReflectionConstantBuffer, 0xeb62d63d, 0x93dd, 0x4318, 0x8a, 0xe8, 0xc6, 0xf8, 0x3a, 0xd3, 0x71, 0xb8); #undef INTERFACE @@ -308,7 +308,7 @@ DEFINE_GUID(IID_ID3D11ShaderReflectionConstantBuffer, DECLARE_INTERFACE(ID3D11ShaderReflectionConstantBuffer) { STDMETHOD(GetDesc)(THIS_ D3D11_SHADER_BUFFER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionVariable*, GetVariableByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D11ShaderReflectionVariable*, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE; }; @@ -334,13 +334,13 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D11_SHADER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D11ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex, _Out_ D3D11_SHADER_INPUT_BIND_DESC *pDesc) PURE; - + STDMETHOD(GetInputParameterDesc)(THIS_ _In_ UINT ParameterIndex, _Out_ D3D11_SIGNATURE_PARAMETER_DESC *pDesc) PURE; STDMETHOD(GetOutputParameterDesc)(THIS_ _In_ UINT ParameterIndex, @@ -357,7 +357,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetBitwiseInstructionCount)(THIS) PURE; - + STDMETHOD_(D3D_PRIMITIVE, GetGSInputPrimitive)(THIS) PURE; STDMETHOD_(BOOL, IsSampleFrequencyShader)(THIS) PURE; @@ -374,7 +374,7 @@ DECLARE_INTERFACE_(ID3D11ShaderReflection, IUnknown) // {54384F1B-5B3E-4BB7-AE01-60BA3097CBB6} interface DECLSPEC_UUID("54384F1B-5B3E-4BB7-AE01-60BA3097CBB6") ID3D11LibraryReflection; -DEFINE_GUID(IID_ID3D11LibraryReflection, +DEFINE_GUID(IID_ID3D11LibraryReflection, 0x54384f1b, 0x5b3e, 0x4bb7, 0xae, 0x1, 0x60, 0xba, 0x30, 0x97, 0xcb, 0xb6); #undef INTERFACE @@ -387,13 +387,13 @@ DECLARE_INTERFACE_(ID3D11LibraryReflection, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D11_LIBRARY_DESC * pDesc) PURE; - + STDMETHOD_(ID3D11FunctionReflection *, GetFunctionByIndex)(THIS_ _In_ INT FunctionIndex) PURE; }; // {207BCECB-D683-4A06-A8A3-9B149B9F73A4} interface DECLSPEC_UUID("207BCECB-D683-4A06-A8A3-9B149B9F73A4") ID3D11FunctionReflection; -DEFINE_GUID(IID_ID3D11FunctionReflection, +DEFINE_GUID(IID_ID3D11FunctionReflection, 0x207bcecb, 0xd683, 0x4a06, 0xa8, 0xa3, 0x9b, 0x14, 0x9b, 0x9f, 0x73, 0xa4); #undef INTERFACE @@ -402,13 +402,13 @@ DEFINE_GUID(IID_ID3D11FunctionReflection, DECLARE_INTERFACE(ID3D11FunctionReflection) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D11_FUNCTION_DESC * pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ _In_ UINT BufferIndex) PURE; STDMETHOD_(ID3D11ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex, _Out_ D3D11_SHADER_INPUT_BIND_DESC * pDesc) PURE; - + STDMETHOD_(ID3D11ShaderReflectionVariable *, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE; STDMETHOD(GetResourceBindingDescByName)(THIS_ _In_ LPCSTR Name, @@ -420,7 +420,7 @@ DECLARE_INTERFACE(ID3D11FunctionReflection) // {42757488-334F-47FE-982E-1A65D08CC462} interface DECLSPEC_UUID("42757488-334F-47FE-982E-1A65D08CC462") ID3D11FunctionParameterReflection; -DEFINE_GUID(IID_ID3D11FunctionParameterReflection, +DEFINE_GUID(IID_ID3D11FunctionParameterReflection, 0x42757488, 0x334f, 0x47fe, 0x98, 0x2e, 0x1a, 0x65, 0xd0, 0x8c, 0xc4, 0x62); #undef INTERFACE @@ -433,7 +433,7 @@ DECLARE_INTERFACE(ID3D11FunctionParameterReflection) // {CAC701EE-80FC-4122-8242-10B39C8CEC34} interface DECLSPEC_UUID("CAC701EE-80FC-4122-8242-10B39C8CEC34") ID3D11Module; -DEFINE_GUID(IID_ID3D11Module, +DEFINE_GUID(IID_ID3D11Module, 0xcac701ee, 0x80fc, 0x4122, 0x82, 0x42, 0x10, 0xb3, 0x9c, 0x8c, 0xec, 0x34); #undef INTERFACE @@ -452,7 +452,7 @@ DECLARE_INTERFACE_(ID3D11Module, IUnknown) // {469E07F7-045A-48D5-AA12-68A478CDF75D} interface DECLSPEC_UUID("469E07F7-045A-48D5-AA12-68A478CDF75D") ID3D11ModuleInstance; -DEFINE_GUID(IID_ID3D11ModuleInstance, +DEFINE_GUID(IID_ID3D11ModuleInstance, 0x469e07f7, 0x45a, 0x48d5, 0xaa, 0x12, 0x68, 0xa4, 0x78, 0xcd, 0xf7, 0x5d); #undef INTERFACE @@ -485,7 +485,7 @@ DECLARE_INTERFACE_(ID3D11ModuleInstance, IUnknown) // {59A6CD0E-E10D-4C1F-88C0-63ABA1DAF30E} interface DECLSPEC_UUID("59A6CD0E-E10D-4C1F-88C0-63ABA1DAF30E") ID3D11Linker; -DEFINE_GUID(IID_ID3D11Linker, +DEFINE_GUID(IID_ID3D11Linker, 0x59a6cd0e, 0xe10d, 0x4c1f, 0x88, 0xc0, 0x63, 0xab, 0xa1, 0xda, 0xf3, 0xe); #undef INTERFACE @@ -514,7 +514,7 @@ DECLARE_INTERFACE_(ID3D11Linker, IUnknown) // {D80DD70C-8D2F-4751-94A1-03C79B3556DB} interface DECLSPEC_UUID("D80DD70C-8D2F-4751-94A1-03C79B3556DB") ID3D11LinkingNode; -DEFINE_GUID(IID_ID3D11LinkingNode, +DEFINE_GUID(IID_ID3D11LinkingNode, 0xd80dd70c, 0x8d2f, 0x4751, 0x94, 0xa1, 0x3, 0xc7, 0x9b, 0x35, 0x56, 0xdb); #undef INTERFACE @@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3D11LinkingNode, IUnknown) // {54133220-1CE8-43D3-8236-9855C5CEECFF} interface DECLSPEC_UUID("54133220-1CE8-43D3-8236-9855C5CEECFF") ID3D11FunctionLinkingGraph; -DEFINE_GUID(IID_ID3D11FunctionLinkingGraph, +DEFINE_GUID(IID_ID3D11FunctionLinkingGraph, 0x54133220, 0x1ce8, 0x43d3, 0x82, 0x36, 0x98, 0x55, 0xc5, 0xce, 0xec, 0xff); #undef INTERFACE @@ -542,7 +542,7 @@ DECLARE_INTERFACE_(ID3D11FunctionLinkingGraph, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; // Create a shader module out of FLG description. - STDMETHOD(CreateModuleInstance)(THIS_ _COM_Outptr_ interface ID3D11ModuleInstance ** ppModuleInstance, + STDMETHOD(CreateModuleInstance)(THIS_ _COM_Outptr_ interface ID3D11ModuleInstance ** ppModuleInstance, _Always_(_Outptr_opt_result_maybenull_) ID3DBlob ** ppErrorBuffer) PURE; STDMETHOD(SetInputSignature)(THIS_ __in_ecount(cInputParameters) const D3D11_PARAMETER_DESC * pInputParameters, @@ -587,5 +587,5 @@ extern "C" { #ifdef __cplusplus } #endif //__cplusplus - + #endif //__D3D11SHADER_H__ diff --git a/gfx/include/dxsdk/d3d11shadertracing.h b/gfx/include/dxsdk/d3d11shadertracing.h index 6af0f2107d..a494e69c4d 100644 --- a/gfx/include/dxsdk/d3d11shadertracing.h +++ b/gfx/include/dxsdk/d3d11shadertracing.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D11ShaderTrace_FWD_DEFINED__ #define __ID3D11ShaderTrace_FWD_DEFINED__ @@ -53,12 +53,12 @@ typedef interface ID3D11ShaderTraceFactory ID3D11ShaderTraceFactory; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d11ShaderTracing_0000_0000 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D11_SHADER_TYPE { D3D11_VERTEX_SHADER = 1, @@ -116,7 +116,7 @@ typedef struct D3D11_SHADER_TRACE_DESC { D3D11_SHADER_TYPE Type; UINT Flags; - union + union { D3D11_VERTEX_SHADER_TRACE_DESC VertexShaderTraceDesc; D3D11_HULL_SHADER_TRACE_DESC HullShaderTraceDesc; @@ -127,7 +127,7 @@ typedef struct D3D11_SHADER_TRACE_DESC } ; } D3D11_SHADER_TRACE_DESC; -typedef +typedef enum D3D11_TRACE_GS_INPUT_PRIMITIVE { D3D11_TRACE_GS_INPUT_PRIMITIVE_UNDEFINED = 0, @@ -171,7 +171,7 @@ typedef struct D3D11_TRACE_VALUE D3D11_TRACE_COMPONENT_MASK ValidMask; } D3D11_TRACE_VALUE; -typedef +typedef enum D3D11_TRACE_REGISTER_TYPE { D3D11_TRACE_OUTPUT_NULL_REGISTER = 0, @@ -209,14 +209,14 @@ enum D3D11_TRACE_REGISTER_TYPE D3D11_TRACE_OUTPUT_DEPTH_LESS_EQUAL_REGISTER = ( D3D11_TRACE_OUTPUT_DEPTH_GREATER_EQUAL_REGISTER + 1 ) , D3D11_TRACE_IMMEDIATE64 = ( D3D11_TRACE_OUTPUT_DEPTH_LESS_EQUAL_REGISTER + 1 ) , D3D11_TRACE_INPUT_CYCLE_COUNTER_REGISTER = ( D3D11_TRACE_IMMEDIATE64 + 1 ) , - D3D11_TRACE_INTERFACE_POINTER = ( D3D11_TRACE_INPUT_CYCLE_COUNTER_REGISTER + 1 ) + D3D11_TRACE_INTERFACE_POINTER = ( D3D11_TRACE_INPUT_CYCLE_COUNTER_REGISTER + 1 ) } D3D11_TRACE_REGISTER_TYPE; #define D3D11_TRACE_REGISTER_FLAGS_RELATIVE_INDEXING 0x1 typedef struct D3D11_TRACE_REGISTER { D3D11_TRACE_REGISTER_TYPE RegType; - union + union { UINT16 Index1D; UINT16 Index2D[ 2 ]; @@ -226,12 +226,12 @@ typedef struct D3D11_TRACE_REGISTER } D3D11_TRACE_REGISTER; #define D3D11_TRACE_MISC_GS_EMIT 0x1 -#define D3D11_TRACE_MISC_GS_CUT 0x2 -#define D3D11_TRACE_MISC_PS_DISCARD 0x4 -#define D3D11_TRACE_MISC_GS_EMIT_STREAM 0x8 -#define D3D11_TRACE_MISC_GS_CUT_STREAM 0x10 -#define D3D11_TRACE_MISC_HALT 0x20 -#define D3D11_TRACE_MISC_MESSAGE 0x40 +#define D3D11_TRACE_MISC_GS_CUT 0x2 +#define D3D11_TRACE_MISC_PS_DISCARD 0x4 +#define D3D11_TRACE_MISC_GS_EMIT_STREAM 0x8 +#define D3D11_TRACE_MISC_GS_CUT_STREAM 0x10 +#define D3D11_TRACE_MISC_HALT 0x20 +#define D3D11_TRACE_MISC_MESSAGE 0x40 typedef UINT16 D3D11_TRACE_MISC_OPERATIONS_MASK; typedef struct D3D11_TRACE_STEP @@ -252,137 +252,136 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d11ShaderTracing_0000_0000_v0_0_s_ifspec; #define __ID3D11ShaderTrace_INTERFACE_DEFINED__ /* interface ID3D11ShaderTrace */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ShaderTrace; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("36b013e6-2811-4845-baa7-d623fe0df104") ID3D11ShaderTrace : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE TraceReady( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE TraceReady( + /* [annotation] */ _Out_opt_ UINT64 *pTestCount) = 0; - + virtual void STDMETHODCALLTYPE ResetTrace( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTraceStats( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetTraceStats( + /* [annotation] */ _Out_ D3D11_TRACE_STATS *pTraceStats) = 0; - - virtual HRESULT STDMETHODCALLTYPE PSSelectStamp( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PSSelectStamp( + /* [annotation] */ _In_ UINT stampIndex) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetInitialRegisterContents( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetInitialRegisterContents( + /* [annotation] */ _In_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStep( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetStep( + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_STEP *pTraceStep) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetWrittenRegister( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetWrittenRegister( + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT writtenRegisterIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetReadRegister( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetReadRegister( + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT readRegisterIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ShaderTraceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ShaderTrace * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ShaderTrace * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ShaderTrace * This); - - HRESULT ( STDMETHODCALLTYPE *TraceReady )( + + HRESULT ( STDMETHODCALLTYPE *TraceReady )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _Out_opt_ UINT64 *pTestCount); - - void ( STDMETHODCALLTYPE *ResetTrace )( + + void ( STDMETHODCALLTYPE *ResetTrace )( ID3D11ShaderTrace * This); - - HRESULT ( STDMETHODCALLTYPE *GetTraceStats )( + + HRESULT ( STDMETHODCALLTYPE *GetTraceStats )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_STATS *pTraceStats); - - HRESULT ( STDMETHODCALLTYPE *PSSelectStamp )( + + HRESULT ( STDMETHODCALLTYPE *PSSelectStamp )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT stampIndex); - - HRESULT ( STDMETHODCALLTYPE *GetInitialRegisterContents )( + + HRESULT ( STDMETHODCALLTYPE *GetInitialRegisterContents )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue); - - HRESULT ( STDMETHODCALLTYPE *GetStep )( + + HRESULT ( STDMETHODCALLTYPE *GetStep )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_STEP *pTraceStep); - - HRESULT ( STDMETHODCALLTYPE *GetWrittenRegister )( + + HRESULT ( STDMETHODCALLTYPE *GetWrittenRegister )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT writtenRegisterIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue); - - HRESULT ( STDMETHODCALLTYPE *GetReadRegister )( + + HRESULT ( STDMETHODCALLTYPE *GetReadRegister )( ID3D11ShaderTrace * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT stepIndex, - /* [annotation] */ + /* [annotation] */ _In_ UINT readRegisterIndex, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_REGISTER *pRegister, - /* [annotation] */ + /* [annotation] */ _Out_ D3D11_TRACE_VALUE *pValue); - + END_INTERFACE } ID3D11ShaderTraceVtbl; @@ -391,42 +390,40 @@ EXTERN_C const IID IID_ID3D11ShaderTrace; CONST_VTBL struct ID3D11ShaderTraceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ShaderTrace_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ShaderTrace_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ShaderTrace_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ShaderTrace_TraceReady(This,pTestCount) \ - ( (This)->lpVtbl -> TraceReady(This,pTestCount) ) + ( (This)->lpVtbl -> TraceReady(This,pTestCount) ) #define ID3D11ShaderTrace_ResetTrace(This) \ - ( (This)->lpVtbl -> ResetTrace(This) ) + ( (This)->lpVtbl -> ResetTrace(This) ) #define ID3D11ShaderTrace_GetTraceStats(This,pTraceStats) \ - ( (This)->lpVtbl -> GetTraceStats(This,pTraceStats) ) + ( (This)->lpVtbl -> GetTraceStats(This,pTraceStats) ) #define ID3D11ShaderTrace_PSSelectStamp(This,stampIndex) \ - ( (This)->lpVtbl -> PSSelectStamp(This,stampIndex) ) + ( (This)->lpVtbl -> PSSelectStamp(This,stampIndex) ) #define ID3D11ShaderTrace_GetInitialRegisterContents(This,pRegister,pValue) \ - ( (This)->lpVtbl -> GetInitialRegisterContents(This,pRegister,pValue) ) + ( (This)->lpVtbl -> GetInitialRegisterContents(This,pRegister,pValue) ) #define ID3D11ShaderTrace_GetStep(This,stepIndex,pTraceStep) \ - ( (This)->lpVtbl -> GetStep(This,stepIndex,pTraceStep) ) + ( (This)->lpVtbl -> GetStep(This,stepIndex,pTraceStep) ) #define ID3D11ShaderTrace_GetWrittenRegister(This,stepIndex,writtenRegisterIndex,pRegister,pValue) \ - ( (This)->lpVtbl -> GetWrittenRegister(This,stepIndex,writtenRegisterIndex,pRegister,pValue) ) + ( (This)->lpVtbl -> GetWrittenRegister(This,stepIndex,writtenRegisterIndex,pRegister,pValue) ) #define ID3D11ShaderTrace_GetReadRegister(This,stepIndex,readRegisterIndex,pRegister,pValue) \ - ( (This)->lpVtbl -> GetReadRegister(This,stepIndex,readRegisterIndex,pRegister,pValue) ) + ( (This)->lpVtbl -> GetReadRegister(This,stepIndex,readRegisterIndex,pRegister,pValue) ) #endif /* COBJMACROS */ @@ -438,54 +435,53 @@ EXTERN_C const IID IID_ID3D11ShaderTrace; #define __ID3D11ShaderTraceFactory_INTERFACE_DEFINED__ /* interface ID3D11ShaderTraceFactory */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D11ShaderTraceFactory; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1fbad429-66ab-41cc-9617-667ac10e4459") ID3D11ShaderTraceFactory : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CreateShaderTrace( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE CreateShaderTrace( + /* [annotation] */ _In_ IUnknown *pShader, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_SHADER_TRACE_DESC *pTraceDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ShaderTrace **ppShaderTrace) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D11ShaderTraceFactoryVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D11ShaderTraceFactory * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D11ShaderTraceFactory * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D11ShaderTraceFactory * This); - - HRESULT ( STDMETHODCALLTYPE *CreateShaderTrace )( + + HRESULT ( STDMETHODCALLTYPE *CreateShaderTrace )( ID3D11ShaderTraceFactory * This, - /* [annotation] */ + /* [annotation] */ _In_ IUnknown *pShader, - /* [annotation] */ + /* [annotation] */ _In_ D3D11_SHADER_TRACE_DESC *pTraceDesc, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ ID3D11ShaderTrace **ppShaderTrace); - + END_INTERFACE } ID3D11ShaderTraceFactoryVtbl; @@ -494,21 +490,19 @@ EXTERN_C const IID IID_ID3D11ShaderTraceFactory; CONST_VTBL struct ID3D11ShaderTraceFactoryVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D11ShaderTraceFactory_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D11ShaderTraceFactory_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D11ShaderTraceFactory_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D11ShaderTraceFactory_CreateShaderTrace(This,pShader,pTraceDesc,ppShaderTrace) \ - ( (This)->lpVtbl -> CreateShaderTrace(This,pShader,pTraceDesc,ppShaderTrace) ) + ( (This)->lpVtbl -> CreateShaderTrace(This,pShader,pTraceDesc,ppShaderTrace) ) #endif /* COBJMACROS */ @@ -517,7 +511,7 @@ EXTERN_C const IID IID_ID3D11ShaderTraceFactory; #endif /* __ID3D11ShaderTraceFactory_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d11ShaderTracing_0000_0002 */ -/* [local] */ +/* [local] */ HRESULT WINAPI D3DDisassemble11Trace(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, diff --git a/gfx/include/dxsdk/d3d12.h b/gfx/include/dxsdk/d3d12.h index 59e4b127ae..6fcbcd7f7f 100644 --- a/gfx/include/dxsdk/d3d12.h +++ b/gfx/include/dxsdk/d3d12.h @@ -37,7 +37,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D12Object_FWD_DEFINED__ #define __ID3D12Object_FWD_DEFINED__ @@ -210,10 +210,10 @@ typedef interface ID3D12Tools ID3D12Tools; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d12_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ @@ -979,7 +979,7 @@ extern "C"{ typedef UINT64 D3D12_GPU_VIRTUAL_ADDRESS; -typedef +typedef enum D3D12_COMMAND_LIST_TYPE { D3D12_COMMAND_LIST_TYPE_DIRECT = 0, @@ -990,7 +990,7 @@ enum D3D12_COMMAND_LIST_TYPE D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS = 5 } D3D12_COMMAND_LIST_TYPE; -typedef +typedef enum D3D12_COMMAND_QUEUE_FLAGS { D3D12_COMMAND_QUEUE_FLAG_NONE = 0, @@ -998,7 +998,7 @@ enum D3D12_COMMAND_QUEUE_FLAGS } D3D12_COMMAND_QUEUE_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_COMMAND_QUEUE_FLAGS ); -typedef +typedef enum D3D12_COMMAND_QUEUE_PRIORITY { D3D12_COMMAND_QUEUE_PRIORITY_NORMAL = 0, @@ -1014,7 +1014,7 @@ typedef struct D3D12_COMMAND_QUEUE_DESC UINT NodeMask; } D3D12_COMMAND_QUEUE_DESC; -typedef +typedef enum D3D12_PRIMITIVE_TOPOLOGY_TYPE { D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED = 0, @@ -1024,7 +1024,7 @@ enum D3D12_PRIMITIVE_TOPOLOGY_TYPE D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH = 4 } D3D12_PRIMITIVE_TOPOLOGY_TYPE; -typedef +typedef enum D3D12_INPUT_CLASSIFICATION { D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA = 0, @@ -1042,7 +1042,7 @@ typedef struct D3D12_INPUT_ELEMENT_DESC UINT InstanceDataStepRate; } D3D12_INPUT_ELEMENT_DESC; -typedef +typedef enum D3D12_FILL_MODE { D3D12_FILL_MODE_WIREFRAME = 2, @@ -1053,7 +1053,7 @@ typedef D3D_PRIMITIVE_TOPOLOGY D3D12_PRIMITIVE_TOPOLOGY; typedef D3D_PRIMITIVE D3D12_PRIMITIVE; -typedef +typedef enum D3D12_CULL_MODE { D3D12_CULL_MODE_NONE = 1, @@ -1093,7 +1093,7 @@ typedef struct D3D12_BOX UINT back; } D3D12_BOX; -typedef +typedef enum D3D12_COMPARISON_FUNC { D3D12_COMPARISON_FUNC_NEVER = 1, @@ -1106,14 +1106,14 @@ enum D3D12_COMPARISON_FUNC D3D12_COMPARISON_FUNC_ALWAYS = 8 } D3D12_COMPARISON_FUNC; -typedef +typedef enum D3D12_DEPTH_WRITE_MASK { D3D12_DEPTH_WRITE_MASK_ZERO = 0, D3D12_DEPTH_WRITE_MASK_ALL = 1 } D3D12_DEPTH_WRITE_MASK; -typedef +typedef enum D3D12_STENCIL_OP { D3D12_STENCIL_OP_KEEP = 1, @@ -1159,7 +1159,7 @@ typedef struct D3D12_DEPTH_STENCIL_DESC1 BOOL DepthBoundsTestEnable; } D3D12_DEPTH_STENCIL_DESC1; -typedef +typedef enum D3D12_BLEND { D3D12_BLEND_ZERO = 1, @@ -1181,7 +1181,7 @@ enum D3D12_BLEND D3D12_BLEND_INV_SRC1_ALPHA = 19 } D3D12_BLEND; -typedef +typedef enum D3D12_BLEND_OP { D3D12_BLEND_OP_ADD = 1, @@ -1191,17 +1191,17 @@ enum D3D12_BLEND_OP D3D12_BLEND_OP_MAX = 5 } D3D12_BLEND_OP; -typedef +typedef enum D3D12_COLOR_WRITE_ENABLE { D3D12_COLOR_WRITE_ENABLE_RED = 1, D3D12_COLOR_WRITE_ENABLE_GREEN = 2, D3D12_COLOR_WRITE_ENABLE_BLUE = 4, D3D12_COLOR_WRITE_ENABLE_ALPHA = 8, - D3D12_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D12_COLOR_WRITE_ENABLE_RED | D3D12_COLOR_WRITE_ENABLE_GREEN ) | D3D12_COLOR_WRITE_ENABLE_BLUE ) | D3D12_COLOR_WRITE_ENABLE_ALPHA ) + D3D12_COLOR_WRITE_ENABLE_ALL = ( ( ( D3D12_COLOR_WRITE_ENABLE_RED | D3D12_COLOR_WRITE_ENABLE_GREEN ) | D3D12_COLOR_WRITE_ENABLE_BLUE ) | D3D12_COLOR_WRITE_ENABLE_ALPHA ) } D3D12_COLOR_WRITE_ENABLE; -typedef +typedef enum D3D12_LOGIC_OP { D3D12_LOGIC_OP_CLEAR = 0, @@ -1219,7 +1219,7 @@ enum D3D12_LOGIC_OP D3D12_LOGIC_OP_AND_REVERSE = ( D3D12_LOGIC_OP_EQUIV + 1 ) , D3D12_LOGIC_OP_AND_INVERTED = ( D3D12_LOGIC_OP_AND_REVERSE + 1 ) , D3D12_LOGIC_OP_OR_REVERSE = ( D3D12_LOGIC_OP_AND_INVERTED + 1 ) , - D3D12_LOGIC_OP_OR_INVERTED = ( D3D12_LOGIC_OP_OR_REVERSE + 1 ) + D3D12_LOGIC_OP_OR_INVERTED = ( D3D12_LOGIC_OP_OR_REVERSE + 1 ) } D3D12_LOGIC_OP; typedef struct D3D12_RENDER_TARGET_BLEND_DESC @@ -1243,9 +1243,9 @@ typedef struct D3D12_BLEND_DESC D3D12_RENDER_TARGET_BLEND_DESC RenderTarget[ 8 ]; } D3D12_BLEND_DESC; -/* Note, the array size for RenderTarget[] above is D3D12_SIMULTANEOUS_RENDERTARGET_COUNT. +/* Note, the array size for RenderTarget[] above is D3D12_SIMULTANEOUS_RENDERTARGET_COUNT. IDL processing/generation of this header replaces the define; this comment is merely explaining what happened. */ -typedef +typedef enum D3D12_CONSERVATIVE_RASTERIZATION_MODE { D3D12_CONSERVATIVE_RASTERIZATION_MODE_OFF = 0, @@ -1274,74 +1274,73 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0000_v0_0_s_ifspec; #define __ID3D12Object_INTERFACE_DEFINED__ /* interface ID3D12Object */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Object; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c4fec28f-7966-4e95-9f94-f431cb56c3b8") ID3D12Object : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( _In_ REFGUID guid, _In_opt_ const IUnknown *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetName( + + virtual HRESULT STDMETHODCALLTYPE SetName( _In_z_ LPCWSTR Name) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12ObjectVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Object * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Object * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Object * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Object * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Object * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Object * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Object * This, _In_z_ LPCWSTR Name); - + END_INTERFACE } ID3D12ObjectVtbl; @@ -1350,30 +1349,28 @@ EXTERN_C const IID IID_ID3D12Object; CONST_VTBL struct ID3D12ObjectVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Object_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Object_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Object_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Object_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Object_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Object_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Object_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #endif /* COBJMACROS */ @@ -1385,66 +1382,65 @@ EXTERN_C const IID IID_ID3D12Object; #define __ID3D12DeviceChild_INTERFACE_DEFINED__ /* interface ID3D12DeviceChild */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DeviceChild; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("905db94b-a00c-4140-9df5-2b64ca9ea357") ID3D12DeviceChild : public ID3D12Object { public: - virtual HRESULT STDMETHODCALLTYPE GetDevice( + virtual HRESULT STDMETHODCALLTYPE GetDevice( REFIID riid, _COM_Outptr_opt_ void **ppvDevice) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DeviceChildVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DeviceChild * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DeviceChild * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DeviceChild * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12DeviceChild * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12DeviceChild * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12DeviceChild * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12DeviceChild * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12DeviceChild * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - + END_INTERFACE } ID3D12DeviceChildVtbl; @@ -1453,33 +1449,31 @@ EXTERN_C const IID IID_ID3D12DeviceChild; CONST_VTBL struct ID3D12DeviceChildVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DeviceChild_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DeviceChild_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DeviceChild_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DeviceChild_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12DeviceChild_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12DeviceChild_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12DeviceChild_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12DeviceChild_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #endif /* COBJMACROS */ @@ -1491,62 +1485,61 @@ EXTERN_C const IID IID_ID3D12DeviceChild; #define __ID3D12RootSignature_INTERFACE_DEFINED__ /* interface ID3D12RootSignature */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12RootSignature; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c54a6b66-72df-4ee8-8be5-a946a1429214") ID3D12RootSignature : public ID3D12DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D12RootSignatureVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12RootSignature * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12RootSignature * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12RootSignature * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12RootSignature * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12RootSignature * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12RootSignature * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12RootSignature * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12RootSignature * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - + END_INTERFACE } ID3D12RootSignatureVtbl; @@ -1555,33 +1548,31 @@ EXTERN_C const IID IID_ID3D12RootSignature; CONST_VTBL struct ID3D12RootSignatureVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12RootSignature_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12RootSignature_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12RootSignature_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12RootSignature_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12RootSignature_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12RootSignature_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12RootSignature_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12RootSignature_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #endif /* COBJMACROS */ @@ -1590,7 +1581,7 @@ EXTERN_C const IID IID_ID3D12RootSignature; #endif /* __ID3D12RootSignature_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct D3D12_SHADER_BYTECODE { @@ -1613,7 +1604,7 @@ typedef struct D3D12_INPUT_LAYOUT_DESC UINT NumElements; } D3D12_INPUT_LAYOUT_DESC; -typedef +typedef enum D3D12_INDEX_BUFFER_STRIP_CUT_VALUE { D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED = 0, @@ -1627,7 +1618,7 @@ typedef struct D3D12_CACHED_PIPELINE_STATE SIZE_T CachedBlobSizeInBytes; } D3D12_CACHED_PIPELINE_STATE; -typedef +typedef enum D3D12_PIPELINE_STATE_FLAGS { D3D12_PIPELINE_STATE_FLAG_NONE = 0, @@ -1680,7 +1671,7 @@ typedef struct D3D12_PIPELINE_STATE_STREAM_DESC _In_reads_(_Inexpressible_("Dependent on size of subobjects")) void *pPipelineStateSubobjectStream; } D3D12_PIPELINE_STATE_STREAM_DESC; -typedef +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE { D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE = 0, @@ -1706,10 +1697,10 @@ enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS = ( D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO + 1 ) , D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1 = ( D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS + 1 ) , D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING = ( D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1 + 1 ) , - D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID = ( D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING + 1 ) + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID = ( D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING + 1 ) } D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; -typedef +typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, @@ -1730,7 +1721,7 @@ enum D3D12_FEATURE D3D12_FEATURE_EXISTING_HEAPS = 22 } D3D12_FEATURE; -typedef +typedef enum D3D12_SHADER_MIN_PRECISION_SUPPORT { D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0, @@ -1739,7 +1730,7 @@ enum D3D12_SHADER_MIN_PRECISION_SUPPORT } D3D12_SHADER_MIN_PRECISION_SUPPORT; DEFINE_ENUM_FLAG_OPERATORS( D3D12_SHADER_MIN_PRECISION_SUPPORT ); -typedef +typedef enum D3D12_TILED_RESOURCES_TIER { D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED = 0, @@ -1748,7 +1739,7 @@ enum D3D12_TILED_RESOURCES_TIER D3D12_TILED_RESOURCES_TIER_3 = 3 } D3D12_TILED_RESOURCES_TIER; -typedef +typedef enum D3D12_RESOURCE_BINDING_TIER { D3D12_RESOURCE_BINDING_TIER_1 = 1, @@ -1756,7 +1747,7 @@ enum D3D12_RESOURCE_BINDING_TIER D3D12_RESOURCE_BINDING_TIER_3 = 3 } D3D12_RESOURCE_BINDING_TIER; -typedef +typedef enum D3D12_CONSERVATIVE_RASTERIZATION_TIER { D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED = 0, @@ -1765,7 +1756,7 @@ enum D3D12_CONSERVATIVE_RASTERIZATION_TIER D3D12_CONSERVATIVE_RASTERIZATION_TIER_3 = 3 } D3D12_CONSERVATIVE_RASTERIZATION_TIER; -typedef +typedef enum D3D12_FORMAT_SUPPORT1 { D3D12_FORMAT_SUPPORT1_NONE = 0, @@ -1801,7 +1792,7 @@ enum D3D12_FORMAT_SUPPORT1 } D3D12_FORMAT_SUPPORT1; DEFINE_ENUM_FLAG_OPERATORS( D3D12_FORMAT_SUPPORT1 ); -typedef +typedef enum D3D12_FORMAT_SUPPORT2 { D3D12_FORMAT_SUPPORT2_NONE = 0, @@ -1819,7 +1810,7 @@ enum D3D12_FORMAT_SUPPORT2 } D3D12_FORMAT_SUPPORT2; DEFINE_ENUM_FLAG_OPERATORS( D3D12_FORMAT_SUPPORT2 ); -typedef +typedef enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS { D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0, @@ -1827,7 +1818,7 @@ enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS } D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS ); -typedef +typedef enum D3D12_CROSS_NODE_SHARING_TIER { D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED = 0, @@ -1836,14 +1827,14 @@ enum D3D12_CROSS_NODE_SHARING_TIER D3D12_CROSS_NODE_SHARING_TIER_2 = 3 } D3D12_CROSS_NODE_SHARING_TIER; -typedef +typedef enum D3D12_RESOURCE_HEAP_TIER { D3D12_RESOURCE_HEAP_TIER_1 = 1, D3D12_RESOURCE_HEAP_TIER_2 = 2 } D3D12_RESOURCE_HEAP_TIER; -typedef +typedef enum D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER { D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_NOT_SUPPORTED = 0, @@ -1851,7 +1842,7 @@ enum D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER_2 = 2 } D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER; -typedef +typedef enum D3D12_VIEW_INSTANCING_TIER { D3D12_VIEW_INSTANCING_TIER_NOT_SUPPORTED = 0, @@ -1895,7 +1886,7 @@ typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS2 _Out_ D3D12_PROGRAMMABLE_SAMPLE_POSITIONS_TIER ProgrammableSamplePositionsTier; } D3D12_FEATURE_DATA_D3D12_OPTIONS2; -typedef +typedef enum D3D_ROOT_SIGNATURE_VERSION { D3D_ROOT_SIGNATURE_VERSION_1 = 0x1, @@ -1932,7 +1923,7 @@ typedef struct D3D12_FEATURE_DATA_FEATURE_LEVELS _Out_ D3D_FEATURE_LEVEL MaxSupportedFeatureLevel; } D3D12_FEATURE_DATA_FEATURE_LEVELS; -typedef +typedef enum D3D_SHADER_MODEL { D3D_SHADER_MODEL_5_1 = 0x51, @@ -1972,7 +1963,7 @@ typedef struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT UINT MaxGPUVirtualAddressBitsPerProcess; } D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT; -typedef +typedef enum D3D12_SHADER_CACHE_SUPPORT_FLAGS { D3D12_SHADER_CACHE_SUPPORT_NONE = 0, @@ -1995,7 +1986,7 @@ typedef struct D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY _Out_ BOOL PriorityForTypeIsSupported; } D3D12_FEATURE_DATA_COMMAND_QUEUE_PRIORITY; -typedef +typedef enum D3D12_COMMAND_LIST_SUPPORT_FLAGS { D3D12_COMMAND_LIST_SUPPORT_FLAG_NONE = 0, @@ -2004,7 +1995,7 @@ enum D3D12_COMMAND_LIST_SUPPORT_FLAGS D3D12_COMMAND_LIST_SUPPORT_FLAG_COMPUTE = ( 1 << D3D12_COMMAND_LIST_TYPE_COMPUTE ) , D3D12_COMMAND_LIST_SUPPORT_FLAG_COPY = ( 1 << D3D12_COMMAND_LIST_TYPE_COPY ) , D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_DECODE = ( 1 << D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE ) , - D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = ( 1 << D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS ) + D3D12_COMMAND_LIST_SUPPORT_FLAG_VIDEO_PROCESS = ( 1 << D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS ) } D3D12_COMMAND_LIST_SUPPORT_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_COMMAND_LIST_SUPPORT_FLAGS ); @@ -2028,7 +2019,7 @@ typedef struct D3D12_RESOURCE_ALLOCATION_INFO UINT64 Alignment; } D3D12_RESOURCE_ALLOCATION_INFO; -typedef +typedef enum D3D12_HEAP_TYPE { D3D12_HEAP_TYPE_DEFAULT = 1, @@ -2037,7 +2028,7 @@ enum D3D12_HEAP_TYPE D3D12_HEAP_TYPE_CUSTOM = 4 } D3D12_HEAP_TYPE; -typedef +typedef enum D3D12_CPU_PAGE_PROPERTY { D3D12_CPU_PAGE_PROPERTY_UNKNOWN = 0, @@ -2046,7 +2037,7 @@ enum D3D12_CPU_PAGE_PROPERTY D3D12_CPU_PAGE_PROPERTY_WRITE_BACK = 3 } D3D12_CPU_PAGE_PROPERTY; -typedef +typedef enum D3D12_MEMORY_POOL { D3D12_MEMORY_POOL_UNKNOWN = 0, @@ -2063,7 +2054,7 @@ typedef struct D3D12_HEAP_PROPERTIES UINT VisibleNodeMask; } D3D12_HEAP_PROPERTIES; -typedef +typedef enum D3D12_HEAP_FLAGS { D3D12_HEAP_FLAG_NONE = 0, @@ -2090,7 +2081,7 @@ typedef struct D3D12_HEAP_DESC D3D12_HEAP_FLAGS Flags; } D3D12_HEAP_DESC; -typedef +typedef enum D3D12_RESOURCE_DIMENSION { D3D12_RESOURCE_DIMENSION_UNKNOWN = 0, @@ -2100,7 +2091,7 @@ enum D3D12_RESOURCE_DIMENSION D3D12_RESOURCE_DIMENSION_TEXTURE3D = 4 } D3D12_RESOURCE_DIMENSION; -typedef +typedef enum D3D12_TEXTURE_LAYOUT { D3D12_TEXTURE_LAYOUT_UNKNOWN = 0, @@ -2109,7 +2100,7 @@ enum D3D12_TEXTURE_LAYOUT D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE = 3 } D3D12_TEXTURE_LAYOUT; -typedef +typedef enum D3D12_RESOURCE_FLAGS { D3D12_RESOURCE_FLAG_NONE = 0, @@ -2146,7 +2137,7 @@ typedef struct D3D12_DEPTH_STENCIL_VALUE typedef struct D3D12_CLEAR_VALUE { DXGI_FORMAT Format; - union + union { FLOAT Color[ 4 ]; D3D12_DEPTH_STENCIL_VALUE DepthStencil; @@ -2195,7 +2186,7 @@ typedef struct D3D12_TILE_REGION_SIZE UINT16 Depth; } D3D12_TILE_REGION_SIZE; -typedef +typedef enum D3D12_TILE_RANGE_FLAGS { D3D12_TILE_RANGE_FLAG_NONE = 0, @@ -2227,7 +2218,7 @@ typedef struct D3D12_PACKED_MIP_INFO UINT StartTileIndexInOverallResource; } D3D12_PACKED_MIP_INFO; -typedef +typedef enum D3D12_TILE_MAPPING_FLAGS { D3D12_TILE_MAPPING_FLAG_NONE = 0, @@ -2235,7 +2226,7 @@ enum D3D12_TILE_MAPPING_FLAGS } D3D12_TILE_MAPPING_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_TILE_MAPPING_FLAGS ); -typedef +typedef enum D3D12_TILE_COPY_FLAGS { D3D12_TILE_COPY_FLAG_NONE = 0, @@ -2245,7 +2236,7 @@ enum D3D12_TILE_COPY_FLAGS } D3D12_TILE_COPY_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_TILE_COPY_FLAGS ); -typedef +typedef enum D3D12_RESOURCE_STATES { D3D12_RESOURCE_STATE_COMMON = 0, @@ -2273,12 +2264,12 @@ enum D3D12_RESOURCE_STATES } D3D12_RESOURCE_STATES; DEFINE_ENUM_FLAG_OPERATORS( D3D12_RESOURCE_STATES ); -typedef +typedef enum D3D12_RESOURCE_BARRIER_TYPE { D3D12_RESOURCE_BARRIER_TYPE_TRANSITION = 0, D3D12_RESOURCE_BARRIER_TYPE_ALIASING = ( D3D12_RESOURCE_BARRIER_TYPE_TRANSITION + 1 ) , - D3D12_RESOURCE_BARRIER_TYPE_UAV = ( D3D12_RESOURCE_BARRIER_TYPE_ALIASING + 1 ) + D3D12_RESOURCE_BARRIER_TYPE_UAV = ( D3D12_RESOURCE_BARRIER_TYPE_ALIASING + 1 ) } D3D12_RESOURCE_BARRIER_TYPE; typedef struct D3D12_RESOURCE_TRANSITION_BARRIER @@ -2300,7 +2291,7 @@ typedef struct D3D12_RESOURCE_UAV_BARRIER ID3D12Resource *pResource; } D3D12_RESOURCE_UAV_BARRIER; -typedef +typedef enum D3D12_RESOURCE_BARRIER_FLAGS { D3D12_RESOURCE_BARRIER_FLAG_NONE = 0, @@ -2313,7 +2304,7 @@ typedef struct D3D12_RESOURCE_BARRIER { D3D12_RESOURCE_BARRIER_TYPE Type; D3D12_RESOURCE_BARRIER_FLAGS Flags; - union + union { D3D12_RESOURCE_TRANSITION_BARRIER Transition; D3D12_RESOURCE_ALIASING_BARRIER Aliasing; @@ -2336,7 +2327,7 @@ typedef struct D3D12_PLACED_SUBRESOURCE_FOOTPRINT D3D12_SUBRESOURCE_FOOTPRINT Footprint; } D3D12_PLACED_SUBRESOURCE_FOOTPRINT; -typedef +typedef enum D3D12_TEXTURE_COPY_TYPE { D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX = 0, @@ -2347,14 +2338,14 @@ typedef struct D3D12_TEXTURE_COPY_LOCATION { ID3D12Resource *pResource; D3D12_TEXTURE_COPY_TYPE Type; - union + union { D3D12_PLACED_SUBRESOURCE_FOOTPRINT PlacedFootprint; UINT SubresourceIndex; } ; } D3D12_TEXTURE_COPY_LOCATION; -typedef +typedef enum D3D12_RESOLVE_MODE { D3D12_RESOLVE_MODE_DECOMPRESS = 0, @@ -2375,7 +2366,7 @@ typedef struct D3D12_VIEW_INSTANCE_LOCATION UINT RenderTargetArrayIndex; } D3D12_VIEW_INSTANCE_LOCATION; -typedef +typedef enum D3D12_VIEW_INSTANCING_FLAGS { D3D12_VIEW_INSTANCING_FLAG_NONE = 0, @@ -2390,7 +2381,7 @@ typedef struct D3D12_VIEW_INSTANCING_DESC D3D12_VIEW_INSTANCING_FLAGS Flags; } D3D12_VIEW_INSTANCING_DESC; -typedef +typedef enum D3D12_SHADER_COMPONENT_MAPPING { D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0 = 0, @@ -2401,17 +2392,17 @@ enum D3D12_SHADER_COMPONENT_MAPPING D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1 = 5 } D3D12_SHADER_COMPONENT_MAPPING; -#define D3D12_SHADER_COMPONENT_MAPPING_MASK 0x7 -#define D3D12_SHADER_COMPONENT_MAPPING_SHIFT 3 -#define D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES (1<<(D3D12_SHADER_COMPONENT_MAPPING_SHIFT*4)) +#define D3D12_SHADER_COMPONENT_MAPPING_MASK 0x7 +#define D3D12_SHADER_COMPONENT_MAPPING_SHIFT 3 +#define D3D12_SHADER_COMPONENT_MAPPING_ALWAYS_SET_BIT_AVOIDING_ZEROMEM_MISTAKES (1<<(D3D12_SHADER_COMPONENT_MAPPING_SHIFT*4)) #define D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(Src0,Src1,Src2,Src3) ((((Src0)&D3D12_SHADER_COMPONENT_MAPPING_MASK)| \ (((Src1)&D3D12_SHADER_COMPONENT_MAPPING_MASK)<> (D3D12_SHADER_COMPONENT_MAPPING_SHIFT*ComponentToExtract) & D3D12_SHADER_COMPONENT_MAPPING_MASK)) -#define D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(0,1,2,3) -typedef +#define D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(0,1,2,3) +typedef enum D3D12_BUFFER_SRV_FLAGS { D3D12_BUFFER_SRV_FLAG_NONE = 0, @@ -2495,7 +2486,7 @@ typedef struct D3D12_TEX2DMS_ARRAY_SRV UINT ArraySize; } D3D12_TEX2DMS_ARRAY_SRV; -typedef +typedef enum D3D12_SRV_DIMENSION { D3D12_SRV_DIMENSION_UNKNOWN = 0, @@ -2516,7 +2507,7 @@ typedef struct D3D12_SHADER_RESOURCE_VIEW_DESC DXGI_FORMAT Format; D3D12_SRV_DIMENSION ViewDimension; UINT Shader4ComponentMapping; - union + union { D3D12_BUFFER_SRV Buffer; D3D12_TEX1D_SRV Texture1D; @@ -2537,7 +2528,7 @@ typedef struct D3D12_CONSTANT_BUFFER_VIEW_DESC UINT SizeInBytes; } D3D12_CONSTANT_BUFFER_VIEW_DESC; -typedef +typedef enum D3D12_FILTER { D3D12_FILTER_MIN_MAG_MIP_POINT = 0, @@ -2578,14 +2569,14 @@ enum D3D12_FILTER D3D12_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5 } D3D12_FILTER; -typedef +typedef enum D3D12_FILTER_TYPE { D3D12_FILTER_TYPE_POINT = 0, D3D12_FILTER_TYPE_LINEAR = 1 } D3D12_FILTER_TYPE; -typedef +typedef enum D3D12_FILTER_REDUCTION_TYPE { D3D12_FILTER_REDUCTION_TYPE_STANDARD = 0, @@ -2613,34 +2604,34 @@ enum D3D12_FILTER_REDUCTION_TYPE ( ( ( min ) & D3D12_FILTER_TYPE_MASK ) << D3D12_MIN_FILTER_SHIFT ) | \ ( ( ( mag ) & D3D12_FILTER_TYPE_MASK ) << D3D12_MAG_FILTER_SHIFT ) | \ ( ( ( mip ) & D3D12_FILTER_TYPE_MASK ) << D3D12_MIP_FILTER_SHIFT ) | \ - ( ( ( reduction ) & D3D12_FILTER_REDUCTION_TYPE_MASK ) << D3D12_FILTER_REDUCTION_TYPE_SHIFT ) ) ) + ( ( ( reduction ) & D3D12_FILTER_REDUCTION_TYPE_MASK ) << D3D12_FILTER_REDUCTION_TYPE_SHIFT ) ) ) #define D3D12_ENCODE_ANISOTROPIC_FILTER( reduction ) \ ( ( D3D12_FILTER ) ( \ D3D12_ANISOTROPIC_FILTERING_BIT | \ D3D12_ENCODE_BASIC_FILTER( D3D12_FILTER_TYPE_LINEAR, \ D3D12_FILTER_TYPE_LINEAR, \ D3D12_FILTER_TYPE_LINEAR, \ - reduction ) ) ) + reduction ) ) ) #define D3D12_DECODE_MIN_FILTER( D3D12Filter ) \ ( ( D3D12_FILTER_TYPE ) \ - ( ( ( D3D12Filter ) >> D3D12_MIN_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) + ( ( ( D3D12Filter ) >> D3D12_MIN_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) #define D3D12_DECODE_MAG_FILTER( D3D12Filter ) \ ( ( D3D12_FILTER_TYPE ) \ - ( ( ( D3D12Filter ) >> D3D12_MAG_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) + ( ( ( D3D12Filter ) >> D3D12_MAG_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) #define D3D12_DECODE_MIP_FILTER( D3D12Filter ) \ ( ( D3D12_FILTER_TYPE ) \ - ( ( ( D3D12Filter ) >> D3D12_MIP_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) + ( ( ( D3D12Filter ) >> D3D12_MIP_FILTER_SHIFT ) & D3D12_FILTER_TYPE_MASK ) ) #define D3D12_DECODE_FILTER_REDUCTION( D3D12Filter ) \ ( ( D3D12_FILTER_REDUCTION_TYPE ) \ - ( ( ( D3D12Filter ) >> D3D12_FILTER_REDUCTION_TYPE_SHIFT ) & D3D12_FILTER_REDUCTION_TYPE_MASK ) ) + ( ( ( D3D12Filter ) >> D3D12_FILTER_REDUCTION_TYPE_SHIFT ) & D3D12_FILTER_REDUCTION_TYPE_MASK ) ) #define D3D12_DECODE_IS_COMPARISON_FILTER( D3D12Filter ) \ - ( D3D12_DECODE_FILTER_REDUCTION( D3D12Filter ) == D3D12_FILTER_REDUCTION_TYPE_COMPARISON ) + ( D3D12_DECODE_FILTER_REDUCTION( D3D12Filter ) == D3D12_FILTER_REDUCTION_TYPE_COMPARISON ) #define D3D12_DECODE_IS_ANISOTROPIC_FILTER( D3D12Filter ) \ ( ( ( D3D12Filter ) & D3D12_ANISOTROPIC_FILTERING_BIT ) && \ ( D3D12_FILTER_TYPE_LINEAR == D3D12_DECODE_MIN_FILTER( D3D12Filter ) ) && \ ( D3D12_FILTER_TYPE_LINEAR == D3D12_DECODE_MAG_FILTER( D3D12Filter ) ) && \ - ( D3D12_FILTER_TYPE_LINEAR == D3D12_DECODE_MIP_FILTER( D3D12Filter ) ) ) -typedef + ( D3D12_FILTER_TYPE_LINEAR == D3D12_DECODE_MIP_FILTER( D3D12Filter ) ) ) +typedef enum D3D12_TEXTURE_ADDRESS_MODE { D3D12_TEXTURE_ADDRESS_MODE_WRAP = 1, @@ -2664,7 +2655,7 @@ typedef struct D3D12_SAMPLER_DESC FLOAT MaxLOD; } D3D12_SAMPLER_DESC; -typedef +typedef enum D3D12_BUFFER_UAV_FLAGS { D3D12_BUFFER_UAV_FLAG_NONE = 0, @@ -2714,7 +2705,7 @@ typedef struct D3D12_TEX3D_UAV UINT WSize; } D3D12_TEX3D_UAV; -typedef +typedef enum D3D12_UAV_DIMENSION { D3D12_UAV_DIMENSION_UNKNOWN = 0, @@ -2730,7 +2721,7 @@ typedef struct D3D12_UNORDERED_ACCESS_VIEW_DESC { DXGI_FORMAT Format; D3D12_UAV_DIMENSION ViewDimension; - union + union { D3D12_BUFFER_UAV Buffer; D3D12_TEX1D_UAV Texture1D; @@ -2791,7 +2782,7 @@ typedef struct D3D12_TEX3D_RTV UINT WSize; } D3D12_TEX3D_RTV; -typedef +typedef enum D3D12_RTV_DIMENSION { D3D12_RTV_DIMENSION_UNKNOWN = 0, @@ -2809,7 +2800,7 @@ typedef struct D3D12_RENDER_TARGET_VIEW_DESC { DXGI_FORMAT Format; D3D12_RTV_DIMENSION ViewDimension; - union + union { D3D12_BUFFER_RTV Buffer; D3D12_TEX1D_RTV Texture1D; @@ -2857,7 +2848,7 @@ typedef struct D3D12_TEX2DMS_ARRAY_DSV UINT ArraySize; } D3D12_TEX2DMS_ARRAY_DSV; -typedef +typedef enum D3D12_DSV_FLAGS { D3D12_DSV_FLAG_NONE = 0, @@ -2866,7 +2857,7 @@ enum D3D12_DSV_FLAGS } D3D12_DSV_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_DSV_FLAGS ); -typedef +typedef enum D3D12_DSV_DIMENSION { D3D12_DSV_DIMENSION_UNKNOWN = 0, @@ -2883,7 +2874,7 @@ typedef struct D3D12_DEPTH_STENCIL_VIEW_DESC DXGI_FORMAT Format; D3D12_DSV_DIMENSION ViewDimension; D3D12_DSV_FLAGS Flags; - union + union { D3D12_TEX1D_DSV Texture1D; D3D12_TEX1D_ARRAY_DSV Texture1DArray; @@ -2894,7 +2885,7 @@ typedef struct D3D12_DEPTH_STENCIL_VIEW_DESC } ; } D3D12_DEPTH_STENCIL_VIEW_DESC; -typedef +typedef enum D3D12_CLEAR_FLAGS { D3D12_CLEAR_FLAG_DEPTH = 0x1, @@ -2902,7 +2893,7 @@ enum D3D12_CLEAR_FLAGS } D3D12_CLEAR_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_CLEAR_FLAGS ); -typedef +typedef enum D3D12_FENCE_FLAGS { D3D12_FENCE_FLAG_NONE = 0, @@ -2912,17 +2903,17 @@ enum D3D12_FENCE_FLAGS } D3D12_FENCE_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_FENCE_FLAGS ); -typedef +typedef enum D3D12_DESCRIPTOR_HEAP_TYPE { D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV = 0, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER = ( D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV + 1 ) , D3D12_DESCRIPTOR_HEAP_TYPE_RTV = ( D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER + 1 ) , D3D12_DESCRIPTOR_HEAP_TYPE_DSV = ( D3D12_DESCRIPTOR_HEAP_TYPE_RTV + 1 ) , - D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES = ( D3D12_DESCRIPTOR_HEAP_TYPE_DSV + 1 ) + D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES = ( D3D12_DESCRIPTOR_HEAP_TYPE_DSV + 1 ) } D3D12_DESCRIPTOR_HEAP_TYPE; -typedef +typedef enum D3D12_DESCRIPTOR_HEAP_FLAGS { D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0, @@ -2938,13 +2929,13 @@ typedef struct D3D12_DESCRIPTOR_HEAP_DESC UINT NodeMask; } D3D12_DESCRIPTOR_HEAP_DESC; -typedef +typedef enum D3D12_DESCRIPTOR_RANGE_TYPE { D3D12_DESCRIPTOR_RANGE_TYPE_SRV = 0, D3D12_DESCRIPTOR_RANGE_TYPE_UAV = ( D3D12_DESCRIPTOR_RANGE_TYPE_SRV + 1 ) , D3D12_DESCRIPTOR_RANGE_TYPE_CBV = ( D3D12_DESCRIPTOR_RANGE_TYPE_UAV + 1 ) , - D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER = ( D3D12_DESCRIPTOR_RANGE_TYPE_CBV + 1 ) + D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER = ( D3D12_DESCRIPTOR_RANGE_TYPE_CBV + 1 ) } D3D12_DESCRIPTOR_RANGE_TYPE; typedef struct D3D12_DESCRIPTOR_RANGE @@ -2975,7 +2966,7 @@ typedef struct D3D12_ROOT_DESCRIPTOR UINT RegisterSpace; } D3D12_ROOT_DESCRIPTOR; -typedef +typedef enum D3D12_SHADER_VISIBILITY { D3D12_SHADER_VISIBILITY_ALL = 0, @@ -2986,20 +2977,20 @@ enum D3D12_SHADER_VISIBILITY D3D12_SHADER_VISIBILITY_PIXEL = 5 } D3D12_SHADER_VISIBILITY; -typedef +typedef enum D3D12_ROOT_PARAMETER_TYPE { D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0, D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = ( D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE + 1 ) , D3D12_ROOT_PARAMETER_TYPE_CBV = ( D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS + 1 ) , D3D12_ROOT_PARAMETER_TYPE_SRV = ( D3D12_ROOT_PARAMETER_TYPE_CBV + 1 ) , - D3D12_ROOT_PARAMETER_TYPE_UAV = ( D3D12_ROOT_PARAMETER_TYPE_SRV + 1 ) + D3D12_ROOT_PARAMETER_TYPE_UAV = ( D3D12_ROOT_PARAMETER_TYPE_SRV + 1 ) } D3D12_ROOT_PARAMETER_TYPE; typedef struct D3D12_ROOT_PARAMETER { D3D12_ROOT_PARAMETER_TYPE ParameterType; - union + union { D3D12_ROOT_DESCRIPTOR_TABLE DescriptorTable; D3D12_ROOT_CONSTANTS Constants; @@ -3008,7 +2999,7 @@ typedef struct D3D12_ROOT_PARAMETER D3D12_SHADER_VISIBILITY ShaderVisibility; } D3D12_ROOT_PARAMETER; -typedef +typedef enum D3D12_ROOT_SIGNATURE_FLAGS { D3D12_ROOT_SIGNATURE_FLAG_NONE = 0, @@ -3022,12 +3013,12 @@ enum D3D12_ROOT_SIGNATURE_FLAGS } D3D12_ROOT_SIGNATURE_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_ROOT_SIGNATURE_FLAGS ); -typedef +typedef enum D3D12_STATIC_BORDER_COLOR { D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0, D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK = ( D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK + 1 ) , - D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE = ( D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK + 1 ) + D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE = ( D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK + 1 ) } D3D12_STATIC_BORDER_COLOR; typedef struct D3D12_STATIC_SAMPLER_DESC @@ -3056,7 +3047,7 @@ typedef struct D3D12_ROOT_SIGNATURE_DESC D3D12_ROOT_SIGNATURE_FLAGS Flags; } D3D12_ROOT_SIGNATURE_DESC; -typedef +typedef enum D3D12_DESCRIPTOR_RANGE_FLAGS { D3D12_DESCRIPTOR_RANGE_FLAG_NONE = 0, @@ -3083,7 +3074,7 @@ typedef struct D3D12_ROOT_DESCRIPTOR_TABLE1 _Field_size_full_(NumDescriptorRanges) const D3D12_DESCRIPTOR_RANGE1 *pDescriptorRanges; } D3D12_ROOT_DESCRIPTOR_TABLE1; -typedef +typedef enum D3D12_ROOT_DESCRIPTOR_FLAGS { D3D12_ROOT_DESCRIPTOR_FLAG_NONE = 0, @@ -3103,7 +3094,7 @@ typedef struct D3D12_ROOT_DESCRIPTOR1 typedef struct D3D12_ROOT_PARAMETER1 { D3D12_ROOT_PARAMETER_TYPE ParameterType; - union + union { D3D12_ROOT_DESCRIPTOR_TABLE1 DescriptorTable; D3D12_ROOT_CONSTANTS Constants; @@ -3124,7 +3115,7 @@ typedef struct D3D12_ROOT_SIGNATURE_DESC1 typedef struct D3D12_VERSIONED_ROOT_SIGNATURE_DESC { D3D_ROOT_SIGNATURE_VERSION Version; - union + union { D3D12_ROOT_SIGNATURE_DESC Desc_1_0; D3D12_ROOT_SIGNATURE_DESC1 Desc_1_1; @@ -3138,41 +3129,40 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0001_v0_0_s_ifspec; #define __ID3D12RootSignatureDeserializer_INTERFACE_DEFINED__ /* interface ID3D12RootSignatureDeserializer */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12RootSignatureDeserializer; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("34AB647B-3CC8-46AC-841B-C0965645C046") ID3D12RootSignatureDeserializer : public IUnknown { public: virtual const D3D12_ROOT_SIGNATURE_DESC *STDMETHODCALLTYPE GetRootSignatureDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12RootSignatureDeserializerVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12RootSignatureDeserializer * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12RootSignatureDeserializer * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12RootSignatureDeserializer * This); - - const D3D12_ROOT_SIGNATURE_DESC *( STDMETHODCALLTYPE *GetRootSignatureDesc )( + + const D3D12_ROOT_SIGNATURE_DESC *( STDMETHODCALLTYPE *GetRootSignatureDesc )( ID3D12RootSignatureDeserializer * This); - + END_INTERFACE } ID3D12RootSignatureDeserializerVtbl; @@ -3181,21 +3171,19 @@ EXTERN_C const IID IID_ID3D12RootSignatureDeserializer; CONST_VTBL struct ID3D12RootSignatureDeserializerVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12RootSignatureDeserializer_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12RootSignatureDeserializer_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12RootSignatureDeserializer_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12RootSignatureDeserializer_GetRootSignatureDesc(This) \ - ( (This)->lpVtbl -> GetRootSignatureDesc(This) ) + ( (This)->lpVtbl -> GetRootSignatureDesc(This) ) #endif /* COBJMACROS */ @@ -3207,50 +3195,49 @@ EXTERN_C const IID IID_ID3D12RootSignatureDeserializer; #define __ID3D12VersionedRootSignatureDeserializer_INTERFACE_DEFINED__ /* interface ID3D12VersionedRootSignatureDeserializer */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VersionedRootSignatureDeserializer; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7F91CE67-090C-4BB7-B78E-ED8FF2E31DA0") ID3D12VersionedRootSignatureDeserializer : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE GetRootSignatureDescAtVersion( + virtual HRESULT STDMETHODCALLTYPE GetRootSignatureDescAtVersion( D3D_ROOT_SIGNATURE_VERSION convertToVersion, _Out_ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **ppDesc) = 0; - + virtual const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *STDMETHODCALLTYPE GetUnconvertedRootSignatureDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VersionedRootSignatureDeserializerVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VersionedRootSignatureDeserializer * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VersionedRootSignatureDeserializer * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VersionedRootSignatureDeserializer * This); - - HRESULT ( STDMETHODCALLTYPE *GetRootSignatureDescAtVersion )( + + HRESULT ( STDMETHODCALLTYPE *GetRootSignatureDescAtVersion )( ID3D12VersionedRootSignatureDeserializer * This, D3D_ROOT_SIGNATURE_VERSION convertToVersion, _Out_ const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **ppDesc); - - const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *( STDMETHODCALLTYPE *GetUnconvertedRootSignatureDesc )( + + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *( STDMETHODCALLTYPE *GetUnconvertedRootSignatureDesc )( ID3D12VersionedRootSignatureDeserializer * This); - + END_INTERFACE } ID3D12VersionedRootSignatureDeserializerVtbl; @@ -3259,24 +3246,22 @@ EXTERN_C const IID IID_ID3D12VersionedRootSignatureDeserializer; CONST_VTBL struct ID3D12VersionedRootSignatureDeserializerVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VersionedRootSignatureDeserializer_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VersionedRootSignatureDeserializer_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VersionedRootSignatureDeserializer_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VersionedRootSignatureDeserializer_GetRootSignatureDescAtVersion(This,convertToVersion,ppDesc) \ - ( (This)->lpVtbl -> GetRootSignatureDescAtVersion(This,convertToVersion,ppDesc) ) + ( (This)->lpVtbl -> GetRootSignatureDescAtVersion(This,convertToVersion,ppDesc) ) #define ID3D12VersionedRootSignatureDeserializer_GetUnconvertedRootSignatureDesc(This) \ - ( (This)->lpVtbl -> GetUnconvertedRootSignatureDesc(This) ) + ( (This)->lpVtbl -> GetUnconvertedRootSignatureDesc(This) ) #endif /* COBJMACROS */ @@ -3285,7 +3270,7 @@ EXTERN_C const IID IID_ID3D12VersionedRootSignatureDeserializer; #endif /* __ID3D12VersionedRootSignatureDeserializer_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0003 */ -/* [local] */ +/* [local] */ typedef HRESULT (WINAPI* PFN_D3D12_SERIALIZE_ROOT_SIGNATURE)( _In_ const D3D12_ROOT_SIGNATURE_DESC* pRootSignature, @@ -3343,7 +3328,7 @@ typedef struct D3D12_GPU_DESCRIPTOR_HANDLE UINT64 ptr; } D3D12_GPU_DESCRIPTOR_HANDLE; -// If rects are supplied in D3D12_DISCARD_REGION, below, the resource +// If rects are supplied in D3D12_DISCARD_REGION, below, the resource // must have 2D subresources with all specified subresources the same dimension. typedef struct D3D12_DISCARD_REGION { @@ -3353,7 +3338,7 @@ typedef struct D3D12_DISCARD_REGION UINT NumSubresources; } D3D12_DISCARD_REGION; -typedef +typedef enum D3D12_QUERY_HEAP_TYPE { D3D12_QUERY_HEAP_TYPE_OCCLUSION = 0, @@ -3371,7 +3356,7 @@ typedef struct D3D12_QUERY_HEAP_DESC UINT NodeMask; } D3D12_QUERY_HEAP_DESC; -typedef +typedef enum D3D12_QUERY_TYPE { D3D12_QUERY_TYPE_OCCLUSION = 0, @@ -3385,7 +3370,7 @@ enum D3D12_QUERY_TYPE D3D12_QUERY_TYPE_VIDEO_DECODE_STATISTICS = 8 } D3D12_QUERY_TYPE; -typedef +typedef enum D3D12_PREDICATION_OP { D3D12_PREDICATION_OP_EQUAL_ZERO = 0, @@ -3458,7 +3443,7 @@ typedef struct D3D12_INDEX_BUFFER_VIEW DXGI_FORMAT Format; } D3D12_INDEX_BUFFER_VIEW; -typedef +typedef enum D3D12_INDIRECT_ARGUMENT_TYPE { D3D12_INDIRECT_ARGUMENT_TYPE_DRAW = 0, @@ -3469,33 +3454,33 @@ enum D3D12_INDIRECT_ARGUMENT_TYPE D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT = ( D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW + 1 ) , D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW = ( D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT + 1 ) , D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW = ( D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW + 1 ) , - D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW = ( D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW + 1 ) + D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW = ( D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW + 1 ) } D3D12_INDIRECT_ARGUMENT_TYPE; typedef struct D3D12_INDIRECT_ARGUMENT_DESC { D3D12_INDIRECT_ARGUMENT_TYPE Type; - union + union { - struct + struct { UINT Slot; } VertexBuffer; - struct + struct { UINT RootParameterIndex; UINT DestOffsetIn32BitValues; UINT Num32BitValuesToSet; } Constant; - struct + struct { UINT RootParameterIndex; } ConstantBufferView; - struct + struct { UINT RootParameterIndex; } ShaderResourceView; - struct + struct { UINT RootParameterIndex; } UnorderedAccessView; @@ -3517,62 +3502,61 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0003_v0_0_s_ifspec; #define __ID3D12Pageable_INTERFACE_DEFINED__ /* interface ID3D12Pageable */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Pageable; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("63ee58fb-1268-4835-86da-f008ce62f0d6") ID3D12Pageable : public ID3D12DeviceChild { public: }; - - + #else /* C style interface */ typedef struct ID3D12PageableVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Pageable * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Pageable * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Pageable * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Pageable * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Pageable * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Pageable * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Pageable * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12Pageable * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - + END_INTERFACE } ID3D12PageableVtbl; @@ -3581,33 +3565,31 @@ EXTERN_C const IID IID_ID3D12Pageable; CONST_VTBL struct ID3D12PageableVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Pageable_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Pageable_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Pageable_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Pageable_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Pageable_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Pageable_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Pageable_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Pageable_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #endif /* COBJMACROS */ @@ -3619,67 +3601,66 @@ EXTERN_C const IID IID_ID3D12Pageable; #define __ID3D12Heap_INTERFACE_DEFINED__ /* interface ID3D12Heap */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Heap; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6b3b2502-6e51-45b3-90ee-9884265e8df3") ID3D12Heap : public ID3D12Pageable { public: virtual D3D12_HEAP_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12HeapVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Heap * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Heap * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Heap * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Heap * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Heap * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Heap * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Heap * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12Heap * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12Heap * This); - + END_INTERFACE } ID3D12HeapVtbl; @@ -3688,36 +3669,34 @@ EXTERN_C const IID IID_ID3D12Heap; CONST_VTBL struct ID3D12HeapVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Heap_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Heap_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Heap_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Heap_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Heap_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Heap_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Heap_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Heap_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12Heap_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #endif /* COBJMACROS */ @@ -3729,131 +3708,130 @@ EXTERN_C const IID IID_ID3D12Heap; #define __ID3D12Resource_INTERFACE_DEFINED__ /* interface ID3D12Resource */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Resource; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("696442be-a72e-4059-bc79-5b5c98040fad") ID3D12Resource : public ID3D12Pageable { public: - virtual HRESULT STDMETHODCALLTYPE Map( + virtual HRESULT STDMETHODCALLTYPE Map( UINT Subresource, _In_opt_ const D3D12_RANGE *pReadRange, _Outptr_opt_result_bytebuffer_(_Inexpressible_("Dependent on resource")) void **ppData) = 0; - - virtual void STDMETHODCALLTYPE Unmap( + + virtual void STDMETHODCALLTYPE Unmap( UINT Subresource, _In_opt_ const D3D12_RANGE *pWrittenRange) = 0; - + virtual D3D12_RESOURCE_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + virtual D3D12_GPU_VIRTUAL_ADDRESS STDMETHODCALLTYPE GetGPUVirtualAddress( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE WriteToSubresource( + + virtual HRESULT STDMETHODCALLTYPE WriteToSubresource( UINT DstSubresource, _In_opt_ const D3D12_BOX *pDstBox, _In_ const void *pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReadFromSubresource( + + virtual HRESULT STDMETHODCALLTYPE ReadFromSubresource( _Out_ void *pDstData, UINT DstRowPitch, UINT DstDepthPitch, UINT SrcSubresource, _In_opt_ const D3D12_BOX *pSrcBox) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetHeapProperties( + + virtual HRESULT STDMETHODCALLTYPE GetHeapProperties( _Out_opt_ D3D12_HEAP_PROPERTIES *pHeapProperties, _Out_opt_ D3D12_HEAP_FLAGS *pHeapFlags) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12ResourceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Resource * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Resource * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Resource * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Resource * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Resource * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Resource * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Resource * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12Resource * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( ID3D12Resource * This, UINT Subresource, _In_opt_ const D3D12_RANGE *pReadRange, _Outptr_opt_result_bytebuffer_(_Inexpressible_("Dependent on resource")) void **ppData); - - void ( STDMETHODCALLTYPE *Unmap )( + + void ( STDMETHODCALLTYPE *Unmap )( ID3D12Resource * This, UINT Subresource, _In_opt_ const D3D12_RANGE *pWrittenRange); - - D3D12_RESOURCE_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_RESOURCE_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12Resource * This); - - D3D12_GPU_VIRTUAL_ADDRESS ( STDMETHODCALLTYPE *GetGPUVirtualAddress )( + + D3D12_GPU_VIRTUAL_ADDRESS ( STDMETHODCALLTYPE *GetGPUVirtualAddress )( ID3D12Resource * This); - - HRESULT ( STDMETHODCALLTYPE *WriteToSubresource )( + + HRESULT ( STDMETHODCALLTYPE *WriteToSubresource )( ID3D12Resource * This, UINT DstSubresource, _In_opt_ const D3D12_BOX *pDstBox, _In_ const void *pSrcData, UINT SrcRowPitch, UINT SrcDepthPitch); - - HRESULT ( STDMETHODCALLTYPE *ReadFromSubresource )( + + HRESULT ( STDMETHODCALLTYPE *ReadFromSubresource )( ID3D12Resource * This, _Out_ void *pDstData, UINT DstRowPitch, UINT DstDepthPitch, UINT SrcSubresource, _In_opt_ const D3D12_BOX *pSrcBox); - - HRESULT ( STDMETHODCALLTYPE *GetHeapProperties )( + + HRESULT ( STDMETHODCALLTYPE *GetHeapProperties )( ID3D12Resource * This, _Out_opt_ D3D12_HEAP_PROPERTIES *pHeapProperties, _Out_opt_ D3D12_HEAP_FLAGS *pHeapFlags); - + END_INTERFACE } ID3D12ResourceVtbl; @@ -3862,54 +3840,52 @@ EXTERN_C const IID IID_ID3D12Resource; CONST_VTBL struct ID3D12ResourceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Resource_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Resource_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Resource_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Resource_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Resource_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Resource_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Resource_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Resource_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12Resource_Map(This,Subresource,pReadRange,ppData) \ - ( (This)->lpVtbl -> Map(This,Subresource,pReadRange,ppData) ) + ( (This)->lpVtbl -> Map(This,Subresource,pReadRange,ppData) ) #define ID3D12Resource_Unmap(This,Subresource,pWrittenRange) \ - ( (This)->lpVtbl -> Unmap(This,Subresource,pWrittenRange) ) + ( (This)->lpVtbl -> Unmap(This,Subresource,pWrittenRange) ) #define ID3D12Resource_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #define ID3D12Resource_GetGPUVirtualAddress(This) \ - ( (This)->lpVtbl -> GetGPUVirtualAddress(This) ) + ( (This)->lpVtbl -> GetGPUVirtualAddress(This) ) #define ID3D12Resource_WriteToSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) \ - ( (This)->lpVtbl -> WriteToSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) + ( (This)->lpVtbl -> WriteToSubresource(This,DstSubresource,pDstBox,pSrcData,SrcRowPitch,SrcDepthPitch) ) #define ID3D12Resource_ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,SrcSubresource,pSrcBox) \ - ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,SrcSubresource,pSrcBox) ) + ( (This)->lpVtbl -> ReadFromSubresource(This,pDstData,DstRowPitch,DstDepthPitch,SrcSubresource,pSrcBox) ) #define ID3D12Resource_GetHeapProperties(This,pHeapProperties,pHeapFlags) \ - ( (This)->lpVtbl -> GetHeapProperties(This,pHeapProperties,pHeapFlags) ) + ( (This)->lpVtbl -> GetHeapProperties(This,pHeapProperties,pHeapFlags) ) #endif /* COBJMACROS */ @@ -3921,67 +3897,66 @@ EXTERN_C const IID IID_ID3D12Resource; #define __ID3D12CommandAllocator_INTERFACE_DEFINED__ /* interface ID3D12CommandAllocator */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12CommandAllocator; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6102dee4-af59-4b09-b999-b44d73f09b24") ID3D12CommandAllocator : public ID3D12Pageable { public: virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12CommandAllocatorVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12CommandAllocator * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12CommandAllocator * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12CommandAllocator * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12CommandAllocator * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12CommandAllocator * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12CommandAllocator * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12CommandAllocator * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12CommandAllocator * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12CommandAllocator * This); - + END_INTERFACE } ID3D12CommandAllocatorVtbl; @@ -3990,36 +3965,34 @@ EXTERN_C const IID IID_ID3D12CommandAllocator; CONST_VTBL struct ID3D12CommandAllocatorVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12CommandAllocator_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12CommandAllocator_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12CommandAllocator_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12CommandAllocator_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12CommandAllocator_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12CommandAllocator_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12CommandAllocator_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12CommandAllocator_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12CommandAllocator_Reset(This) \ - ( (This)->lpVtbl -> Reset(This) ) + ( (This)->lpVtbl -> Reset(This) ) #endif /* COBJMACROS */ @@ -4031,83 +4004,82 @@ EXTERN_C const IID IID_ID3D12CommandAllocator; #define __ID3D12Fence_INTERFACE_DEFINED__ /* interface ID3D12Fence */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Fence; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0a753dcf-c4d8-4b91-adf6-be5a60d95a76") ID3D12Fence : public ID3D12Pageable { public: virtual UINT64 STDMETHODCALLTYPE GetCompletedValue( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetEventOnCompletion( + + virtual HRESULT STDMETHODCALLTYPE SetEventOnCompletion( UINT64 Value, HANDLE hEvent) = 0; - - virtual HRESULT STDMETHODCALLTYPE Signal( + + virtual HRESULT STDMETHODCALLTYPE Signal( UINT64 Value) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12FenceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Fence * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Fence * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Fence * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Fence * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Fence * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Fence * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Fence * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12Fence * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( + + UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( ID3D12Fence * This); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( ID3D12Fence * This, UINT64 Value, HANDLE hEvent); - - HRESULT ( STDMETHODCALLTYPE *Signal )( + + HRESULT ( STDMETHODCALLTYPE *Signal )( ID3D12Fence * This, UINT64 Value); - + END_INTERFACE } ID3D12FenceVtbl; @@ -4116,42 +4088,40 @@ EXTERN_C const IID IID_ID3D12Fence; CONST_VTBL struct ID3D12FenceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Fence_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Fence_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Fence_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Fence_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Fence_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Fence_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Fence_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Fence_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12Fence_GetCompletedValue(This) \ - ( (This)->lpVtbl -> GetCompletedValue(This) ) + ( (This)->lpVtbl -> GetCompletedValue(This) ) #define ID3D12Fence_SetEventOnCompletion(This,Value,hEvent) \ - ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) + ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) #define ID3D12Fence_Signal(This,Value) \ - ( (This)->lpVtbl -> Signal(This,Value) ) + ( (This)->lpVtbl -> Signal(This,Value) ) #endif /* COBJMACROS */ @@ -4163,79 +4133,78 @@ EXTERN_C const IID IID_ID3D12Fence; #define __ID3D12Fence1_INTERFACE_DEFINED__ /* interface ID3D12Fence1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Fence1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("433685fe-e22b-4ca0-a8db-b5b4f4dd0e4a") ID3D12Fence1 : public ID3D12Fence { public: virtual D3D12_FENCE_FLAGS STDMETHODCALLTYPE GetCreationFlags( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Fence1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Fence1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Fence1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Fence1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Fence1 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Fence1 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Fence1 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Fence1 * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12Fence1 * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( + + UINT64 ( STDMETHODCALLTYPE *GetCompletedValue )( ID3D12Fence1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnCompletion )( ID3D12Fence1 * This, UINT64 Value, HANDLE hEvent); - - HRESULT ( STDMETHODCALLTYPE *Signal )( + + HRESULT ( STDMETHODCALLTYPE *Signal )( ID3D12Fence1 * This, UINT64 Value); - - D3D12_FENCE_FLAGS ( STDMETHODCALLTYPE *GetCreationFlags )( + + D3D12_FENCE_FLAGS ( STDMETHODCALLTYPE *GetCreationFlags )( ID3D12Fence1 * This); - + END_INTERFACE } ID3D12Fence1Vtbl; @@ -4244,45 +4213,43 @@ EXTERN_C const IID IID_ID3D12Fence1; CONST_VTBL struct ID3D12Fence1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Fence1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Fence1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Fence1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Fence1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Fence1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Fence1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Fence1_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Fence1_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12Fence1_GetCompletedValue(This) \ - ( (This)->lpVtbl -> GetCompletedValue(This) ) + ( (This)->lpVtbl -> GetCompletedValue(This) ) #define ID3D12Fence1_SetEventOnCompletion(This,Value,hEvent) \ - ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) + ( (This)->lpVtbl -> SetEventOnCompletion(This,Value,hEvent) ) #define ID3D12Fence1_Signal(This,Value) \ - ( (This)->lpVtbl -> Signal(This,Value) ) + ( (This)->lpVtbl -> Signal(This,Value) ) #define ID3D12Fence1_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #endif /* COBJMACROS */ @@ -4294,69 +4261,68 @@ EXTERN_C const IID IID_ID3D12Fence1; #define __ID3D12PipelineState_INTERFACE_DEFINED__ /* interface ID3D12PipelineState */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12PipelineState; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("765a30f3-f624-4c6f-a828-ace948622445") ID3D12PipelineState : public ID3D12Pageable { public: - virtual HRESULT STDMETHODCALLTYPE GetCachedBlob( + virtual HRESULT STDMETHODCALLTYPE GetCachedBlob( _COM_Outptr_ ID3DBlob **ppBlob) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12PipelineStateVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12PipelineState * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12PipelineState * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12PipelineState * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12PipelineState * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12PipelineState * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12PipelineState * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12PipelineState * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12PipelineState * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - HRESULT ( STDMETHODCALLTYPE *GetCachedBlob )( + + HRESULT ( STDMETHODCALLTYPE *GetCachedBlob )( ID3D12PipelineState * This, _COM_Outptr_ ID3DBlob **ppBlob); - + END_INTERFACE } ID3D12PipelineStateVtbl; @@ -4365,36 +4331,34 @@ EXTERN_C const IID IID_ID3D12PipelineState; CONST_VTBL struct ID3D12PipelineStateVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12PipelineState_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12PipelineState_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12PipelineState_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12PipelineState_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12PipelineState_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12PipelineState_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12PipelineState_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12PipelineState_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12PipelineState_GetCachedBlob(This,ppBlob) \ - ( (This)->lpVtbl -> GetCachedBlob(This,ppBlob) ) + ( (This)->lpVtbl -> GetCachedBlob(This,ppBlob) ) #endif /* COBJMACROS */ @@ -4406,77 +4370,76 @@ EXTERN_C const IID IID_ID3D12PipelineState; #define __ID3D12DescriptorHeap_INTERFACE_DEFINED__ /* interface ID3D12DescriptorHeap */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DescriptorHeap; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8efb471d-616c-4f49-90f7-127bb763fa51") ID3D12DescriptorHeap : public ID3D12Pageable { public: virtual D3D12_DESCRIPTOR_HEAP_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + virtual D3D12_CPU_DESCRIPTOR_HANDLE STDMETHODCALLTYPE GetCPUDescriptorHandleForHeapStart( void) = 0; - + virtual D3D12_GPU_DESCRIPTOR_HANDLE STDMETHODCALLTYPE GetGPUDescriptorHandleForHeapStart( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DescriptorHeapVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DescriptorHeap * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DescriptorHeap * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DescriptorHeap * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12DescriptorHeap * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12DescriptorHeap * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12DescriptorHeap * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12DescriptorHeap * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12DescriptorHeap * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_DESCRIPTOR_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_DESCRIPTOR_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12DescriptorHeap * This); - - D3D12_CPU_DESCRIPTOR_HANDLE ( STDMETHODCALLTYPE *GetCPUDescriptorHandleForHeapStart )( + + D3D12_CPU_DESCRIPTOR_HANDLE ( STDMETHODCALLTYPE *GetCPUDescriptorHandleForHeapStart )( ID3D12DescriptorHeap * This); - - D3D12_GPU_DESCRIPTOR_HANDLE ( STDMETHODCALLTYPE *GetGPUDescriptorHandleForHeapStart )( + + D3D12_GPU_DESCRIPTOR_HANDLE ( STDMETHODCALLTYPE *GetGPUDescriptorHandleForHeapStart )( ID3D12DescriptorHeap * This); - + END_INTERFACE } ID3D12DescriptorHeapVtbl; @@ -4485,42 +4448,40 @@ EXTERN_C const IID IID_ID3D12DescriptorHeap; CONST_VTBL struct ID3D12DescriptorHeapVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DescriptorHeap_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DescriptorHeap_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DescriptorHeap_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DescriptorHeap_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12DescriptorHeap_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12DescriptorHeap_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12DescriptorHeap_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12DescriptorHeap_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12DescriptorHeap_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #define ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(This) \ - ( (This)->lpVtbl -> GetCPUDescriptorHandleForHeapStart(This) ) + ( (This)->lpVtbl -> GetCPUDescriptorHandleForHeapStart(This) ) #define ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(This) \ - ( (This)->lpVtbl -> GetGPUDescriptorHandleForHeapStart(This) ) + ( (This)->lpVtbl -> GetGPUDescriptorHandleForHeapStart(This) ) #endif /* COBJMACROS */ @@ -4532,62 +4493,61 @@ EXTERN_C const IID IID_ID3D12DescriptorHeap; #define __ID3D12QueryHeap_INTERFACE_DEFINED__ /* interface ID3D12QueryHeap */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12QueryHeap; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0d9658ae-ed45-469e-a61d-970ec583cab4") ID3D12QueryHeap : public ID3D12Pageable { public: }; - - + #else /* C style interface */ typedef struct ID3D12QueryHeapVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12QueryHeap * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12QueryHeap * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12QueryHeap * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12QueryHeap * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12QueryHeap * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12QueryHeap * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12QueryHeap * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12QueryHeap * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - + END_INTERFACE } ID3D12QueryHeapVtbl; @@ -4596,33 +4556,31 @@ EXTERN_C const IID IID_ID3D12QueryHeap; CONST_VTBL struct ID3D12QueryHeapVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12QueryHeap_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12QueryHeap_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12QueryHeap_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12QueryHeap_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12QueryHeap_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12QueryHeap_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12QueryHeap_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12QueryHeap_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #endif /* COBJMACROS */ @@ -4634,62 +4592,61 @@ EXTERN_C const IID IID_ID3D12QueryHeap; #define __ID3D12CommandSignature_INTERFACE_DEFINED__ /* interface ID3D12CommandSignature */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12CommandSignature; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c36a797c-ec80-4f0a-8985-a7b2475082d1") ID3D12CommandSignature : public ID3D12Pageable { public: }; - - + #else /* C style interface */ typedef struct ID3D12CommandSignatureVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12CommandSignature * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12CommandSignature * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12CommandSignature * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12CommandSignature * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12CommandSignature * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12CommandSignature * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12CommandSignature * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12CommandSignature * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - + END_INTERFACE } ID3D12CommandSignatureVtbl; @@ -4698,33 +4655,31 @@ EXTERN_C const IID IID_ID3D12CommandSignature; CONST_VTBL struct ID3D12CommandSignatureVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12CommandSignature_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12CommandSignature_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12CommandSignature_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12CommandSignature_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12CommandSignature_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12CommandSignature_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12CommandSignature_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12CommandSignature_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #endif /* COBJMACROS */ @@ -4736,67 +4691,66 @@ EXTERN_C const IID IID_ID3D12CommandSignature; #define __ID3D12CommandList_INTERFACE_DEFINED__ /* interface ID3D12CommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12CommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7116d91c-e7e4-47ce-b8c6-ec8168f437e5") ID3D12CommandList : public ID3D12DeviceChild { public: virtual D3D12_COMMAND_LIST_TYPE STDMETHODCALLTYPE GetType( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12CommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12CommandList * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12CommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12CommandList * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12CommandList * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12CommandList * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12CommandList * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12CommandList * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12CommandList * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12CommandList * This); - + END_INTERFACE } ID3D12CommandListVtbl; @@ -4805,36 +4759,34 @@ EXTERN_C const IID IID_ID3D12CommandList; CONST_VTBL struct ID3D12CommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12CommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12CommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12CommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12CommandList_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12CommandList_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12CommandList_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12CommandList_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12CommandList_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12CommandList_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #endif /* COBJMACROS */ @@ -4846,355 +4798,354 @@ EXTERN_C const IID IID_ID3D12CommandList; #define __ID3D12GraphicsCommandList_INTERFACE_DEFINED__ /* interface ID3D12GraphicsCommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12GraphicsCommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("5b160d0f-ac1b-4185-8ba8-b3ae42a5a455") ID3D12GraphicsCommandList : public ID3D12CommandList { public: virtual HRESULT STDMETHODCALLTYPE Close( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( + + virtual HRESULT STDMETHODCALLTYPE Reset( _In_ ID3D12CommandAllocator *pAllocator, _In_opt_ ID3D12PipelineState *pInitialState) = 0; - - virtual void STDMETHODCALLTYPE ClearState( + + virtual void STDMETHODCALLTYPE ClearState( _In_opt_ ID3D12PipelineState *pPipelineState) = 0; - - virtual void STDMETHODCALLTYPE DrawInstanced( + + virtual void STDMETHODCALLTYPE DrawInstanced( _In_ UINT VertexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartVertexLocation, _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE DrawIndexedInstanced( + + virtual void STDMETHODCALLTYPE DrawIndexedInstanced( _In_ UINT IndexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartIndexLocation, _In_ INT BaseVertexLocation, _In_ UINT StartInstanceLocation) = 0; - - virtual void STDMETHODCALLTYPE Dispatch( + + virtual void STDMETHODCALLTYPE Dispatch( _In_ UINT ThreadGroupCountX, _In_ UINT ThreadGroupCountY, _In_ UINT ThreadGroupCountZ) = 0; - - virtual void STDMETHODCALLTYPE CopyBufferRegion( + + virtual void STDMETHODCALLTYPE CopyBufferRegion( _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, UINT64 SrcOffset, UINT64 NumBytes) = 0; - - virtual void STDMETHODCALLTYPE CopyTextureRegion( + + virtual void STDMETHODCALLTYPE CopyTextureRegion( _In_ const D3D12_TEXTURE_COPY_LOCATION *pDst, UINT DstX, UINT DstY, UINT DstZ, _In_ const D3D12_TEXTURE_COPY_LOCATION *pSrc, _In_opt_ const D3D12_BOX *pSrcBox) = 0; - - virtual void STDMETHODCALLTYPE CopyResource( + + virtual void STDMETHODCALLTYPE CopyResource( _In_ ID3D12Resource *pDstResource, _In_ ID3D12Resource *pSrcResource) = 0; - - virtual void STDMETHODCALLTYPE CopyTiles( + + virtual void STDMETHODCALLTYPE CopyTiles( _In_ ID3D12Resource *pTiledResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, _In_ const D3D12_TILE_REGION_SIZE *pTileRegionSize, _In_ ID3D12Resource *pBuffer, UINT64 BufferStartOffsetInBytes, D3D12_TILE_COPY_FLAGS Flags) = 0; - - virtual void STDMETHODCALLTYPE ResolveSubresource( + + virtual void STDMETHODCALLTYPE ResolveSubresource( _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, _In_ ID3D12Resource *pSrcResource, _In_ UINT SrcSubresource, _In_ DXGI_FORMAT Format) = 0; - - virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( + + virtual void STDMETHODCALLTYPE IASetPrimitiveTopology( _In_ D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology) = 0; - - virtual void STDMETHODCALLTYPE RSSetViewports( + + virtual void STDMETHODCALLTYPE RSSetViewports( _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, _In_reads_( NumViewports) const D3D12_VIEWPORT *pViewports) = 0; - - virtual void STDMETHODCALLTYPE RSSetScissorRects( + + virtual void STDMETHODCALLTYPE RSSetScissorRects( _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, _In_reads_( NumRects) const D3D12_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE OMSetBlendFactor( + + virtual void STDMETHODCALLTYPE OMSetBlendFactor( _In_reads_opt_(4) const FLOAT BlendFactor[ 4 ]) = 0; - - virtual void STDMETHODCALLTYPE OMSetStencilRef( + + virtual void STDMETHODCALLTYPE OMSetStencilRef( _In_ UINT StencilRef) = 0; - - virtual void STDMETHODCALLTYPE SetPipelineState( + + virtual void STDMETHODCALLTYPE SetPipelineState( _In_ ID3D12PipelineState *pPipelineState) = 0; - - virtual void STDMETHODCALLTYPE ResourceBarrier( + + virtual void STDMETHODCALLTYPE ResourceBarrier( _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers) = 0; - - virtual void STDMETHODCALLTYPE ExecuteBundle( + + virtual void STDMETHODCALLTYPE ExecuteBundle( _In_ ID3D12GraphicsCommandList *pCommandList) = 0; - - virtual void STDMETHODCALLTYPE SetDescriptorHeaps( + + virtual void STDMETHODCALLTYPE SetDescriptorHeaps( _In_ UINT NumDescriptorHeaps, _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRootSignature( + + virtual void STDMETHODCALLTYPE SetComputeRootSignature( _In_opt_ ID3D12RootSignature *pRootSignature) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRootSignature( + + virtual void STDMETHODCALLTYPE SetGraphicsRootSignature( _In_opt_ ID3D12RootSignature *pRootSignature) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRootDescriptorTable( + + virtual void STDMETHODCALLTYPE SetComputeRootDescriptorTable( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRootDescriptorTable( + + virtual void STDMETHODCALLTYPE SetGraphicsRootDescriptorTable( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRoot32BitConstant( + + virtual void STDMETHODCALLTYPE SetComputeRoot32BitConstant( _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRoot32BitConstant( + + virtual void STDMETHODCALLTYPE SetGraphicsRoot32BitConstant( _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRoot32BitConstants( + + virtual void STDMETHODCALLTYPE SetComputeRoot32BitConstants( _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRoot32BitConstants( + + virtual void STDMETHODCALLTYPE SetGraphicsRoot32BitConstants( _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRootConstantBufferView( + + virtual void STDMETHODCALLTYPE SetComputeRootConstantBufferView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRootConstantBufferView( + + virtual void STDMETHODCALLTYPE SetGraphicsRootConstantBufferView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRootShaderResourceView( + + virtual void STDMETHODCALLTYPE SetComputeRootShaderResourceView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRootShaderResourceView( + + virtual void STDMETHODCALLTYPE SetGraphicsRootShaderResourceView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE SetComputeRootUnorderedAccessView( + + virtual void STDMETHODCALLTYPE SetComputeRootUnorderedAccessView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE SetGraphicsRootUnorderedAccessView( + + virtual void STDMETHODCALLTYPE SetGraphicsRootUnorderedAccessView( _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation) = 0; - - virtual void STDMETHODCALLTYPE IASetIndexBuffer( + + virtual void STDMETHODCALLTYPE IASetIndexBuffer( _In_opt_ const D3D12_INDEX_BUFFER_VIEW *pView) = 0; - - virtual void STDMETHODCALLTYPE IASetVertexBuffers( + + virtual void STDMETHODCALLTYPE IASetVertexBuffers( _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_VERTEX_BUFFER_VIEW *pViews) = 0; - - virtual void STDMETHODCALLTYPE SOSetTargets( + + virtual void STDMETHODCALLTYPE SOSetTargets( _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_STREAM_OUTPUT_BUFFER_VIEW *pViews) = 0; - - virtual void STDMETHODCALLTYPE OMSetRenderTargets( + + virtual void STDMETHODCALLTYPE OMSetRenderTargets( _In_ UINT NumRenderTargetDescriptors, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor) = 0; - - virtual void STDMETHODCALLTYPE ClearDepthStencilView( + + virtual void STDMETHODCALLTYPE ClearDepthStencilView( _In_ D3D12_CPU_DESCRIPTOR_HANDLE DepthStencilView, _In_ D3D12_CLEAR_FLAGS ClearFlags, _In_ FLOAT Depth, _In_ UINT8 Stencil, _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE ClearRenderTargetView( + + virtual void STDMETHODCALLTYPE ClearRenderTargetView( _In_ D3D12_CPU_DESCRIPTOR_HANDLE RenderTargetView, _In_ const FLOAT ColorRGBA[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint( + + virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewUint( _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, _In_ ID3D12Resource *pResource, _In_ const UINT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat( + + virtual void STDMETHODCALLTYPE ClearUnorderedAccessViewFloat( _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, _In_ ID3D12Resource *pResource, _In_ const FLOAT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects) = 0; - - virtual void STDMETHODCALLTYPE DiscardResource( + + virtual void STDMETHODCALLTYPE DiscardResource( _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion) = 0; - - virtual void STDMETHODCALLTYPE BeginQuery( + + virtual void STDMETHODCALLTYPE BeginQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE EndQuery( + + virtual void STDMETHODCALLTYPE EndQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE ResolveQueryData( + + virtual void STDMETHODCALLTYPE ResolveQueryData( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT StartIndex, _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset) = 0; - - virtual void STDMETHODCALLTYPE SetPredication( + + virtual void STDMETHODCALLTYPE SetPredication( _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation) = 0; - - virtual void STDMETHODCALLTYPE SetMarker( + + virtual void STDMETHODCALLTYPE SetMarker( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - - virtual void STDMETHODCALLTYPE BeginEvent( + + virtual void STDMETHODCALLTYPE BeginEvent( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - + virtual void STDMETHODCALLTYPE EndEvent( void) = 0; - - virtual void STDMETHODCALLTYPE ExecuteIndirect( + + virtual void STDMETHODCALLTYPE ExecuteIndirect( _In_ ID3D12CommandSignature *pCommandSignature, _In_ UINT MaxCommandCount, _In_ ID3D12Resource *pArgumentBuffer, _In_ UINT64 ArgumentBufferOffset, _In_opt_ ID3D12Resource *pCountBuffer, _In_ UINT64 CountBufferOffset) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12GraphicsCommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12GraphicsCommandList * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12GraphicsCommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12GraphicsCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12GraphicsCommandList * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12GraphicsCommandList * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12GraphicsCommandList * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12GraphicsCommandList * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12GraphicsCommandList * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12GraphicsCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Close )( + + HRESULT ( STDMETHODCALLTYPE *Close )( ID3D12GraphicsCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12GraphicsCommandList * This, _In_ ID3D12CommandAllocator *pAllocator, _In_opt_ ID3D12PipelineState *pInitialState); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D12GraphicsCommandList * This, _In_opt_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D12GraphicsCommandList * This, _In_ UINT VertexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D12GraphicsCommandList * This, _In_ UINT IndexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartIndexLocation, _In_ INT BaseVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D12GraphicsCommandList * This, _In_ UINT ThreadGroupCountX, _In_ UINT ThreadGroupCountY, _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *CopyBufferRegion )( + + void ( STDMETHODCALLTYPE *CopyBufferRegion )( ID3D12GraphicsCommandList * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, UINT64 SrcOffset, UINT64 NumBytes); - - void ( STDMETHODCALLTYPE *CopyTextureRegion )( + + void ( STDMETHODCALLTYPE *CopyTextureRegion )( ID3D12GraphicsCommandList * This, _In_ const D3D12_TEXTURE_COPY_LOCATION *pDst, UINT DstX, @@ -5202,13 +5153,13 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; UINT DstZ, _In_ const D3D12_TEXTURE_COPY_LOCATION *pSrc, _In_opt_ const D3D12_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D12GraphicsCommandList * This, _In_ ID3D12Resource *pDstResource, _In_ ID3D12Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D12GraphicsCommandList * This, _In_ ID3D12Resource *pTiledResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, @@ -5216,153 +5167,153 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ ID3D12Resource *pBuffer, UINT64 BufferStartOffsetInBytes, D3D12_TILE_COPY_FLAGS Flags); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D12GraphicsCommandList * This, _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, _In_ ID3D12Resource *pSrcResource, _In_ UINT SrcSubresource, _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D12GraphicsCommandList * This, _In_ D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D12GraphicsCommandList * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, _In_reads_( NumViewports) const D3D12_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D12GraphicsCommandList * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, _In_reads_( NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *OMSetBlendFactor )( + + void ( STDMETHODCALLTYPE *OMSetBlendFactor )( ID3D12GraphicsCommandList * This, _In_reads_opt_(4) const FLOAT BlendFactor[ 4 ]); - - void ( STDMETHODCALLTYPE *OMSetStencilRef )( + + void ( STDMETHODCALLTYPE *OMSetStencilRef )( ID3D12GraphicsCommandList * This, _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SetPipelineState )( + + void ( STDMETHODCALLTYPE *SetPipelineState )( ID3D12GraphicsCommandList * This, _In_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *ResourceBarrier )( + + void ( STDMETHODCALLTYPE *ResourceBarrier )( ID3D12GraphicsCommandList * This, _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers); - - void ( STDMETHODCALLTYPE *ExecuteBundle )( + + void ( STDMETHODCALLTYPE *ExecuteBundle )( ID3D12GraphicsCommandList * This, _In_ ID3D12GraphicsCommandList *pCommandList); - - void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( + + void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( ID3D12GraphicsCommandList * This, _In_ UINT NumDescriptorHeaps, _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps); - - void ( STDMETHODCALLTYPE *SetComputeRootSignature )( + + void ( STDMETHODCALLTYPE *SetComputeRootSignature )( ID3D12GraphicsCommandList * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( ID3D12GraphicsCommandList * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( ID3D12GraphicsCommandList * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D12GraphicsCommandList * This, _In_opt_ const D3D12_INDEX_BUFFER_VIEW *pView); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D12GraphicsCommandList * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_VERTEX_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D12GraphicsCommandList * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_STREAM_OUTPUT_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D12GraphicsCommandList * This, _In_ UINT NumRenderTargetDescriptors, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D12GraphicsCommandList * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DepthStencilView, _In_ D3D12_CLEAR_FLAGS ClearFlags, @@ -5370,15 +5321,15 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ UINT8 Stencil, _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D12GraphicsCommandList * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE RenderTargetView, _In_ const FLOAT ColorRGBA[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D12GraphicsCommandList * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -5386,8 +5337,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ const UINT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D12GraphicsCommandList * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -5395,25 +5346,25 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ const FLOAT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D12GraphicsCommandList * This, _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion); - - void ( STDMETHODCALLTYPE *BeginQuery )( + + void ( STDMETHODCALLTYPE *BeginQuery )( ID3D12GraphicsCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *EndQuery )( + + void ( STDMETHODCALLTYPE *EndQuery )( ID3D12GraphicsCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *ResolveQueryData )( + + void ( STDMETHODCALLTYPE *ResolveQueryData )( ID3D12GraphicsCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, @@ -5421,29 +5372,29 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D12GraphicsCommandList * This, _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12GraphicsCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12GraphicsCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12GraphicsCommandList * This); - - void ( STDMETHODCALLTYPE *ExecuteIndirect )( + + void ( STDMETHODCALLTYPE *ExecuteIndirect )( ID3D12GraphicsCommandList * This, _In_ ID3D12CommandSignature *pCommandSignature, _In_ UINT MaxCommandCount, @@ -5451,7 +5402,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; _In_ UINT64 ArgumentBufferOffset, _In_opt_ ID3D12Resource *pCountBuffer, _In_ UINT64 CountBufferOffset); - + END_INTERFACE } ID3D12GraphicsCommandListVtbl; @@ -5460,189 +5411,187 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; CONST_VTBL struct ID3D12GraphicsCommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12GraphicsCommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12GraphicsCommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12GraphicsCommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12GraphicsCommandList_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12GraphicsCommandList_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12GraphicsCommandList_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12GraphicsCommandList_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12GraphicsCommandList_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12GraphicsCommandList_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D12GraphicsCommandList_Close(This) \ - ( (This)->lpVtbl -> Close(This) ) + ( (This)->lpVtbl -> Close(This) ) #define ID3D12GraphicsCommandList_Reset(This,pAllocator,pInitialState) \ - ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) + ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) #define ID3D12GraphicsCommandList_ClearState(This,pPipelineState) \ - ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) + ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) #define ID3D12GraphicsCommandList_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D12GraphicsCommandList_CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) \ - ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) + ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) #define ID3D12GraphicsCommandList_CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) \ - ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) + ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) #define ID3D12GraphicsCommandList_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D12GraphicsCommandList_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D12GraphicsCommandList_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D12GraphicsCommandList_IASetPrimitiveTopology(This,PrimitiveTopology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) #define ID3D12GraphicsCommandList_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D12GraphicsCommandList_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D12GraphicsCommandList_OMSetBlendFactor(This,BlendFactor) \ - ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) + ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) #define ID3D12GraphicsCommandList_OMSetStencilRef(This,StencilRef) \ - ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) + ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) #define ID3D12GraphicsCommandList_SetPipelineState(This,pPipelineState) \ - ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) + ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) #define ID3D12GraphicsCommandList_ResourceBarrier(This,NumBarriers,pBarriers) \ - ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) + ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) #define ID3D12GraphicsCommandList_ExecuteBundle(This,pCommandList) \ - ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) + ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) #define ID3D12GraphicsCommandList_SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) \ - ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) + ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) #define ID3D12GraphicsCommandList_SetComputeRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList_SetGraphicsRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList_SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList_SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList_IASetIndexBuffer(This,pView) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) #define ID3D12GraphicsCommandList_IASetVertexBuffers(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList_SOSetTargets(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList_OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) #define ID3D12GraphicsCommandList_ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) #define ID3D12GraphicsCommandList_ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) #define ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList_ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList_DiscardResource(This,pResource,pRegion) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) #define ID3D12GraphicsCommandList_BeginQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList_EndQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList_ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) \ - ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) + ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) #define ID3D12GraphicsCommandList_SetPredication(This,pBuffer,AlignedBufferOffset,Operation) \ - ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) + ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) #define ID3D12GraphicsCommandList_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12GraphicsCommandList_ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) \ - ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) + ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) #endif /* COBJMACROS */ @@ -5654,17 +5603,17 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList; #define __ID3D12GraphicsCommandList1_INTERFACE_DEFINED__ /* interface ID3D12GraphicsCommandList1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("553103fb-1fe7-4557-bb38-946d7d0e7ca7") ID3D12GraphicsCommandList1 : public ID3D12GraphicsCommandList { public: - virtual void STDMETHODCALLTYPE AtomicCopyBufferUINT( + virtual void STDMETHODCALLTYPE AtomicCopyBufferUINT( _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, @@ -5672,8 +5621,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges) = 0; - - virtual void STDMETHODCALLTYPE AtomicCopyBufferUINT64( + + virtual void STDMETHODCALLTYPE AtomicCopyBufferUINT64( _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, @@ -5681,17 +5630,17 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges) = 0; - - virtual void STDMETHODCALLTYPE OMSetDepthBounds( + + virtual void STDMETHODCALLTYPE OMSetDepthBounds( _In_ FLOAT Min, _In_ FLOAT Max) = 0; - - virtual void STDMETHODCALLTYPE SetSamplePositions( + + virtual void STDMETHODCALLTYPE SetSamplePositions( _In_ UINT NumSamplesPerPixel, _In_ UINT NumPixels, _In_reads_(NumSamplesPerPixel*NumPixels) D3D12_SAMPLE_POSITION *pSamplePositions) = 0; - - virtual void STDMETHODCALLTYPE ResolveSubresourceRegion( + + virtual void STDMETHODCALLTYPE ResolveSubresourceRegion( _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, _In_ UINT DstX, @@ -5701,101 +5650,100 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_opt_ D3D12_RECT *pSrcRect, _In_ DXGI_FORMAT Format, _In_ D3D12_RESOLVE_MODE ResolveMode) = 0; - - virtual void STDMETHODCALLTYPE SetViewInstanceMask( + + virtual void STDMETHODCALLTYPE SetViewInstanceMask( _In_ UINT Mask) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12GraphicsCommandList1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12GraphicsCommandList1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12GraphicsCommandList1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12GraphicsCommandList1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12GraphicsCommandList1 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12GraphicsCommandList1 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12GraphicsCommandList1 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12GraphicsCommandList1 * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12GraphicsCommandList1 * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12GraphicsCommandList1 * This); - - HRESULT ( STDMETHODCALLTYPE *Close )( + + HRESULT ( STDMETHODCALLTYPE *Close )( ID3D12GraphicsCommandList1 * This); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12CommandAllocator *pAllocator, _In_opt_ ID3D12PipelineState *pInitialState); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D12GraphicsCommandList1 * This, _In_opt_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D12GraphicsCommandList1 * This, _In_ UINT VertexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D12GraphicsCommandList1 * This, _In_ UINT IndexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartIndexLocation, _In_ INT BaseVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D12GraphicsCommandList1 * This, _In_ UINT ThreadGroupCountX, _In_ UINT ThreadGroupCountY, _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *CopyBufferRegion )( + + void ( STDMETHODCALLTYPE *CopyBufferRegion )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, UINT64 SrcOffset, UINT64 NumBytes); - - void ( STDMETHODCALLTYPE *CopyTextureRegion )( + + void ( STDMETHODCALLTYPE *CopyTextureRegion )( ID3D12GraphicsCommandList1 * This, _In_ const D3D12_TEXTURE_COPY_LOCATION *pDst, UINT DstX, @@ -5803,13 +5751,13 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; UINT DstZ, _In_ const D3D12_TEXTURE_COPY_LOCATION *pSrc, _In_opt_ const D3D12_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstResource, _In_ ID3D12Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pTiledResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, @@ -5817,153 +5765,153 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ ID3D12Resource *pBuffer, UINT64 BufferStartOffsetInBytes, D3D12_TILE_COPY_FLAGS Flags); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, _In_ ID3D12Resource *pSrcResource, _In_ UINT SrcSubresource, _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D12GraphicsCommandList1 * This, _In_ D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D12GraphicsCommandList1 * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, _In_reads_( NumViewports) const D3D12_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D12GraphicsCommandList1 * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, _In_reads_( NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *OMSetBlendFactor )( + + void ( STDMETHODCALLTYPE *OMSetBlendFactor )( ID3D12GraphicsCommandList1 * This, _In_reads_opt_(4) const FLOAT BlendFactor[ 4 ]); - - void ( STDMETHODCALLTYPE *OMSetStencilRef )( + + void ( STDMETHODCALLTYPE *OMSetStencilRef )( ID3D12GraphicsCommandList1 * This, _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SetPipelineState )( + + void ( STDMETHODCALLTYPE *SetPipelineState )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *ResourceBarrier )( + + void ( STDMETHODCALLTYPE *ResourceBarrier )( ID3D12GraphicsCommandList1 * This, _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers); - - void ( STDMETHODCALLTYPE *ExecuteBundle )( + + void ( STDMETHODCALLTYPE *ExecuteBundle )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12GraphicsCommandList *pCommandList); - - void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( + + void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( ID3D12GraphicsCommandList1 * This, _In_ UINT NumDescriptorHeaps, _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps); - - void ( STDMETHODCALLTYPE *SetComputeRootSignature )( + + void ( STDMETHODCALLTYPE *SetComputeRootSignature )( ID3D12GraphicsCommandList1 * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( ID3D12GraphicsCommandList1 * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( ID3D12GraphicsCommandList1 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D12GraphicsCommandList1 * This, _In_opt_ const D3D12_INDEX_BUFFER_VIEW *pView); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D12GraphicsCommandList1 * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_VERTEX_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D12GraphicsCommandList1 * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_STREAM_OUTPUT_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D12GraphicsCommandList1 * This, _In_ UINT NumRenderTargetDescriptors, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D12GraphicsCommandList1 * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DepthStencilView, _In_ D3D12_CLEAR_FLAGS ClearFlags, @@ -5971,15 +5919,15 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ UINT8 Stencil, _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D12GraphicsCommandList1 * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE RenderTargetView, _In_ const FLOAT ColorRGBA[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D12GraphicsCommandList1 * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -5987,8 +5935,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ const UINT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D12GraphicsCommandList1 * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -5996,25 +5944,25 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ const FLOAT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion); - - void ( STDMETHODCALLTYPE *BeginQuery )( + + void ( STDMETHODCALLTYPE *BeginQuery )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *EndQuery )( + + void ( STDMETHODCALLTYPE *EndQuery )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *ResolveQueryData )( + + void ( STDMETHODCALLTYPE *ResolveQueryData )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, @@ -6022,29 +5970,29 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D12GraphicsCommandList1 * This, _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12GraphicsCommandList1 * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12GraphicsCommandList1 * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12GraphicsCommandList1 * This); - - void ( STDMETHODCALLTYPE *ExecuteIndirect )( + + void ( STDMETHODCALLTYPE *ExecuteIndirect )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12CommandSignature *pCommandSignature, _In_ UINT MaxCommandCount, @@ -6052,8 +6000,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_ UINT64 ArgumentBufferOffset, _In_opt_ ID3D12Resource *pCountBuffer, _In_ UINT64 CountBufferOffset); - - void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT )( + + void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, @@ -6062,8 +6010,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges); - - void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT64 )( + + void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT64 )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, @@ -6072,19 +6020,19 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges); - - void ( STDMETHODCALLTYPE *OMSetDepthBounds )( + + void ( STDMETHODCALLTYPE *OMSetDepthBounds )( ID3D12GraphicsCommandList1 * This, _In_ FLOAT Min, _In_ FLOAT Max); - - void ( STDMETHODCALLTYPE *SetSamplePositions )( + + void ( STDMETHODCALLTYPE *SetSamplePositions )( ID3D12GraphicsCommandList1 * This, _In_ UINT NumSamplesPerPixel, _In_ UINT NumPixels, _In_reads_(NumSamplesPerPixel*NumPixels) D3D12_SAMPLE_POSITION *pSamplePositions); - - void ( STDMETHODCALLTYPE *ResolveSubresourceRegion )( + + void ( STDMETHODCALLTYPE *ResolveSubresourceRegion )( ID3D12GraphicsCommandList1 * This, _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, @@ -6095,11 +6043,11 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; _In_opt_ D3D12_RECT *pSrcRect, _In_ DXGI_FORMAT Format, _In_ D3D12_RESOLVE_MODE ResolveMode); - - void ( STDMETHODCALLTYPE *SetViewInstanceMask )( + + void ( STDMETHODCALLTYPE *SetViewInstanceMask )( ID3D12GraphicsCommandList1 * This, _In_ UINT Mask); - + END_INTERFACE } ID3D12GraphicsCommandList1Vtbl; @@ -6108,207 +6056,205 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; CONST_VTBL struct ID3D12GraphicsCommandList1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12GraphicsCommandList1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12GraphicsCommandList1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12GraphicsCommandList1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12GraphicsCommandList1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12GraphicsCommandList1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12GraphicsCommandList1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12GraphicsCommandList1_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12GraphicsCommandList1_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12GraphicsCommandList1_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D12GraphicsCommandList1_Close(This) \ - ( (This)->lpVtbl -> Close(This) ) + ( (This)->lpVtbl -> Close(This) ) #define ID3D12GraphicsCommandList1_Reset(This,pAllocator,pInitialState) \ - ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) + ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) #define ID3D12GraphicsCommandList1_ClearState(This,pPipelineState) \ - ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) + ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) #define ID3D12GraphicsCommandList1_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList1_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList1_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D12GraphicsCommandList1_CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) \ - ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) + ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) #define ID3D12GraphicsCommandList1_CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) \ - ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) + ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) #define ID3D12GraphicsCommandList1_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D12GraphicsCommandList1_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D12GraphicsCommandList1_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D12GraphicsCommandList1_IASetPrimitiveTopology(This,PrimitiveTopology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) #define ID3D12GraphicsCommandList1_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D12GraphicsCommandList1_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D12GraphicsCommandList1_OMSetBlendFactor(This,BlendFactor) \ - ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) + ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) #define ID3D12GraphicsCommandList1_OMSetStencilRef(This,StencilRef) \ - ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) + ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) #define ID3D12GraphicsCommandList1_SetPipelineState(This,pPipelineState) \ - ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) + ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) #define ID3D12GraphicsCommandList1_ResourceBarrier(This,NumBarriers,pBarriers) \ - ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) + ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) #define ID3D12GraphicsCommandList1_ExecuteBundle(This,pCommandList) \ - ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) + ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) #define ID3D12GraphicsCommandList1_SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) \ - ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) + ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) #define ID3D12GraphicsCommandList1_SetComputeRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList1_SetGraphicsRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList1_SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList1_SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList1_SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList1_SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList1_SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList1_SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList1_SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList1_IASetIndexBuffer(This,pView) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) #define ID3D12GraphicsCommandList1_IASetVertexBuffers(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList1_SOSetTargets(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList1_OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) #define ID3D12GraphicsCommandList1_ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) #define ID3D12GraphicsCommandList1_ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) #define ID3D12GraphicsCommandList1_ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList1_ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList1_DiscardResource(This,pResource,pRegion) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) #define ID3D12GraphicsCommandList1_BeginQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList1_EndQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList1_ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) \ - ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) + ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) #define ID3D12GraphicsCommandList1_SetPredication(This,pBuffer,AlignedBufferOffset,Operation) \ - ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) + ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) #define ID3D12GraphicsCommandList1_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList1_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList1_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12GraphicsCommandList1_ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) \ - ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) + ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) #define ID3D12GraphicsCommandList1_AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) \ - ( (This)->lpVtbl -> AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) + ( (This)->lpVtbl -> AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) #define ID3D12GraphicsCommandList1_AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) \ - ( (This)->lpVtbl -> AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) + ( (This)->lpVtbl -> AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) #define ID3D12GraphicsCommandList1_OMSetDepthBounds(This,Min,Max) \ - ( (This)->lpVtbl -> OMSetDepthBounds(This,Min,Max) ) + ( (This)->lpVtbl -> OMSetDepthBounds(This,Min,Max) ) #define ID3D12GraphicsCommandList1_SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) \ - ( (This)->lpVtbl -> SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) ) + ( (This)->lpVtbl -> SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) ) #define ID3D12GraphicsCommandList1_ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) \ - ( (This)->lpVtbl -> ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) ) + ( (This)->lpVtbl -> ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) ) #define ID3D12GraphicsCommandList1_SetViewInstanceMask(This,Mask) \ - ( (This)->lpVtbl -> SetViewInstanceMask(This,Mask) ) + ( (This)->lpVtbl -> SetViewInstanceMask(This,Mask) ) #endif /* COBJMACROS */ @@ -6317,7 +6263,7 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList1; #endif /* __ID3D12GraphicsCommandList1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0018 */ -/* [local] */ +/* [local] */ typedef struct D3D12_WRITEBUFFERIMMEDIATE_PARAMETER { @@ -6325,7 +6271,7 @@ typedef struct D3D12_WRITEBUFFERIMMEDIATE_PARAMETER UINT32 Value; } D3D12_WRITEBUFFERIMMEDIATE_PARAMETER; -typedef +typedef enum D3D12_WRITEBUFFERIMMEDIATE_MODE { D3D12_WRITEBUFFERIMMEDIATE_MODE_DEFAULT = 0, @@ -6340,112 +6286,111 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0018_v0_0_s_ifspec; #define __ID3D12GraphicsCommandList2_INTERFACE_DEFINED__ /* interface ID3D12GraphicsCommandList2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("38C3E585-FF17-412C-9150-4FC6F9D72A28") ID3D12GraphicsCommandList2 : public ID3D12GraphicsCommandList1 { public: - virtual void STDMETHODCALLTYPE WriteBufferImmediate( + virtual void STDMETHODCALLTYPE WriteBufferImmediate( UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12GraphicsCommandList2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12GraphicsCommandList2 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12GraphicsCommandList2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12GraphicsCommandList2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12GraphicsCommandList2 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12GraphicsCommandList2 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12GraphicsCommandList2 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12GraphicsCommandList2 * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12GraphicsCommandList2 * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12GraphicsCommandList2 * This); - - HRESULT ( STDMETHODCALLTYPE *Close )( + + HRESULT ( STDMETHODCALLTYPE *Close )( ID3D12GraphicsCommandList2 * This); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12CommandAllocator *pAllocator, _In_opt_ ID3D12PipelineState *pInitialState); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D12GraphicsCommandList2 * This, _In_opt_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *DrawInstanced )( + + void ( STDMETHODCALLTYPE *DrawInstanced )( ID3D12GraphicsCommandList2 * This, _In_ UINT VertexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( + + void ( STDMETHODCALLTYPE *DrawIndexedInstanced )( ID3D12GraphicsCommandList2 * This, _In_ UINT IndexCountPerInstance, _In_ UINT InstanceCount, _In_ UINT StartIndexLocation, _In_ INT BaseVertexLocation, _In_ UINT StartInstanceLocation); - - void ( STDMETHODCALLTYPE *Dispatch )( + + void ( STDMETHODCALLTYPE *Dispatch )( ID3D12GraphicsCommandList2 * This, _In_ UINT ThreadGroupCountX, _In_ UINT ThreadGroupCountY, _In_ UINT ThreadGroupCountZ); - - void ( STDMETHODCALLTYPE *CopyBufferRegion )( + + void ( STDMETHODCALLTYPE *CopyBufferRegion )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, _In_ ID3D12Resource *pSrcBuffer, UINT64 SrcOffset, UINT64 NumBytes); - - void ( STDMETHODCALLTYPE *CopyTextureRegion )( + + void ( STDMETHODCALLTYPE *CopyTextureRegion )( ID3D12GraphicsCommandList2 * This, _In_ const D3D12_TEXTURE_COPY_LOCATION *pDst, UINT DstX, @@ -6453,13 +6398,13 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; UINT DstZ, _In_ const D3D12_TEXTURE_COPY_LOCATION *pSrc, _In_opt_ const D3D12_BOX *pSrcBox); - - void ( STDMETHODCALLTYPE *CopyResource )( + + void ( STDMETHODCALLTYPE *CopyResource )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstResource, _In_ ID3D12Resource *pSrcResource); - - void ( STDMETHODCALLTYPE *CopyTiles )( + + void ( STDMETHODCALLTYPE *CopyTiles )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pTiledResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pTileRegionStartCoordinate, @@ -6467,153 +6412,153 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ ID3D12Resource *pBuffer, UINT64 BufferStartOffsetInBytes, D3D12_TILE_COPY_FLAGS Flags); - - void ( STDMETHODCALLTYPE *ResolveSubresource )( + + void ( STDMETHODCALLTYPE *ResolveSubresource )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, _In_ ID3D12Resource *pSrcResource, _In_ UINT SrcSubresource, _In_ DXGI_FORMAT Format); - - void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( + + void ( STDMETHODCALLTYPE *IASetPrimitiveTopology )( ID3D12GraphicsCommandList2 * This, _In_ D3D12_PRIMITIVE_TOPOLOGY PrimitiveTopology); - - void ( STDMETHODCALLTYPE *RSSetViewports )( + + void ( STDMETHODCALLTYPE *RSSetViewports )( ID3D12GraphicsCommandList2 * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumViewports, _In_reads_( NumViewports) const D3D12_VIEWPORT *pViewports); - - void ( STDMETHODCALLTYPE *RSSetScissorRects )( + + void ( STDMETHODCALLTYPE *RSSetScissorRects )( ID3D12GraphicsCommandList2 * This, _In_range_(0, D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE) UINT NumRects, _In_reads_( NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *OMSetBlendFactor )( + + void ( STDMETHODCALLTYPE *OMSetBlendFactor )( ID3D12GraphicsCommandList2 * This, _In_reads_opt_(4) const FLOAT BlendFactor[ 4 ]); - - void ( STDMETHODCALLTYPE *OMSetStencilRef )( + + void ( STDMETHODCALLTYPE *OMSetStencilRef )( ID3D12GraphicsCommandList2 * This, _In_ UINT StencilRef); - - void ( STDMETHODCALLTYPE *SetPipelineState )( + + void ( STDMETHODCALLTYPE *SetPipelineState )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12PipelineState *pPipelineState); - - void ( STDMETHODCALLTYPE *ResourceBarrier )( + + void ( STDMETHODCALLTYPE *ResourceBarrier )( ID3D12GraphicsCommandList2 * This, _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers); - - void ( STDMETHODCALLTYPE *ExecuteBundle )( + + void ( STDMETHODCALLTYPE *ExecuteBundle )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12GraphicsCommandList *pCommandList); - - void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( + + void ( STDMETHODCALLTYPE *SetDescriptorHeaps )( ID3D12GraphicsCommandList2 * This, _In_ UINT NumDescriptorHeaps, _In_reads_(NumDescriptorHeaps) ID3D12DescriptorHeap *const *ppDescriptorHeaps); - - void ( STDMETHODCALLTYPE *SetComputeRootSignature )( + + void ( STDMETHODCALLTYPE *SetComputeRootSignature )( ID3D12GraphicsCommandList2 * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootSignature )( ID3D12GraphicsCommandList2 * This, _In_opt_ ID3D12RootSignature *pRootSignature); - - void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetComputeRootDescriptorTable )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootDescriptorTable )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_DESCRIPTOR_HANDLE BaseDescriptor); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstant )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstant )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ UINT SrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetComputeRoot32BitConstants )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( + + void ( STDMETHODCALLTYPE *SetGraphicsRoot32BitConstants )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ UINT Num32BitValuesToSet, _In_reads_(Num32BitValuesToSet*sizeof(UINT)) const void *pSrcData, _In_ UINT DestOffsetIn32BitValues); - - void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetComputeRootConstantBufferView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootConstantBufferView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetComputeRootShaderResourceView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootShaderResourceView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetComputeRootUnorderedAccessView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *SetGraphicsRootUnorderedAccessView )( ID3D12GraphicsCommandList2 * This, _In_ UINT RootParameterIndex, _In_ D3D12_GPU_VIRTUAL_ADDRESS BufferLocation); - - void ( STDMETHODCALLTYPE *IASetIndexBuffer )( + + void ( STDMETHODCALLTYPE *IASetIndexBuffer )( ID3D12GraphicsCommandList2 * This, _In_opt_ const D3D12_INDEX_BUFFER_VIEW *pView); - - void ( STDMETHODCALLTYPE *IASetVertexBuffers )( + + void ( STDMETHODCALLTYPE *IASetVertexBuffers )( ID3D12GraphicsCommandList2 * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_VERTEX_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *SOSetTargets )( + + void ( STDMETHODCALLTYPE *SOSetTargets )( ID3D12GraphicsCommandList2 * This, _In_ UINT StartSlot, _In_ UINT NumViews, _In_reads_opt_(NumViews) const D3D12_STREAM_OUTPUT_BUFFER_VIEW *pViews); - - void ( STDMETHODCALLTYPE *OMSetRenderTargets )( + + void ( STDMETHODCALLTYPE *OMSetRenderTargets )( ID3D12GraphicsCommandList2 * This, _In_ UINT NumRenderTargetDescriptors, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pRenderTargetDescriptors, _In_ BOOL RTsSingleHandleToDescriptorRange, _In_opt_ const D3D12_CPU_DESCRIPTOR_HANDLE *pDepthStencilDescriptor); - - void ( STDMETHODCALLTYPE *ClearDepthStencilView )( + + void ( STDMETHODCALLTYPE *ClearDepthStencilView )( ID3D12GraphicsCommandList2 * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DepthStencilView, _In_ D3D12_CLEAR_FLAGS ClearFlags, @@ -6621,15 +6566,15 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ UINT8 Stencil, _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearRenderTargetView )( + + void ( STDMETHODCALLTYPE *ClearRenderTargetView )( ID3D12GraphicsCommandList2 * This, _In_ D3D12_CPU_DESCRIPTOR_HANDLE RenderTargetView, _In_ const FLOAT ColorRGBA[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewUint )( ID3D12GraphicsCommandList2 * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -6637,8 +6582,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ const UINT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( + + void ( STDMETHODCALLTYPE *ClearUnorderedAccessViewFloat )( ID3D12GraphicsCommandList2 * This, _In_ D3D12_GPU_DESCRIPTOR_HANDLE ViewGPUHandleInCurrentHeap, _In_ D3D12_CPU_DESCRIPTOR_HANDLE ViewCPUHandle, @@ -6646,25 +6591,25 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ const FLOAT Values[ 4 ], _In_ UINT NumRects, _In_reads_(NumRects) const D3D12_RECT *pRects); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion); - - void ( STDMETHODCALLTYPE *BeginQuery )( + + void ( STDMETHODCALLTYPE *BeginQuery )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *EndQuery )( + + void ( STDMETHODCALLTYPE *EndQuery )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *ResolveQueryData )( + + void ( STDMETHODCALLTYPE *ResolveQueryData )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, @@ -6672,29 +6617,29 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D12GraphicsCommandList2 * This, _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12GraphicsCommandList2 * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12GraphicsCommandList2 * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12GraphicsCommandList2 * This); - - void ( STDMETHODCALLTYPE *ExecuteIndirect )( + + void ( STDMETHODCALLTYPE *ExecuteIndirect )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12CommandSignature *pCommandSignature, _In_ UINT MaxCommandCount, @@ -6702,8 +6647,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_ UINT64 ArgumentBufferOffset, _In_opt_ ID3D12Resource *pCountBuffer, _In_ UINT64 CountBufferOffset); - - void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT )( + + void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, @@ -6712,8 +6657,8 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges); - - void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT64 )( + + void ( STDMETHODCALLTYPE *AtomicCopyBufferUINT64 )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstBuffer, UINT64 DstOffset, @@ -6722,19 +6667,19 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; UINT Dependencies, _In_reads_(Dependencies) ID3D12Resource *const *ppDependentResources, _In_reads_(Dependencies) const D3D12_SUBRESOURCE_RANGE_UINT64 *pDependentSubresourceRanges); - - void ( STDMETHODCALLTYPE *OMSetDepthBounds )( + + void ( STDMETHODCALLTYPE *OMSetDepthBounds )( ID3D12GraphicsCommandList2 * This, _In_ FLOAT Min, _In_ FLOAT Max); - - void ( STDMETHODCALLTYPE *SetSamplePositions )( + + void ( STDMETHODCALLTYPE *SetSamplePositions )( ID3D12GraphicsCommandList2 * This, _In_ UINT NumSamplesPerPixel, _In_ UINT NumPixels, _In_reads_(NumSamplesPerPixel*NumPixels) D3D12_SAMPLE_POSITION *pSamplePositions); - - void ( STDMETHODCALLTYPE *ResolveSubresourceRegion )( + + void ( STDMETHODCALLTYPE *ResolveSubresourceRegion )( ID3D12GraphicsCommandList2 * This, _In_ ID3D12Resource *pDstResource, _In_ UINT DstSubresource, @@ -6745,17 +6690,17 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; _In_opt_ D3D12_RECT *pSrcRect, _In_ DXGI_FORMAT Format, _In_ D3D12_RESOLVE_MODE ResolveMode); - - void ( STDMETHODCALLTYPE *SetViewInstanceMask )( + + void ( STDMETHODCALLTYPE *SetViewInstanceMask )( ID3D12GraphicsCommandList2 * This, _In_ UINT Mask); - - void ( STDMETHODCALLTYPE *WriteBufferImmediate )( + + void ( STDMETHODCALLTYPE *WriteBufferImmediate )( ID3D12GraphicsCommandList2 * This, UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); - + END_INTERFACE } ID3D12GraphicsCommandList2Vtbl; @@ -6764,210 +6709,208 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; CONST_VTBL struct ID3D12GraphicsCommandList2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12GraphicsCommandList2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12GraphicsCommandList2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12GraphicsCommandList2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12GraphicsCommandList2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12GraphicsCommandList2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12GraphicsCommandList2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12GraphicsCommandList2_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12GraphicsCommandList2_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12GraphicsCommandList2_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D12GraphicsCommandList2_Close(This) \ - ( (This)->lpVtbl -> Close(This) ) + ( (This)->lpVtbl -> Close(This) ) #define ID3D12GraphicsCommandList2_Reset(This,pAllocator,pInitialState) \ - ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) + ( (This)->lpVtbl -> Reset(This,pAllocator,pInitialState) ) #define ID3D12GraphicsCommandList2_ClearState(This,pPipelineState) \ - ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) + ( (This)->lpVtbl -> ClearState(This,pPipelineState) ) #define ID3D12GraphicsCommandList2_DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawInstanced(This,VertexCountPerInstance,InstanceCount,StartVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList2_DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) \ - ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) + ( (This)->lpVtbl -> DrawIndexedInstanced(This,IndexCountPerInstance,InstanceCount,StartIndexLocation,BaseVertexLocation,StartInstanceLocation) ) #define ID3D12GraphicsCommandList2_Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) \ - ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) + ( (This)->lpVtbl -> Dispatch(This,ThreadGroupCountX,ThreadGroupCountY,ThreadGroupCountZ) ) #define ID3D12GraphicsCommandList2_CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) \ - ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) + ( (This)->lpVtbl -> CopyBufferRegion(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,NumBytes) ) #define ID3D12GraphicsCommandList2_CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) \ - ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) + ( (This)->lpVtbl -> CopyTextureRegion(This,pDst,DstX,DstY,DstZ,pSrc,pSrcBox) ) #define ID3D12GraphicsCommandList2_CopyResource(This,pDstResource,pSrcResource) \ - ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) + ( (This)->lpVtbl -> CopyResource(This,pDstResource,pSrcResource) ) #define ID3D12GraphicsCommandList2_CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) \ - ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) + ( (This)->lpVtbl -> CopyTiles(This,pTiledResource,pTileRegionStartCoordinate,pTileRegionSize,pBuffer,BufferStartOffsetInBytes,Flags) ) #define ID3D12GraphicsCommandList2_ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) \ - ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) + ( (This)->lpVtbl -> ResolveSubresource(This,pDstResource,DstSubresource,pSrcResource,SrcSubresource,Format) ) #define ID3D12GraphicsCommandList2_IASetPrimitiveTopology(This,PrimitiveTopology) \ - ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) + ( (This)->lpVtbl -> IASetPrimitiveTopology(This,PrimitiveTopology) ) #define ID3D12GraphicsCommandList2_RSSetViewports(This,NumViewports,pViewports) \ - ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) + ( (This)->lpVtbl -> RSSetViewports(This,NumViewports,pViewports) ) #define ID3D12GraphicsCommandList2_RSSetScissorRects(This,NumRects,pRects) \ - ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) + ( (This)->lpVtbl -> RSSetScissorRects(This,NumRects,pRects) ) #define ID3D12GraphicsCommandList2_OMSetBlendFactor(This,BlendFactor) \ - ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) + ( (This)->lpVtbl -> OMSetBlendFactor(This,BlendFactor) ) #define ID3D12GraphicsCommandList2_OMSetStencilRef(This,StencilRef) \ - ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) + ( (This)->lpVtbl -> OMSetStencilRef(This,StencilRef) ) #define ID3D12GraphicsCommandList2_SetPipelineState(This,pPipelineState) \ - ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) + ( (This)->lpVtbl -> SetPipelineState(This,pPipelineState) ) #define ID3D12GraphicsCommandList2_ResourceBarrier(This,NumBarriers,pBarriers) \ - ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) + ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) #define ID3D12GraphicsCommandList2_ExecuteBundle(This,pCommandList) \ - ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) + ( (This)->lpVtbl -> ExecuteBundle(This,pCommandList) ) #define ID3D12GraphicsCommandList2_SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) \ - ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) + ( (This)->lpVtbl -> SetDescriptorHeaps(This,NumDescriptorHeaps,ppDescriptorHeaps) ) #define ID3D12GraphicsCommandList2_SetComputeRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetComputeRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList2_SetGraphicsRootSignature(This,pRootSignature) \ - ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) + ( (This)->lpVtbl -> SetGraphicsRootSignature(This,pRootSignature) ) #define ID3D12GraphicsCommandList2_SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetComputeRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList2_SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) \ - ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) + ( (This)->lpVtbl -> SetGraphicsRootDescriptorTable(This,RootParameterIndex,BaseDescriptor) ) #define ID3D12GraphicsCommandList2_SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList2_SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstant(This,RootParameterIndex,SrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList2_SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetComputeRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList2_SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) \ - ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) + ( (This)->lpVtbl -> SetGraphicsRoot32BitConstants(This,RootParameterIndex,Num32BitValuesToSet,pSrcData,DestOffsetIn32BitValues) ) #define ID3D12GraphicsCommandList2_SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootConstantBufferView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootShaderResourceView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetComputeRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) \ - ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) + ( (This)->lpVtbl -> SetGraphicsRootUnorderedAccessView(This,RootParameterIndex,BufferLocation) ) #define ID3D12GraphicsCommandList2_IASetIndexBuffer(This,pView) \ - ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) + ( (This)->lpVtbl -> IASetIndexBuffer(This,pView) ) #define ID3D12GraphicsCommandList2_IASetVertexBuffers(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> IASetVertexBuffers(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList2_SOSetTargets(This,StartSlot,NumViews,pViews) \ - ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) + ( (This)->lpVtbl -> SOSetTargets(This,StartSlot,NumViews,pViews) ) #define ID3D12GraphicsCommandList2_OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) \ - ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) + ( (This)->lpVtbl -> OMSetRenderTargets(This,NumRenderTargetDescriptors,pRenderTargetDescriptors,RTsSingleHandleToDescriptorRange,pDepthStencilDescriptor) ) #define ID3D12GraphicsCommandList2_ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearDepthStencilView(This,DepthStencilView,ClearFlags,Depth,Stencil,NumRects,pRects) ) #define ID3D12GraphicsCommandList2_ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearRenderTargetView(This,RenderTargetView,ColorRGBA,NumRects,pRects) ) #define ID3D12GraphicsCommandList2_ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewUint(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList2_ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) \ - ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) + ( (This)->lpVtbl -> ClearUnorderedAccessViewFloat(This,ViewGPUHandleInCurrentHeap,ViewCPUHandle,pResource,Values,NumRects,pRects) ) #define ID3D12GraphicsCommandList2_DiscardResource(This,pResource,pRegion) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) #define ID3D12GraphicsCommandList2_BeginQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList2_EndQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) #define ID3D12GraphicsCommandList2_ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) \ - ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) + ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) #define ID3D12GraphicsCommandList2_SetPredication(This,pBuffer,AlignedBufferOffset,Operation) \ - ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) + ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) #define ID3D12GraphicsCommandList2_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList2_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12GraphicsCommandList2_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12GraphicsCommandList2_ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) \ - ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) + ( (This)->lpVtbl -> ExecuteIndirect(This,pCommandSignature,MaxCommandCount,pArgumentBuffer,ArgumentBufferOffset,pCountBuffer,CountBufferOffset) ) #define ID3D12GraphicsCommandList2_AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) \ - ( (This)->lpVtbl -> AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) + ( (This)->lpVtbl -> AtomicCopyBufferUINT(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) #define ID3D12GraphicsCommandList2_AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) \ - ( (This)->lpVtbl -> AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) + ( (This)->lpVtbl -> AtomicCopyBufferUINT64(This,pDstBuffer,DstOffset,pSrcBuffer,SrcOffset,Dependencies,ppDependentResources,pDependentSubresourceRanges) ) #define ID3D12GraphicsCommandList2_OMSetDepthBounds(This,Min,Max) \ - ( (This)->lpVtbl -> OMSetDepthBounds(This,Min,Max) ) + ( (This)->lpVtbl -> OMSetDepthBounds(This,Min,Max) ) #define ID3D12GraphicsCommandList2_SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) \ - ( (This)->lpVtbl -> SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) ) + ( (This)->lpVtbl -> SetSamplePositions(This,NumSamplesPerPixel,NumPixels,pSamplePositions) ) #define ID3D12GraphicsCommandList2_ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) \ - ( (This)->lpVtbl -> ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) ) + ( (This)->lpVtbl -> ResolveSubresourceRegion(This,pDstResource,DstSubresource,DstX,DstY,pSrcResource,SrcSubresource,pSrcRect,Format,ResolveMode) ) #define ID3D12GraphicsCommandList2_SetViewInstanceMask(This,Mask) \ - ( (This)->lpVtbl -> SetViewInstanceMask(This,Mask) ) + ( (This)->lpVtbl -> SetViewInstanceMask(This,Mask) ) #define ID3D12GraphicsCommandList2_WriteBufferImmediate(This,Count,pParams,pModes) \ - ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) + ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) #endif /* COBJMACROS */ @@ -6979,17 +6922,17 @@ EXTERN_C const IID IID_ID3D12GraphicsCommandList2; #define __ID3D12CommandQueue_INTERFACE_DEFINED__ /* interface ID3D12CommandQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12CommandQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0ec870a6-5d7e-4c22-8cfc-5baae07616ed") ID3D12CommandQueue : public ID3D12Pageable { public: - virtual void STDMETHODCALLTYPE UpdateTileMappings( + virtual void STDMETHODCALLTYPE UpdateTileMappings( _In_ ID3D12Resource *pResource, UINT NumResourceRegions, _In_reads_opt_(NumResourceRegions) const D3D12_TILED_RESOURCE_COORDINATE *pResourceRegionStartCoordinates, @@ -7000,95 +6943,94 @@ EXTERN_C const IID IID_ID3D12CommandQueue; _In_reads_opt_(NumRanges) const UINT *pHeapRangeStartOffsets, _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, D3D12_TILE_MAPPING_FLAGS Flags) = 0; - - virtual void STDMETHODCALLTYPE CopyTileMappings( + + virtual void STDMETHODCALLTYPE CopyTileMappings( _In_ ID3D12Resource *pDstResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pDstRegionStartCoordinate, _In_ ID3D12Resource *pSrcResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pSrcRegionStartCoordinate, _In_ const D3D12_TILE_REGION_SIZE *pRegionSize, D3D12_TILE_MAPPING_FLAGS Flags) = 0; - - virtual void STDMETHODCALLTYPE ExecuteCommandLists( + + virtual void STDMETHODCALLTYPE ExecuteCommandLists( _In_ UINT NumCommandLists, _In_reads_(NumCommandLists) ID3D12CommandList *const *ppCommandLists) = 0; - - virtual void STDMETHODCALLTYPE SetMarker( + + virtual void STDMETHODCALLTYPE SetMarker( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - - virtual void STDMETHODCALLTYPE BeginEvent( + + virtual void STDMETHODCALLTYPE BeginEvent( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - + virtual void STDMETHODCALLTYPE EndEvent( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Signal( + + virtual HRESULT STDMETHODCALLTYPE Signal( ID3D12Fence *pFence, UINT64 Value) = 0; - - virtual HRESULT STDMETHODCALLTYPE Wait( + + virtual HRESULT STDMETHODCALLTYPE Wait( ID3D12Fence *pFence, UINT64 Value) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTimestampFrequency( + + virtual HRESULT STDMETHODCALLTYPE GetTimestampFrequency( _Out_ UINT64 *pFrequency) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetClockCalibration( + + virtual HRESULT STDMETHODCALLTYPE GetClockCalibration( _Out_ UINT64 *pGpuTimestamp, _Out_ UINT64 *pCpuTimestamp) = 0; - + virtual D3D12_COMMAND_QUEUE_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12CommandQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12CommandQueue * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12CommandQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12CommandQueue * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12CommandQueue * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12CommandQueue * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12CommandQueue * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12CommandQueue * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12CommandQueue * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - void ( STDMETHODCALLTYPE *UpdateTileMappings )( + + void ( STDMETHODCALLTYPE *UpdateTileMappings )( ID3D12CommandQueue * This, _In_ ID3D12Resource *pResource, UINT NumResourceRegions, @@ -7100,8 +7042,8 @@ EXTERN_C const IID IID_ID3D12CommandQueue; _In_reads_opt_(NumRanges) const UINT *pHeapRangeStartOffsets, _In_reads_opt_(NumRanges) const UINT *pRangeTileCounts, D3D12_TILE_MAPPING_FLAGS Flags); - - void ( STDMETHODCALLTYPE *CopyTileMappings )( + + void ( STDMETHODCALLTYPE *CopyTileMappings )( ID3D12CommandQueue * This, _In_ ID3D12Resource *pDstResource, _In_ const D3D12_TILED_RESOURCE_COORDINATE *pDstRegionStartCoordinate, @@ -7109,49 +7051,49 @@ EXTERN_C const IID IID_ID3D12CommandQueue; _In_ const D3D12_TILED_RESOURCE_COORDINATE *pSrcRegionStartCoordinate, _In_ const D3D12_TILE_REGION_SIZE *pRegionSize, D3D12_TILE_MAPPING_FLAGS Flags); - - void ( STDMETHODCALLTYPE *ExecuteCommandLists )( + + void ( STDMETHODCALLTYPE *ExecuteCommandLists )( ID3D12CommandQueue * This, _In_ UINT NumCommandLists, _In_reads_(NumCommandLists) ID3D12CommandList *const *ppCommandLists); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12CommandQueue * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12CommandQueue * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12CommandQueue * This); - - HRESULT ( STDMETHODCALLTYPE *Signal )( + + HRESULT ( STDMETHODCALLTYPE *Signal )( ID3D12CommandQueue * This, ID3D12Fence *pFence, UINT64 Value); - - HRESULT ( STDMETHODCALLTYPE *Wait )( + + HRESULT ( STDMETHODCALLTYPE *Wait )( ID3D12CommandQueue * This, ID3D12Fence *pFence, UINT64 Value); - - HRESULT ( STDMETHODCALLTYPE *GetTimestampFrequency )( + + HRESULT ( STDMETHODCALLTYPE *GetTimestampFrequency )( ID3D12CommandQueue * This, _Out_ UINT64 *pFrequency); - - HRESULT ( STDMETHODCALLTYPE *GetClockCalibration )( + + HRESULT ( STDMETHODCALLTYPE *GetClockCalibration )( ID3D12CommandQueue * This, _Out_ UINT64 *pGpuTimestamp, _Out_ UINT64 *pCpuTimestamp); - - D3D12_COMMAND_QUEUE_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_COMMAND_QUEUE_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12CommandQueue * This); - + END_INTERFACE } ID3D12CommandQueueVtbl; @@ -7160,66 +7102,64 @@ EXTERN_C const IID IID_ID3D12CommandQueue; CONST_VTBL struct ID3D12CommandQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12CommandQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12CommandQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12CommandQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12CommandQueue_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12CommandQueue_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12CommandQueue_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12CommandQueue_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12CommandQueue_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12CommandQueue_UpdateTileMappings(This,pResource,NumResourceRegions,pResourceRegionStartCoordinates,pResourceRegionSizes,pHeap,NumRanges,pRangeFlags,pHeapRangeStartOffsets,pRangeTileCounts,Flags) \ - ( (This)->lpVtbl -> UpdateTileMappings(This,pResource,NumResourceRegions,pResourceRegionStartCoordinates,pResourceRegionSizes,pHeap,NumRanges,pRangeFlags,pHeapRangeStartOffsets,pRangeTileCounts,Flags) ) + ( (This)->lpVtbl -> UpdateTileMappings(This,pResource,NumResourceRegions,pResourceRegionStartCoordinates,pResourceRegionSizes,pHeap,NumRanges,pRangeFlags,pHeapRangeStartOffsets,pRangeTileCounts,Flags) ) #define ID3D12CommandQueue_CopyTileMappings(This,pDstResource,pDstRegionStartCoordinate,pSrcResource,pSrcRegionStartCoordinate,pRegionSize,Flags) \ - ( (This)->lpVtbl -> CopyTileMappings(This,pDstResource,pDstRegionStartCoordinate,pSrcResource,pSrcRegionStartCoordinate,pRegionSize,Flags) ) + ( (This)->lpVtbl -> CopyTileMappings(This,pDstResource,pDstRegionStartCoordinate,pSrcResource,pSrcRegionStartCoordinate,pRegionSize,Flags) ) #define ID3D12CommandQueue_ExecuteCommandLists(This,NumCommandLists,ppCommandLists) \ - ( (This)->lpVtbl -> ExecuteCommandLists(This,NumCommandLists,ppCommandLists) ) + ( (This)->lpVtbl -> ExecuteCommandLists(This,NumCommandLists,ppCommandLists) ) #define ID3D12CommandQueue_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12CommandQueue_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12CommandQueue_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12CommandQueue_Signal(This,pFence,Value) \ - ( (This)->lpVtbl -> Signal(This,pFence,Value) ) + ( (This)->lpVtbl -> Signal(This,pFence,Value) ) #define ID3D12CommandQueue_Wait(This,pFence,Value) \ - ( (This)->lpVtbl -> Wait(This,pFence,Value) ) + ( (This)->lpVtbl -> Wait(This,pFence,Value) ) #define ID3D12CommandQueue_GetTimestampFrequency(This,pFrequency) \ - ( (This)->lpVtbl -> GetTimestampFrequency(This,pFrequency) ) + ( (This)->lpVtbl -> GetTimestampFrequency(This,pFrequency) ) #define ID3D12CommandQueue_GetClockCalibration(This,pGpuTimestamp,pCpuTimestamp) \ - ( (This)->lpVtbl -> GetClockCalibration(This,pGpuTimestamp,pCpuTimestamp) ) + ( (This)->lpVtbl -> GetClockCalibration(This,pGpuTimestamp,pCpuTimestamp) ) #define ID3D12CommandQueue_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #endif /* COBJMACROS */ @@ -7228,7 +7168,7 @@ EXTERN_C const IID IID_ID3D12CommandQueue; #endif /* __ID3D12CommandQueue_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0020 */ -/* [local] */ +/* [local] */ #ifdef __midl #ifndef LUID_DEFINED @@ -7251,96 +7191,96 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0020_v0_0_s_ifspec; #define __ID3D12Device_INTERFACE_DEFINED__ /* interface ID3D12Device */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Device; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("189819f1-1db6-4b57-be54-1821339b85f7") ID3D12Device : public ID3D12Object { public: virtual UINT STDMETHODCALLTYPE GetNodeCount( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCommandQueue( + + virtual HRESULT STDMETHODCALLTYPE CreateCommandQueue( _In_ const D3D12_COMMAND_QUEUE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppCommandQueue) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCommandAllocator( + + virtual HRESULT STDMETHODCALLTYPE CreateCommandAllocator( _In_ D3D12_COMMAND_LIST_TYPE type, REFIID riid, _COM_Outptr_ void **ppCommandAllocator) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateGraphicsPipelineState( + + virtual HRESULT STDMETHODCALLTYPE CreateGraphicsPipelineState( _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateComputePipelineState( + + virtual HRESULT STDMETHODCALLTYPE CreateComputePipelineState( _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCommandList( + + virtual HRESULT STDMETHODCALLTYPE CreateCommandList( _In_ UINT nodeMask, _In_ D3D12_COMMAND_LIST_TYPE type, _In_ ID3D12CommandAllocator *pCommandAllocator, _In_opt_ ID3D12PipelineState *pInitialState, REFIID riid, _COM_Outptr_ void **ppCommandList) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( + + virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( D3D12_FEATURE Feature, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDescriptorHeap( + + virtual HRESULT STDMETHODCALLTYPE CreateDescriptorHeap( _In_ const D3D12_DESCRIPTOR_HEAP_DESC *pDescriptorHeapDesc, REFIID riid, _COM_Outptr_ void **ppvHeap) = 0; - - virtual UINT STDMETHODCALLTYPE GetDescriptorHandleIncrementSize( + + virtual UINT STDMETHODCALLTYPE GetDescriptorHandleIncrementSize( _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapType) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateRootSignature( + + virtual HRESULT STDMETHODCALLTYPE CreateRootSignature( _In_ UINT nodeMask, _In_reads_(blobLengthInBytes) const void *pBlobWithRootSignature, _In_ SIZE_T blobLengthInBytes, REFIID riid, _COM_Outptr_ void **ppvRootSignature) = 0; - - virtual void STDMETHODCALLTYPE CreateConstantBufferView( + + virtual void STDMETHODCALLTYPE CreateConstantBufferView( _In_opt_ const D3D12_CONSTANT_BUFFER_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CreateShaderResourceView( + + virtual void STDMETHODCALLTYPE CreateShaderResourceView( _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_SHADER_RESOURCE_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CreateUnorderedAccessView( + + virtual void STDMETHODCALLTYPE CreateUnorderedAccessView( _In_opt_ ID3D12Resource *pResource, _In_opt_ ID3D12Resource *pCounterResource, _In_opt_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CreateRenderTargetView( + + virtual void STDMETHODCALLTYPE CreateRenderTargetView( _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_RENDER_TARGET_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CreateDepthStencilView( + + virtual void STDMETHODCALLTYPE CreateDepthStencilView( _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_DEPTH_STENCIL_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CreateSampler( + + virtual void STDMETHODCALLTYPE CreateSampler( _In_ const D3D12_SAMPLER_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor) = 0; - - virtual void STDMETHODCALLTYPE CopyDescriptors( + + virtual void STDMETHODCALLTYPE CopyDescriptors( _In_ UINT NumDestDescriptorRanges, _In_reads_(NumDestDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pDestDescriptorRangeStarts, _In_reads_opt_(NumDestDescriptorRanges) const UINT *pDestDescriptorRangeSizes, @@ -7348,23 +7288,23 @@ EXTERN_C const IID IID_ID3D12Device; _In_reads_(NumSrcDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pSrcDescriptorRangeStarts, _In_reads_opt_(NumSrcDescriptorRanges) const UINT *pSrcDescriptorRangeSizes, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType) = 0; - - virtual void STDMETHODCALLTYPE CopyDescriptorsSimple( + + virtual void STDMETHODCALLTYPE CopyDescriptorsSimple( _In_ UINT NumDescriptors, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptorRangeStart, _In_ D3D12_CPU_DESCRIPTOR_HANDLE SrcDescriptorRangeStart, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType) = 0; - - virtual D3D12_RESOURCE_ALLOCATION_INFO STDMETHODCALLTYPE GetResourceAllocationInfo( + + virtual D3D12_RESOURCE_ALLOCATION_INFO STDMETHODCALLTYPE GetResourceAllocationInfo( _In_ UINT visibleMask, _In_ UINT numResourceDescs, _In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs) = 0; - - virtual D3D12_HEAP_PROPERTIES STDMETHODCALLTYPE GetCustomHeapProperties( + + virtual D3D12_HEAP_PROPERTIES STDMETHODCALLTYPE GetCustomHeapProperties( _In_ UINT nodeMask, D3D12_HEAP_TYPE heapType) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCommittedResource( + + virtual HRESULT STDMETHODCALLTYPE CreateCommittedResource( _In_ const D3D12_HEAP_PROPERTIES *pHeapProperties, D3D12_HEAP_FLAGS HeapFlags, _In_ const D3D12_RESOURCE_DESC *pDesc, @@ -7372,13 +7312,13 @@ EXTERN_C const IID IID_ID3D12Device; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riidResource, _COM_Outptr_opt_ void **ppvResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateHeap( + + virtual HRESULT STDMETHODCALLTYPE CreateHeap( _In_ const D3D12_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreatePlacedResource( + + virtual HRESULT STDMETHODCALLTYPE CreatePlacedResource( _In_ ID3D12Heap *pHeap, UINT64 HeapOffset, _In_ const D3D12_RESOURCE_DESC *pDesc, @@ -7386,49 +7326,49 @@ EXTERN_C const IID IID_ID3D12Device; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateReservedResource( + + virtual HRESULT STDMETHODCALLTYPE CreateReservedResource( _In_ const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( + + virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( _In_ ID3D12DeviceChild *pObject, _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, DWORD Access, _In_opt_ LPCWSTR Name, _Out_ HANDLE *pHandle) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedHandle( + + virtual HRESULT STDMETHODCALLTYPE OpenSharedHandle( _In_ HANDLE NTHandle, REFIID riid, _COM_Outptr_opt_ void **ppvObj) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenSharedHandleByName( + + virtual HRESULT STDMETHODCALLTYPE OpenSharedHandleByName( _In_ LPCWSTR Name, DWORD Access, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pNTHandle) = 0; - - virtual HRESULT STDMETHODCALLTYPE MakeResident( + + virtual HRESULT STDMETHODCALLTYPE MakeResident( UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects) = 0; - - virtual HRESULT STDMETHODCALLTYPE Evict( + + virtual HRESULT STDMETHODCALLTYPE Evict( UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateFence( + + virtual HRESULT STDMETHODCALLTYPE CreateFence( UINT64 InitialValue, D3D12_FENCE_FLAGS Flags, REFIID riid, _COM_Outptr_ void **ppFence) = 0; - + virtual HRESULT STDMETHODCALLTYPE GetDeviceRemovedReason( void) = 0; - - virtual void STDMETHODCALLTYPE GetCopyableFootprints( + + virtual void STDMETHODCALLTYPE GetCopyableFootprints( _In_ const D3D12_RESOURCE_DESC *pResourceDesc, _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, _In_range_(0,D3D12_REQ_SUBRESOURCES-FirstSubresource) UINT NumSubresources, @@ -7437,22 +7377,22 @@ EXTERN_C const IID IID_ID3D12Device; _Out_writes_opt_(NumSubresources) UINT *pNumRows, _Out_writes_opt_(NumSubresources) UINT64 *pRowSizeInBytes, _Out_opt_ UINT64 *pTotalBytes) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateQueryHeap( + + virtual HRESULT STDMETHODCALLTYPE CreateQueryHeap( _In_ const D3D12_QUERY_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetStablePowerState( + + virtual HRESULT STDMETHODCALLTYPE SetStablePowerState( BOOL Enable) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateCommandSignature( + + virtual HRESULT STDMETHODCALLTYPE CreateCommandSignature( _In_ const D3D12_COMMAND_SIGNATURE_DESC *pDesc, _In_opt_ ID3D12RootSignature *pRootSignature, REFIID riid, _COM_Outptr_opt_ void **ppvCommandSignature) = 0; - - virtual void STDMETHODCALLTYPE GetResourceTiling( + + virtual void STDMETHODCALLTYPE GetResourceTiling( _In_ ID3D12Resource *pTiledResource, _Out_opt_ UINT *pNumTilesForEntireResource, _Out_opt_ D3D12_PACKED_MIP_INFO *pPackedMipDesc, @@ -7460,78 +7400,77 @@ EXTERN_C const IID IID_ID3D12Device; _Inout_opt_ UINT *pNumSubresourceTilings, _In_ UINT FirstSubresourceTilingToGet, _Out_writes_(*pNumSubresourceTilings) D3D12_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips) = 0; - + virtual LUID STDMETHODCALLTYPE GetAdapterLuid( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Device * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Device * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Device * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Device * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Device * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Device * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Device * This, _In_z_ LPCWSTR Name); - - UINT ( STDMETHODCALLTYPE *GetNodeCount )( + + UINT ( STDMETHODCALLTYPE *GetNodeCount )( ID3D12Device * This); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( ID3D12Device * This, _In_ const D3D12_COMMAND_QUEUE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppCommandQueue); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( ID3D12Device * This, _In_ D3D12_COMMAND_LIST_TYPE type, REFIID riid, _COM_Outptr_ void **ppCommandAllocator); - - HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( ID3D12Device * This, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( ID3D12Device * This, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( ID3D12Device * This, _In_ UINT nodeMask, _In_ D3D12_COMMAND_LIST_TYPE type, @@ -7539,67 +7478,67 @@ EXTERN_C const IID IID_ID3D12Device; _In_opt_ ID3D12PipelineState *pInitialState, REFIID riid, _COM_Outptr_ void **ppCommandList); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D12Device * This, D3D12_FEATURE Feature, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( ID3D12Device * This, _In_ const D3D12_DESCRIPTOR_HEAP_DESC *pDescriptorHeapDesc, REFIID riid, _COM_Outptr_ void **ppvHeap); - - UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( + + UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( ID3D12Device * This, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapType); - - HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( ID3D12Device * This, _In_ UINT nodeMask, _In_reads_(blobLengthInBytes) const void *pBlobWithRootSignature, _In_ SIZE_T blobLengthInBytes, REFIID riid, _COM_Outptr_ void **ppvRootSignature); - - void ( STDMETHODCALLTYPE *CreateConstantBufferView )( + + void ( STDMETHODCALLTYPE *CreateConstantBufferView )( ID3D12Device * This, _In_opt_ const D3D12_CONSTANT_BUFFER_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + void ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D12Device * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_SHADER_RESOURCE_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D12Device * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ ID3D12Resource *pCounterResource, _In_opt_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + void ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D12Device * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_RENDER_TARGET_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + void ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D12Device * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_DEPTH_STENCIL_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateSampler )( + + void ( STDMETHODCALLTYPE *CreateSampler )( ID3D12Device * This, _In_ const D3D12_SAMPLER_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CopyDescriptors )( + + void ( STDMETHODCALLTYPE *CopyDescriptors )( ID3D12Device * This, _In_ UINT NumDestDescriptorRanges, _In_reads_(NumDestDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pDestDescriptorRangeStarts, @@ -7608,26 +7547,26 @@ EXTERN_C const IID IID_ID3D12Device; _In_reads_(NumSrcDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pSrcDescriptorRangeStarts, _In_reads_opt_(NumSrcDescriptorRanges) const UINT *pSrcDescriptorRangeSizes, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( + + void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( ID3D12Device * This, _In_ UINT NumDescriptors, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptorRangeStart, _In_ D3D12_CPU_DESCRIPTOR_HANDLE SrcDescriptorRangeStart, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( + + D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( ID3D12Device * This, _In_ UINT visibleMask, _In_ UINT numResourceDescs, _In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs); - - D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( + + D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( ID3D12Device * This, _In_ UINT nodeMask, D3D12_HEAP_TYPE heapType); - - HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( ID3D12Device * This, _In_ const D3D12_HEAP_PROPERTIES *pHeapProperties, D3D12_HEAP_FLAGS HeapFlags, @@ -7636,14 +7575,14 @@ EXTERN_C const IID IID_ID3D12Device; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riidResource, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateHeap )( ID3D12Device * This, _In_ const D3D12_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( ID3D12Device * This, _In_ ID3D12Heap *pHeap, UINT64 HeapOffset, @@ -7652,57 +7591,57 @@ EXTERN_C const IID IID_ID3D12Device; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( ID3D12Device * This, _In_ const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( ID3D12Device * This, _In_ ID3D12DeviceChild *pObject, _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, DWORD Access, _In_opt_ LPCWSTR Name, _Out_ HANDLE *pHandle); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( ID3D12Device * This, _In_ HANDLE NTHandle, REFIID riid, _COM_Outptr_opt_ void **ppvObj); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( ID3D12Device * This, _In_ LPCWSTR Name, DWORD Access, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pNTHandle); - - HRESULT ( STDMETHODCALLTYPE *MakeResident )( + + HRESULT ( STDMETHODCALLTYPE *MakeResident )( ID3D12Device * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *Evict )( + + HRESULT ( STDMETHODCALLTYPE *Evict )( ID3D12Device * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *CreateFence )( + + HRESULT ( STDMETHODCALLTYPE *CreateFence )( ID3D12Device * This, UINT64 InitialValue, D3D12_FENCE_FLAGS Flags, REFIID riid, _COM_Outptr_ void **ppFence); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D12Device * This); - - void ( STDMETHODCALLTYPE *GetCopyableFootprints )( + + void ( STDMETHODCALLTYPE *GetCopyableFootprints )( ID3D12Device * This, _In_ const D3D12_RESOURCE_DESC *pResourceDesc, _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, @@ -7712,25 +7651,25 @@ EXTERN_C const IID IID_ID3D12Device; _Out_writes_opt_(NumSubresources) UINT *pNumRows, _Out_writes_opt_(NumSubresources) UINT64 *pRowSizeInBytes, _Out_opt_ UINT64 *pTotalBytes); - - HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( ID3D12Device * This, _In_ const D3D12_QUERY_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( + + HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( ID3D12Device * This, BOOL Enable); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( ID3D12Device * This, _In_ const D3D12_COMMAND_SIGNATURE_DESC *pDesc, _In_opt_ ID3D12RootSignature *pRootSignature, REFIID riid, _COM_Outptr_opt_ void **ppvCommandSignature); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D12Device * This, _In_ ID3D12Resource *pTiledResource, _Out_opt_ UINT *pNumTilesForEntireResource, @@ -7739,10 +7678,10 @@ EXTERN_C const IID IID_ID3D12Device; _Inout_opt_ UINT *pNumSubresourceTilings, _In_ UINT FirstSubresourceTilingToGet, _Out_writes_(*pNumSubresourceTilings) D3D12_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( + + LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( ID3D12Device * This); - + END_INTERFACE } ID3D12DeviceVtbl; @@ -7751,141 +7690,139 @@ EXTERN_C const IID IID_ID3D12Device; CONST_VTBL struct ID3D12DeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Device_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Device_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Device_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Device_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Device_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Device_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Device_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Device_GetNodeCount(This) \ - ( (This)->lpVtbl -> GetNodeCount(This) ) + ( (This)->lpVtbl -> GetNodeCount(This) ) #define ID3D12Device_CreateCommandQueue(This,pDesc,riid,ppCommandQueue) \ - ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) + ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) #define ID3D12Device_CreateCommandAllocator(This,type,riid,ppCommandAllocator) \ - ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) + ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) #define ID3D12Device_CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device_CreateComputePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device_CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) \ - ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) + ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) #define ID3D12Device_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D12Device_CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) #define ID3D12Device_GetDescriptorHandleIncrementSize(This,DescriptorHeapType) \ - ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) + ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) #define ID3D12Device_CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) \ - ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) + ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) #define ID3D12Device_CreateConstantBufferView(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) #define ID3D12Device_CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device_CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) #define ID3D12Device_CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device_CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device_CreateSampler(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) #define ID3D12Device_CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) #define ID3D12Device_CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) #define ID3D12Device_GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) \ - ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) + ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) #define ID3D12Device_GetCustomHeapProperties(This,nodeMask,heapType) \ - ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) + ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) #define ID3D12Device_CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) \ - ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) + ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) #define ID3D12Device_CreateHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device_CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device_CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device_CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) #define ID3D12Device_OpenSharedHandle(This,NTHandle,riid,ppvObj) \ - ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) + ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) #define ID3D12Device_OpenSharedHandleByName(This,Name,Access,pNTHandle) \ - ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) + ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) #define ID3D12Device_MakeResident(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) #define ID3D12Device_Evict(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) #define ID3D12Device_CreateFence(This,InitialValue,Flags,riid,ppFence) \ - ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) + ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) #define ID3D12Device_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D12Device_GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) \ - ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) + ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) #define ID3D12Device_CreateQueryHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device_SetStablePowerState(This,Enable) \ - ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) + ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) #define ID3D12Device_CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) \ - ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) + ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) #define ID3D12Device_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D12Device_GetAdapterLuid(This) \ - ( (This)->lpVtbl -> GetAdapterLuid(This) ) + ( (This)->lpVtbl -> GetAdapterLuid(This) ) #endif /* COBJMACROS */ @@ -7897,111 +7834,110 @@ EXTERN_C const IID IID_ID3D12Device; #define __ID3D12PipelineLibrary_INTERFACE_DEFINED__ /* interface ID3D12PipelineLibrary */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12PipelineLibrary; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c64226a8-9201-46af-b4cc-53fb9ff7414f") ID3D12PipelineLibrary : public ID3D12DeviceChild { public: - virtual HRESULT STDMETHODCALLTYPE StorePipeline( + virtual HRESULT STDMETHODCALLTYPE StorePipeline( _In_opt_ LPCWSTR pName, _In_ ID3D12PipelineState *pPipeline) = 0; - - virtual HRESULT STDMETHODCALLTYPE LoadGraphicsPipeline( + + virtual HRESULT STDMETHODCALLTYPE LoadGraphicsPipeline( _In_ LPCWSTR pName, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - - virtual HRESULT STDMETHODCALLTYPE LoadComputePipeline( + + virtual HRESULT STDMETHODCALLTYPE LoadComputePipeline( _In_ LPCWSTR pName, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - + virtual SIZE_T STDMETHODCALLTYPE GetSerializedSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Serialize( + + virtual HRESULT STDMETHODCALLTYPE Serialize( _Out_writes_(DataSizeInBytes) void *pData, SIZE_T DataSizeInBytes) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12PipelineLibraryVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12PipelineLibrary * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12PipelineLibrary * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12PipelineLibrary * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12PipelineLibrary * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12PipelineLibrary * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12PipelineLibrary * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12PipelineLibrary * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12PipelineLibrary * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - HRESULT ( STDMETHODCALLTYPE *StorePipeline )( + + HRESULT ( STDMETHODCALLTYPE *StorePipeline )( ID3D12PipelineLibrary * This, _In_opt_ LPCWSTR pName, _In_ ID3D12PipelineState *pPipeline); - - HRESULT ( STDMETHODCALLTYPE *LoadGraphicsPipeline )( + + HRESULT ( STDMETHODCALLTYPE *LoadGraphicsPipeline )( ID3D12PipelineLibrary * This, _In_ LPCWSTR pName, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *LoadComputePipeline )( + + HRESULT ( STDMETHODCALLTYPE *LoadComputePipeline )( ID3D12PipelineLibrary * This, _In_ LPCWSTR pName, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - SIZE_T ( STDMETHODCALLTYPE *GetSerializedSize )( + + SIZE_T ( STDMETHODCALLTYPE *GetSerializedSize )( ID3D12PipelineLibrary * This); - - HRESULT ( STDMETHODCALLTYPE *Serialize )( + + HRESULT ( STDMETHODCALLTYPE *Serialize )( ID3D12PipelineLibrary * This, _Out_writes_(DataSizeInBytes) void *pData, SIZE_T DataSizeInBytes); - + END_INTERFACE } ID3D12PipelineLibraryVtbl; @@ -8010,48 +7946,46 @@ EXTERN_C const IID IID_ID3D12PipelineLibrary; CONST_VTBL struct ID3D12PipelineLibraryVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12PipelineLibrary_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12PipelineLibrary_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12PipelineLibrary_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12PipelineLibrary_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12PipelineLibrary_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12PipelineLibrary_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12PipelineLibrary_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12PipelineLibrary_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12PipelineLibrary_StorePipeline(This,pName,pPipeline) \ - ( (This)->lpVtbl -> StorePipeline(This,pName,pPipeline) ) + ( (This)->lpVtbl -> StorePipeline(This,pName,pPipeline) ) #define ID3D12PipelineLibrary_LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) ) #define ID3D12PipelineLibrary_LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) ) #define ID3D12PipelineLibrary_GetSerializedSize(This) \ - ( (This)->lpVtbl -> GetSerializedSize(This) ) + ( (This)->lpVtbl -> GetSerializedSize(This) ) #define ID3D12PipelineLibrary_Serialize(This,pData,DataSizeInBytes) \ - ( (This)->lpVtbl -> Serialize(This,pData,DataSizeInBytes) ) + ( (This)->lpVtbl -> Serialize(This,pData,DataSizeInBytes) ) #endif /* COBJMACROS */ @@ -8063,102 +7997,101 @@ EXTERN_C const IID IID_ID3D12PipelineLibrary; #define __ID3D12PipelineLibrary1_INTERFACE_DEFINED__ /* interface ID3D12PipelineLibrary1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12PipelineLibrary1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("80eabf42-2568-4e5e-bd82-c37f86961dc3") ID3D12PipelineLibrary1 : public ID3D12PipelineLibrary { public: - virtual HRESULT STDMETHODCALLTYPE LoadPipeline( + virtual HRESULT STDMETHODCALLTYPE LoadPipeline( _In_ LPCWSTR pName, _In_ const D3D12_PIPELINE_STATE_STREAM_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12PipelineLibrary1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12PipelineLibrary1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12PipelineLibrary1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12PipelineLibrary1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12PipelineLibrary1 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12PipelineLibrary1 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12PipelineLibrary1 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12PipelineLibrary1 * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12PipelineLibrary1 * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - HRESULT ( STDMETHODCALLTYPE *StorePipeline )( + + HRESULT ( STDMETHODCALLTYPE *StorePipeline )( ID3D12PipelineLibrary1 * This, _In_opt_ LPCWSTR pName, _In_ ID3D12PipelineState *pPipeline); - - HRESULT ( STDMETHODCALLTYPE *LoadGraphicsPipeline )( + + HRESULT ( STDMETHODCALLTYPE *LoadGraphicsPipeline )( ID3D12PipelineLibrary1 * This, _In_ LPCWSTR pName, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *LoadComputePipeline )( + + HRESULT ( STDMETHODCALLTYPE *LoadComputePipeline )( ID3D12PipelineLibrary1 * This, _In_ LPCWSTR pName, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - SIZE_T ( STDMETHODCALLTYPE *GetSerializedSize )( + + SIZE_T ( STDMETHODCALLTYPE *GetSerializedSize )( ID3D12PipelineLibrary1 * This); - - HRESULT ( STDMETHODCALLTYPE *Serialize )( + + HRESULT ( STDMETHODCALLTYPE *Serialize )( ID3D12PipelineLibrary1 * This, _Out_writes_(DataSizeInBytes) void *pData, SIZE_T DataSizeInBytes); - - HRESULT ( STDMETHODCALLTYPE *LoadPipeline )( + + HRESULT ( STDMETHODCALLTYPE *LoadPipeline )( ID3D12PipelineLibrary1 * This, _In_ LPCWSTR pName, _In_ const D3D12_PIPELINE_STATE_STREAM_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - + END_INTERFACE } ID3D12PipelineLibrary1Vtbl; @@ -8167,51 +8100,49 @@ EXTERN_C const IID IID_ID3D12PipelineLibrary1; CONST_VTBL struct ID3D12PipelineLibrary1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12PipelineLibrary1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12PipelineLibrary1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12PipelineLibrary1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12PipelineLibrary1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12PipelineLibrary1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12PipelineLibrary1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12PipelineLibrary1_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12PipelineLibrary1_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12PipelineLibrary1_StorePipeline(This,pName,pPipeline) \ - ( (This)->lpVtbl -> StorePipeline(This,pName,pPipeline) ) + ( (This)->lpVtbl -> StorePipeline(This,pName,pPipeline) ) #define ID3D12PipelineLibrary1_LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> LoadGraphicsPipeline(This,pName,pDesc,riid,ppPipelineState) ) #define ID3D12PipelineLibrary1_LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> LoadComputePipeline(This,pName,pDesc,riid,ppPipelineState) ) #define ID3D12PipelineLibrary1_GetSerializedSize(This) \ - ( (This)->lpVtbl -> GetSerializedSize(This) ) + ( (This)->lpVtbl -> GetSerializedSize(This) ) #define ID3D12PipelineLibrary1_Serialize(This,pData,DataSizeInBytes) \ - ( (This)->lpVtbl -> Serialize(This,pData,DataSizeInBytes) ) + ( (This)->lpVtbl -> Serialize(This,pData,DataSizeInBytes) ) #define ID3D12PipelineLibrary1_LoadPipeline(This,pName,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> LoadPipeline(This,pName,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> LoadPipeline(This,pName,pDesc,riid,ppPipelineState) ) #endif /* COBJMACROS */ @@ -8220,9 +8151,9 @@ EXTERN_C const IID IID_ID3D12PipelineLibrary1; #endif /* __ID3D12PipelineLibrary1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0023 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_MULTIPLE_FENCE_WAIT_FLAGS { D3D12_MULTIPLE_FENCE_WAIT_FLAG_NONE = 0, @@ -8231,7 +8162,7 @@ enum D3D12_MULTIPLE_FENCE_WAIT_FLAGS } D3D12_MULTIPLE_FENCE_WAIT_FLAGS; DEFINE_ENUM_FLAG_OPERATORS( D3D12_MULTIPLE_FENCE_WAIT_FLAGS ); -typedef +typedef enum D3D12_RESIDENCY_PRIORITY { D3D12_RESIDENCY_PRIORITY_MINIMUM = 0x28000000, @@ -8248,103 +8179,102 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0023_v0_0_s_ifspec; #define __ID3D12Device1_INTERFACE_DEFINED__ /* interface ID3D12Device1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Device1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("77acce80-638e-4e65-8895-c1f23386863e") ID3D12Device1 : public ID3D12Device { public: - virtual HRESULT STDMETHODCALLTYPE CreatePipelineLibrary( + virtual HRESULT STDMETHODCALLTYPE CreatePipelineLibrary( _In_reads_(BlobLength) const void *pLibraryBlob, SIZE_T BlobLength, REFIID riid, _COM_Outptr_ void **ppPipelineLibrary) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetEventOnMultipleFenceCompletion( + + virtual HRESULT STDMETHODCALLTYPE SetEventOnMultipleFenceCompletion( _In_reads_(NumFences) ID3D12Fence *const *ppFences, _In_reads_(NumFences) const UINT64 *pFenceValues, UINT NumFences, D3D12_MULTIPLE_FENCE_WAIT_FLAGS Flags, HANDLE hEvent) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetResidencyPriority( + + virtual HRESULT STDMETHODCALLTYPE SetResidencyPriority( UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_reads_(NumObjects) const D3D12_RESIDENCY_PRIORITY *pPriorities) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Device1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Device1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Device1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Device1 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Device1 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Device1 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Device1 * This, _In_z_ LPCWSTR Name); - - UINT ( STDMETHODCALLTYPE *GetNodeCount )( + + UINT ( STDMETHODCALLTYPE *GetNodeCount )( ID3D12Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( ID3D12Device1 * This, _In_ const D3D12_COMMAND_QUEUE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppCommandQueue); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( ID3D12Device1 * This, _In_ D3D12_COMMAND_LIST_TYPE type, REFIID riid, _COM_Outptr_ void **ppCommandAllocator); - - HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( ID3D12Device1 * This, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( ID3D12Device1 * This, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( ID3D12Device1 * This, _In_ UINT nodeMask, _In_ D3D12_COMMAND_LIST_TYPE type, @@ -8352,67 +8282,67 @@ EXTERN_C const IID IID_ID3D12Device1; _In_opt_ ID3D12PipelineState *pInitialState, REFIID riid, _COM_Outptr_ void **ppCommandList); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D12Device1 * This, D3D12_FEATURE Feature, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( ID3D12Device1 * This, _In_ const D3D12_DESCRIPTOR_HEAP_DESC *pDescriptorHeapDesc, REFIID riid, _COM_Outptr_ void **ppvHeap); - - UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( + + UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( ID3D12Device1 * This, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapType); - - HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( ID3D12Device1 * This, _In_ UINT nodeMask, _In_reads_(blobLengthInBytes) const void *pBlobWithRootSignature, _In_ SIZE_T blobLengthInBytes, REFIID riid, _COM_Outptr_ void **ppvRootSignature); - - void ( STDMETHODCALLTYPE *CreateConstantBufferView )( + + void ( STDMETHODCALLTYPE *CreateConstantBufferView )( ID3D12Device1 * This, _In_opt_ const D3D12_CONSTANT_BUFFER_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + void ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D12Device1 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_SHADER_RESOURCE_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D12Device1 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ ID3D12Resource *pCounterResource, _In_opt_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + void ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D12Device1 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_RENDER_TARGET_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + void ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D12Device1 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_DEPTH_STENCIL_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateSampler )( + + void ( STDMETHODCALLTYPE *CreateSampler )( ID3D12Device1 * This, _In_ const D3D12_SAMPLER_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CopyDescriptors )( + + void ( STDMETHODCALLTYPE *CopyDescriptors )( ID3D12Device1 * This, _In_ UINT NumDestDescriptorRanges, _In_reads_(NumDestDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pDestDescriptorRangeStarts, @@ -8421,26 +8351,26 @@ EXTERN_C const IID IID_ID3D12Device1; _In_reads_(NumSrcDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pSrcDescriptorRangeStarts, _In_reads_opt_(NumSrcDescriptorRanges) const UINT *pSrcDescriptorRangeSizes, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( + + void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( ID3D12Device1 * This, _In_ UINT NumDescriptors, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptorRangeStart, _In_ D3D12_CPU_DESCRIPTOR_HANDLE SrcDescriptorRangeStart, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( + + D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( ID3D12Device1 * This, _In_ UINT visibleMask, _In_ UINT numResourceDescs, _In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs); - - D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( + + D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( ID3D12Device1 * This, _In_ UINT nodeMask, D3D12_HEAP_TYPE heapType); - - HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( ID3D12Device1 * This, _In_ const D3D12_HEAP_PROPERTIES *pHeapProperties, D3D12_HEAP_FLAGS HeapFlags, @@ -8449,14 +8379,14 @@ EXTERN_C const IID IID_ID3D12Device1; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riidResource, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateHeap )( ID3D12Device1 * This, _In_ const D3D12_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( ID3D12Device1 * This, _In_ ID3D12Heap *pHeap, UINT64 HeapOffset, @@ -8465,57 +8395,57 @@ EXTERN_C const IID IID_ID3D12Device1; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( ID3D12Device1 * This, _In_ const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( ID3D12Device1 * This, _In_ ID3D12DeviceChild *pObject, _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, DWORD Access, _In_opt_ LPCWSTR Name, _Out_ HANDLE *pHandle); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( ID3D12Device1 * This, _In_ HANDLE NTHandle, REFIID riid, _COM_Outptr_opt_ void **ppvObj); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( ID3D12Device1 * This, _In_ LPCWSTR Name, DWORD Access, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pNTHandle); - - HRESULT ( STDMETHODCALLTYPE *MakeResident )( + + HRESULT ( STDMETHODCALLTYPE *MakeResident )( ID3D12Device1 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *Evict )( + + HRESULT ( STDMETHODCALLTYPE *Evict )( ID3D12Device1 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *CreateFence )( + + HRESULT ( STDMETHODCALLTYPE *CreateFence )( ID3D12Device1 * This, UINT64 InitialValue, D3D12_FENCE_FLAGS Flags, REFIID riid, _COM_Outptr_ void **ppFence); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D12Device1 * This); - - void ( STDMETHODCALLTYPE *GetCopyableFootprints )( + + void ( STDMETHODCALLTYPE *GetCopyableFootprints )( ID3D12Device1 * This, _In_ const D3D12_RESOURCE_DESC *pResourceDesc, _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, @@ -8525,25 +8455,25 @@ EXTERN_C const IID IID_ID3D12Device1; _Out_writes_opt_(NumSubresources) UINT *pNumRows, _Out_writes_opt_(NumSubresources) UINT64 *pRowSizeInBytes, _Out_opt_ UINT64 *pTotalBytes); - - HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( ID3D12Device1 * This, _In_ const D3D12_QUERY_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( + + HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( ID3D12Device1 * This, BOOL Enable); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( ID3D12Device1 * This, _In_ const D3D12_COMMAND_SIGNATURE_DESC *pDesc, _In_opt_ ID3D12RootSignature *pRootSignature, REFIID riid, _COM_Outptr_opt_ void **ppvCommandSignature); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D12Device1 * This, _In_ ID3D12Resource *pTiledResource, _Out_opt_ UINT *pNumTilesForEntireResource, @@ -8552,31 +8482,31 @@ EXTERN_C const IID IID_ID3D12Device1; _Inout_opt_ UINT *pNumSubresourceTilings, _In_ UINT FirstSubresourceTilingToGet, _Out_writes_(*pNumSubresourceTilings) D3D12_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( + + LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( ID3D12Device1 * This); - - HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( + + HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( ID3D12Device1 * This, _In_reads_(BlobLength) const void *pLibraryBlob, SIZE_T BlobLength, REFIID riid, _COM_Outptr_ void **ppPipelineLibrary); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( ID3D12Device1 * This, _In_reads_(NumFences) ID3D12Fence *const *ppFences, _In_reads_(NumFences) const UINT64 *pFenceValues, UINT NumFences, D3D12_MULTIPLE_FENCE_WAIT_FLAGS Flags, HANDLE hEvent); - - HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( ID3D12Device1 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_reads_(NumObjects) const D3D12_RESIDENCY_PRIORITY *pPriorities); - + END_INTERFACE } ID3D12Device1Vtbl; @@ -8585,150 +8515,148 @@ EXTERN_C const IID IID_ID3D12Device1; CONST_VTBL struct ID3D12Device1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Device1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Device1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Device1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Device1_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Device1_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Device1_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Device1_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Device1_GetNodeCount(This) \ - ( (This)->lpVtbl -> GetNodeCount(This) ) + ( (This)->lpVtbl -> GetNodeCount(This) ) #define ID3D12Device1_CreateCommandQueue(This,pDesc,riid,ppCommandQueue) \ - ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) + ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) #define ID3D12Device1_CreateCommandAllocator(This,type,riid,ppCommandAllocator) \ - ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) + ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) #define ID3D12Device1_CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device1_CreateComputePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device1_CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) \ - ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) + ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) #define ID3D12Device1_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D12Device1_CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) #define ID3D12Device1_GetDescriptorHandleIncrementSize(This,DescriptorHeapType) \ - ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) + ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) #define ID3D12Device1_CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) \ - ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) + ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) #define ID3D12Device1_CreateConstantBufferView(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) #define ID3D12Device1_CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device1_CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) #define ID3D12Device1_CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device1_CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device1_CreateSampler(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) #define ID3D12Device1_CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) #define ID3D12Device1_CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) #define ID3D12Device1_GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) \ - ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) + ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) #define ID3D12Device1_GetCustomHeapProperties(This,nodeMask,heapType) \ - ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) + ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) #define ID3D12Device1_CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) \ - ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) + ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) #define ID3D12Device1_CreateHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device1_CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device1_CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device1_CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) #define ID3D12Device1_OpenSharedHandle(This,NTHandle,riid,ppvObj) \ - ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) + ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) #define ID3D12Device1_OpenSharedHandleByName(This,Name,Access,pNTHandle) \ - ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) + ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) #define ID3D12Device1_MakeResident(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) #define ID3D12Device1_Evict(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) #define ID3D12Device1_CreateFence(This,InitialValue,Flags,riid,ppFence) \ - ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) + ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) #define ID3D12Device1_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D12Device1_GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) \ - ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) + ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) #define ID3D12Device1_CreateQueryHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device1_SetStablePowerState(This,Enable) \ - ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) + ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) #define ID3D12Device1_CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) \ - ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) + ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) #define ID3D12Device1_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D12Device1_GetAdapterLuid(This) \ - ( (This)->lpVtbl -> GetAdapterLuid(This) ) + ( (This)->lpVtbl -> GetAdapterLuid(This) ) #define ID3D12Device1_CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) \ - ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) + ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) #define ID3D12Device1_SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) \ - ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) + ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) #define ID3D12Device1_SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) \ - ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) + ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) #endif /* COBJMACROS */ @@ -8740,90 +8668,89 @@ EXTERN_C const IID IID_ID3D12Device1; #define __ID3D12Device2_INTERFACE_DEFINED__ /* interface ID3D12Device2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Device2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("30baa41e-b15b-475c-a0bb-1af5c5b64328") ID3D12Device2 : public ID3D12Device1 { public: - virtual HRESULT STDMETHODCALLTYPE CreatePipelineState( + virtual HRESULT STDMETHODCALLTYPE CreatePipelineState( const D3D12_PIPELINE_STATE_STREAM_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Device2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Device2 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Device2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Device2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Device2 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Device2 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Device2 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Device2 * This, _In_z_ LPCWSTR Name); - - UINT ( STDMETHODCALLTYPE *GetNodeCount )( + + UINT ( STDMETHODCALLTYPE *GetNodeCount )( ID3D12Device2 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( ID3D12Device2 * This, _In_ const D3D12_COMMAND_QUEUE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppCommandQueue); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( ID3D12Device2 * This, _In_ D3D12_COMMAND_LIST_TYPE type, REFIID riid, _COM_Outptr_ void **ppCommandAllocator); - - HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( ID3D12Device2 * This, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( ID3D12Device2 * This, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( ID3D12Device2 * This, _In_ UINT nodeMask, _In_ D3D12_COMMAND_LIST_TYPE type, @@ -8831,67 +8758,67 @@ EXTERN_C const IID IID_ID3D12Device2; _In_opt_ ID3D12PipelineState *pInitialState, REFIID riid, _COM_Outptr_ void **ppCommandList); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D12Device2 * This, D3D12_FEATURE Feature, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( ID3D12Device2 * This, _In_ const D3D12_DESCRIPTOR_HEAP_DESC *pDescriptorHeapDesc, REFIID riid, _COM_Outptr_ void **ppvHeap); - - UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( + + UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( ID3D12Device2 * This, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapType); - - HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( ID3D12Device2 * This, _In_ UINT nodeMask, _In_reads_(blobLengthInBytes) const void *pBlobWithRootSignature, _In_ SIZE_T blobLengthInBytes, REFIID riid, _COM_Outptr_ void **ppvRootSignature); - - void ( STDMETHODCALLTYPE *CreateConstantBufferView )( + + void ( STDMETHODCALLTYPE *CreateConstantBufferView )( ID3D12Device2 * This, _In_opt_ const D3D12_CONSTANT_BUFFER_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + void ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D12Device2 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_SHADER_RESOURCE_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D12Device2 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ ID3D12Resource *pCounterResource, _In_opt_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + void ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D12Device2 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_RENDER_TARGET_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + void ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D12Device2 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_DEPTH_STENCIL_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateSampler )( + + void ( STDMETHODCALLTYPE *CreateSampler )( ID3D12Device2 * This, _In_ const D3D12_SAMPLER_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CopyDescriptors )( + + void ( STDMETHODCALLTYPE *CopyDescriptors )( ID3D12Device2 * This, _In_ UINT NumDestDescriptorRanges, _In_reads_(NumDestDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pDestDescriptorRangeStarts, @@ -8900,26 +8827,26 @@ EXTERN_C const IID IID_ID3D12Device2; _In_reads_(NumSrcDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pSrcDescriptorRangeStarts, _In_reads_opt_(NumSrcDescriptorRanges) const UINT *pSrcDescriptorRangeSizes, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( + + void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( ID3D12Device2 * This, _In_ UINT NumDescriptors, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptorRangeStart, _In_ D3D12_CPU_DESCRIPTOR_HANDLE SrcDescriptorRangeStart, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( + + D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( ID3D12Device2 * This, _In_ UINT visibleMask, _In_ UINT numResourceDescs, _In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs); - - D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( + + D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( ID3D12Device2 * This, _In_ UINT nodeMask, D3D12_HEAP_TYPE heapType); - - HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( ID3D12Device2 * This, _In_ const D3D12_HEAP_PROPERTIES *pHeapProperties, D3D12_HEAP_FLAGS HeapFlags, @@ -8928,14 +8855,14 @@ EXTERN_C const IID IID_ID3D12Device2; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riidResource, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateHeap )( ID3D12Device2 * This, _In_ const D3D12_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( ID3D12Device2 * This, _In_ ID3D12Heap *pHeap, UINT64 HeapOffset, @@ -8944,57 +8871,57 @@ EXTERN_C const IID IID_ID3D12Device2; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( ID3D12Device2 * This, _In_ const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( ID3D12Device2 * This, _In_ ID3D12DeviceChild *pObject, _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, DWORD Access, _In_opt_ LPCWSTR Name, _Out_ HANDLE *pHandle); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( ID3D12Device2 * This, _In_ HANDLE NTHandle, REFIID riid, _COM_Outptr_opt_ void **ppvObj); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( ID3D12Device2 * This, _In_ LPCWSTR Name, DWORD Access, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pNTHandle); - - HRESULT ( STDMETHODCALLTYPE *MakeResident )( + + HRESULT ( STDMETHODCALLTYPE *MakeResident )( ID3D12Device2 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *Evict )( + + HRESULT ( STDMETHODCALLTYPE *Evict )( ID3D12Device2 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *CreateFence )( + + HRESULT ( STDMETHODCALLTYPE *CreateFence )( ID3D12Device2 * This, UINT64 InitialValue, D3D12_FENCE_FLAGS Flags, REFIID riid, _COM_Outptr_ void **ppFence); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D12Device2 * This); - - void ( STDMETHODCALLTYPE *GetCopyableFootprints )( + + void ( STDMETHODCALLTYPE *GetCopyableFootprints )( ID3D12Device2 * This, _In_ const D3D12_RESOURCE_DESC *pResourceDesc, _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, @@ -9004,25 +8931,25 @@ EXTERN_C const IID IID_ID3D12Device2; _Out_writes_opt_(NumSubresources) UINT *pNumRows, _Out_writes_opt_(NumSubresources) UINT64 *pRowSizeInBytes, _Out_opt_ UINT64 *pTotalBytes); - - HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( ID3D12Device2 * This, _In_ const D3D12_QUERY_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( + + HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( ID3D12Device2 * This, BOOL Enable); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( ID3D12Device2 * This, _In_ const D3D12_COMMAND_SIGNATURE_DESC *pDesc, _In_opt_ ID3D12RootSignature *pRootSignature, REFIID riid, _COM_Outptr_opt_ void **ppvCommandSignature); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D12Device2 * This, _In_ ID3D12Resource *pTiledResource, _Out_opt_ UINT *pNumTilesForEntireResource, @@ -9031,37 +8958,37 @@ EXTERN_C const IID IID_ID3D12Device2; _Inout_opt_ UINT *pNumSubresourceTilings, _In_ UINT FirstSubresourceTilingToGet, _Out_writes_(*pNumSubresourceTilings) D3D12_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( + + LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( ID3D12Device2 * This); - - HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( + + HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( ID3D12Device2 * This, _In_reads_(BlobLength) const void *pLibraryBlob, SIZE_T BlobLength, REFIID riid, _COM_Outptr_ void **ppPipelineLibrary); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( ID3D12Device2 * This, _In_reads_(NumFences) ID3D12Fence *const *ppFences, _In_reads_(NumFences) const UINT64 *pFenceValues, UINT NumFences, D3D12_MULTIPLE_FENCE_WAIT_FLAGS Flags, HANDLE hEvent); - - HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( ID3D12Device2 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_reads_(NumObjects) const D3D12_RESIDENCY_PRIORITY *pPriorities); - - HRESULT ( STDMETHODCALLTYPE *CreatePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreatePipelineState )( ID3D12Device2 * This, const D3D12_PIPELINE_STATE_STREAM_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - + END_INTERFACE } ID3D12Device2Vtbl; @@ -9070,153 +8997,151 @@ EXTERN_C const IID IID_ID3D12Device2; CONST_VTBL struct ID3D12Device2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Device2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Device2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Device2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Device2_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Device2_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Device2_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Device2_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Device2_GetNodeCount(This) \ - ( (This)->lpVtbl -> GetNodeCount(This) ) + ( (This)->lpVtbl -> GetNodeCount(This) ) #define ID3D12Device2_CreateCommandQueue(This,pDesc,riid,ppCommandQueue) \ - ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) + ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) #define ID3D12Device2_CreateCommandAllocator(This,type,riid,ppCommandAllocator) \ - ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) + ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) #define ID3D12Device2_CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device2_CreateComputePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device2_CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) \ - ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) + ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) #define ID3D12Device2_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D12Device2_CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) #define ID3D12Device2_GetDescriptorHandleIncrementSize(This,DescriptorHeapType) \ - ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) + ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) #define ID3D12Device2_CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) \ - ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) + ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) #define ID3D12Device2_CreateConstantBufferView(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) #define ID3D12Device2_CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device2_CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) #define ID3D12Device2_CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device2_CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device2_CreateSampler(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) #define ID3D12Device2_CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) #define ID3D12Device2_CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) #define ID3D12Device2_GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) \ - ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) + ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) #define ID3D12Device2_GetCustomHeapProperties(This,nodeMask,heapType) \ - ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) + ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) #define ID3D12Device2_CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) \ - ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) + ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) #define ID3D12Device2_CreateHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device2_CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device2_CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device2_CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) #define ID3D12Device2_OpenSharedHandle(This,NTHandle,riid,ppvObj) \ - ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) + ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) #define ID3D12Device2_OpenSharedHandleByName(This,Name,Access,pNTHandle) \ - ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) + ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) #define ID3D12Device2_MakeResident(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) #define ID3D12Device2_Evict(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) #define ID3D12Device2_CreateFence(This,InitialValue,Flags,riid,ppFence) \ - ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) + ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) #define ID3D12Device2_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D12Device2_GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) \ - ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) + ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) #define ID3D12Device2_CreateQueryHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device2_SetStablePowerState(This,Enable) \ - ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) + ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) #define ID3D12Device2_CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) \ - ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) + ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) #define ID3D12Device2_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D12Device2_GetAdapterLuid(This) \ - ( (This)->lpVtbl -> GetAdapterLuid(This) ) + ( (This)->lpVtbl -> GetAdapterLuid(This) ) #define ID3D12Device2_CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) \ - ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) + ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) #define ID3D12Device2_SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) \ - ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) + ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) #define ID3D12Device2_SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) \ - ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) + ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) #define ID3D12Device2_CreatePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreatePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreatePipelineState(This,pDesc,riid,ppPipelineState) ) #endif /* COBJMACROS */ @@ -9225,9 +9150,9 @@ EXTERN_C const IID IID_ID3D12Device2; #endif /* __ID3D12Device2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0025 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_RESIDENCY_FLAGS { D3D12_RESIDENCY_FLAG_NONE = 0, @@ -9243,102 +9168,101 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12_0000_0025_v0_0_s_ifspec; #define __ID3D12Device3_INTERFACE_DEFINED__ /* interface ID3D12Device3 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Device3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("81dadc15-2bad-4392-93c5-101345c4aa98") ID3D12Device3 : public ID3D12Device2 { public: - virtual HRESULT STDMETHODCALLTYPE OpenExistingHeapFromAddress( + virtual HRESULT STDMETHODCALLTYPE OpenExistingHeapFromAddress( _In_ const void *pAddress, REFIID riid, _COM_Outptr_ void **ppvHeap) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenExistingHeapFromFileMapping( + + virtual HRESULT STDMETHODCALLTYPE OpenExistingHeapFromFileMapping( _In_ HANDLE hFileMapping, REFIID riid, _COM_Outptr_ void **ppvHeap) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnqueueMakeResident( + + virtual HRESULT STDMETHODCALLTYPE EnqueueMakeResident( D3D12_RESIDENCY_FLAGS Flags, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_ ID3D12Fence *pFenceToSignal, UINT64 FenceValueToSignal) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Device3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Device3 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Device3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Device3 * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12Device3 * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12Device3 * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12Device3 * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12Device3 * This, _In_z_ LPCWSTR Name); - - UINT ( STDMETHODCALLTYPE *GetNodeCount )( + + UINT ( STDMETHODCALLTYPE *GetNodeCount )( ID3D12Device3 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandQueue )( ID3D12Device3 * This, _In_ const D3D12_COMMAND_QUEUE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppCommandQueue); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandAllocator )( ID3D12Device3 * This, _In_ D3D12_COMMAND_LIST_TYPE type, REFIID riid, _COM_Outptr_ void **ppCommandAllocator); - - HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateGraphicsPipelineState )( ID3D12Device3 * This, _In_ const D3D12_GRAPHICS_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreateComputePipelineState )( ID3D12Device3 * This, _In_ const D3D12_COMPUTE_PIPELINE_STATE_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandList )( ID3D12Device3 * This, _In_ UINT nodeMask, _In_ D3D12_COMMAND_LIST_TYPE type, @@ -9346,67 +9270,67 @@ EXTERN_C const IID IID_ID3D12Device3; _In_opt_ ID3D12PipelineState *pInitialState, REFIID riid, _COM_Outptr_ void **ppCommandList); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D12Device3 * This, D3D12_FEATURE Feature, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateDescriptorHeap )( ID3D12Device3 * This, _In_ const D3D12_DESCRIPTOR_HEAP_DESC *pDescriptorHeapDesc, REFIID riid, _COM_Outptr_ void **ppvHeap); - - UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( + + UINT ( STDMETHODCALLTYPE *GetDescriptorHandleIncrementSize )( ID3D12Device3 * This, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapType); - - HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateRootSignature )( ID3D12Device3 * This, _In_ UINT nodeMask, _In_reads_(blobLengthInBytes) const void *pBlobWithRootSignature, _In_ SIZE_T blobLengthInBytes, REFIID riid, _COM_Outptr_ void **ppvRootSignature); - - void ( STDMETHODCALLTYPE *CreateConstantBufferView )( + + void ( STDMETHODCALLTYPE *CreateConstantBufferView )( ID3D12Device3 * This, _In_opt_ const D3D12_CONSTANT_BUFFER_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateShaderResourceView )( + + void ( STDMETHODCALLTYPE *CreateShaderResourceView )( ID3D12Device3 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_SHADER_RESOURCE_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( + + void ( STDMETHODCALLTYPE *CreateUnorderedAccessView )( ID3D12Device3 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ ID3D12Resource *pCounterResource, _In_opt_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateRenderTargetView )( + + void ( STDMETHODCALLTYPE *CreateRenderTargetView )( ID3D12Device3 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_RENDER_TARGET_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateDepthStencilView )( + + void ( STDMETHODCALLTYPE *CreateDepthStencilView )( ID3D12Device3 * This, _In_opt_ ID3D12Resource *pResource, _In_opt_ const D3D12_DEPTH_STENCIL_VIEW_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CreateSampler )( + + void ( STDMETHODCALLTYPE *CreateSampler )( ID3D12Device3 * This, _In_ const D3D12_SAMPLER_DESC *pDesc, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptor); - - void ( STDMETHODCALLTYPE *CopyDescriptors )( + + void ( STDMETHODCALLTYPE *CopyDescriptors )( ID3D12Device3 * This, _In_ UINT NumDestDescriptorRanges, _In_reads_(NumDestDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pDestDescriptorRangeStarts, @@ -9415,26 +9339,26 @@ EXTERN_C const IID IID_ID3D12Device3; _In_reads_(NumSrcDescriptorRanges) const D3D12_CPU_DESCRIPTOR_HANDLE *pSrcDescriptorRangeStarts, _In_reads_opt_(NumSrcDescriptorRanges) const UINT *pSrcDescriptorRangeSizes, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( + + void ( STDMETHODCALLTYPE *CopyDescriptorsSimple )( ID3D12Device3 * This, _In_ UINT NumDescriptors, _In_ D3D12_CPU_DESCRIPTOR_HANDLE DestDescriptorRangeStart, _In_ D3D12_CPU_DESCRIPTOR_HANDLE SrcDescriptorRangeStart, _In_ D3D12_DESCRIPTOR_HEAP_TYPE DescriptorHeapsType); - - D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( + + D3D12_RESOURCE_ALLOCATION_INFO ( STDMETHODCALLTYPE *GetResourceAllocationInfo )( ID3D12Device3 * This, _In_ UINT visibleMask, _In_ UINT numResourceDescs, _In_reads_(numResourceDescs) const D3D12_RESOURCE_DESC *pResourceDescs); - - D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( + + D3D12_HEAP_PROPERTIES ( STDMETHODCALLTYPE *GetCustomHeapProperties )( ID3D12Device3 * This, _In_ UINT nodeMask, D3D12_HEAP_TYPE heapType); - - HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommittedResource )( ID3D12Device3 * This, _In_ const D3D12_HEAP_PROPERTIES *pHeapProperties, D3D12_HEAP_FLAGS HeapFlags, @@ -9443,14 +9367,14 @@ EXTERN_C const IID IID_ID3D12Device3; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riidResource, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateHeap )( ID3D12Device3 * This, _In_ const D3D12_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreatePlacedResource )( ID3D12Device3 * This, _In_ ID3D12Heap *pHeap, UINT64 HeapOffset, @@ -9459,57 +9383,57 @@ EXTERN_C const IID IID_ID3D12Device3; _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( + + HRESULT ( STDMETHODCALLTYPE *CreateReservedResource )( ID3D12Device3 * This, _In_ const D3D12_RESOURCE_DESC *pDesc, D3D12_RESOURCE_STATES InitialState, _In_opt_ const D3D12_CLEAR_VALUE *pOptimizedClearValue, REFIID riid, _COM_Outptr_opt_ void **ppvResource); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( ID3D12Device3 * This, _In_ ID3D12DeviceChild *pObject, _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, DWORD Access, _In_opt_ LPCWSTR Name, _Out_ HANDLE *pHandle); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandle )( ID3D12Device3 * This, _In_ HANDLE NTHandle, REFIID riid, _COM_Outptr_opt_ void **ppvObj); - - HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( + + HRESULT ( STDMETHODCALLTYPE *OpenSharedHandleByName )( ID3D12Device3 * This, _In_ LPCWSTR Name, DWORD Access, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pNTHandle); - - HRESULT ( STDMETHODCALLTYPE *MakeResident )( + + HRESULT ( STDMETHODCALLTYPE *MakeResident )( ID3D12Device3 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *Evict )( + + HRESULT ( STDMETHODCALLTYPE *Evict )( ID3D12Device3 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects); - - HRESULT ( STDMETHODCALLTYPE *CreateFence )( + + HRESULT ( STDMETHODCALLTYPE *CreateFence )( ID3D12Device3 * This, UINT64 InitialValue, D3D12_FENCE_FLAGS Flags, REFIID riid, _COM_Outptr_ void **ppFence); - - HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( + + HRESULT ( STDMETHODCALLTYPE *GetDeviceRemovedReason )( ID3D12Device3 * This); - - void ( STDMETHODCALLTYPE *GetCopyableFootprints )( + + void ( STDMETHODCALLTYPE *GetCopyableFootprints )( ID3D12Device3 * This, _In_ const D3D12_RESOURCE_DESC *pResourceDesc, _In_range_(0,D3D12_REQ_SUBRESOURCES) UINT FirstSubresource, @@ -9519,25 +9443,25 @@ EXTERN_C const IID IID_ID3D12Device3; _Out_writes_opt_(NumSubresources) UINT *pNumRows, _Out_writes_opt_(NumSubresources) UINT64 *pRowSizeInBytes, _Out_opt_ UINT64 *pTotalBytes); - - HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateQueryHeap )( ID3D12Device3 * This, _In_ const D3D12_QUERY_HEAP_DESC *pDesc, REFIID riid, _COM_Outptr_opt_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( + + HRESULT ( STDMETHODCALLTYPE *SetStablePowerState )( ID3D12Device3 * This, BOOL Enable); - - HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( + + HRESULT ( STDMETHODCALLTYPE *CreateCommandSignature )( ID3D12Device3 * This, _In_ const D3D12_COMMAND_SIGNATURE_DESC *pDesc, _In_opt_ ID3D12RootSignature *pRootSignature, REFIID riid, _COM_Outptr_opt_ void **ppvCommandSignature); - - void ( STDMETHODCALLTYPE *GetResourceTiling )( + + void ( STDMETHODCALLTYPE *GetResourceTiling )( ID3D12Device3 * This, _In_ ID3D12Resource *pTiledResource, _Out_opt_ UINT *pNumTilesForEntireResource, @@ -9546,57 +9470,57 @@ EXTERN_C const IID IID_ID3D12Device3; _Inout_opt_ UINT *pNumSubresourceTilings, _In_ UINT FirstSubresourceTilingToGet, _Out_writes_(*pNumSubresourceTilings) D3D12_SUBRESOURCE_TILING *pSubresourceTilingsForNonPackedMips); - - LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( + + LUID ( STDMETHODCALLTYPE *GetAdapterLuid )( ID3D12Device3 * This); - - HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( + + HRESULT ( STDMETHODCALLTYPE *CreatePipelineLibrary )( ID3D12Device3 * This, _In_reads_(BlobLength) const void *pLibraryBlob, SIZE_T BlobLength, REFIID riid, _COM_Outptr_ void **ppPipelineLibrary); - - HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( + + HRESULT ( STDMETHODCALLTYPE *SetEventOnMultipleFenceCompletion )( ID3D12Device3 * This, _In_reads_(NumFences) ID3D12Fence *const *ppFences, _In_reads_(NumFences) const UINT64 *pFenceValues, UINT NumFences, D3D12_MULTIPLE_FENCE_WAIT_FLAGS Flags, HANDLE hEvent); - - HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetResidencyPriority )( ID3D12Device3 * This, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_reads_(NumObjects) const D3D12_RESIDENCY_PRIORITY *pPriorities); - - HRESULT ( STDMETHODCALLTYPE *CreatePipelineState )( + + HRESULT ( STDMETHODCALLTYPE *CreatePipelineState )( ID3D12Device3 * This, const D3D12_PIPELINE_STATE_STREAM_DESC *pDesc, REFIID riid, _COM_Outptr_ void **ppPipelineState); - - HRESULT ( STDMETHODCALLTYPE *OpenExistingHeapFromAddress )( + + HRESULT ( STDMETHODCALLTYPE *OpenExistingHeapFromAddress )( ID3D12Device3 * This, _In_ const void *pAddress, REFIID riid, _COM_Outptr_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *OpenExistingHeapFromFileMapping )( + + HRESULT ( STDMETHODCALLTYPE *OpenExistingHeapFromFileMapping )( ID3D12Device3 * This, _In_ HANDLE hFileMapping, REFIID riid, _COM_Outptr_ void **ppvHeap); - - HRESULT ( STDMETHODCALLTYPE *EnqueueMakeResident )( + + HRESULT ( STDMETHODCALLTYPE *EnqueueMakeResident )( ID3D12Device3 * This, D3D12_RESIDENCY_FLAGS Flags, UINT NumObjects, _In_reads_(NumObjects) ID3D12Pageable *const *ppObjects, _In_ ID3D12Fence *pFenceToSignal, UINT64 FenceValueToSignal); - + END_INTERFACE } ID3D12Device3Vtbl; @@ -9605,162 +9529,160 @@ EXTERN_C const IID IID_ID3D12Device3; CONST_VTBL struct ID3D12Device3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Device3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Device3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Device3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Device3_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12Device3_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12Device3_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12Device3_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12Device3_GetNodeCount(This) \ - ( (This)->lpVtbl -> GetNodeCount(This) ) + ( (This)->lpVtbl -> GetNodeCount(This) ) #define ID3D12Device3_CreateCommandQueue(This,pDesc,riid,ppCommandQueue) \ - ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) + ( (This)->lpVtbl -> CreateCommandQueue(This,pDesc,riid,ppCommandQueue) ) #define ID3D12Device3_CreateCommandAllocator(This,type,riid,ppCommandAllocator) \ - ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) + ( (This)->lpVtbl -> CreateCommandAllocator(This,type,riid,ppCommandAllocator) ) #define ID3D12Device3_CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateGraphicsPipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device3_CreateComputePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreateComputePipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device3_CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) \ - ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) + ( (This)->lpVtbl -> CreateCommandList(This,nodeMask,type,pCommandAllocator,pInitialState,riid,ppCommandList) ) #define ID3D12Device3_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D12Device3_CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateDescriptorHeap(This,pDescriptorHeapDesc,riid,ppvHeap) ) #define ID3D12Device3_GetDescriptorHandleIncrementSize(This,DescriptorHeapType) \ - ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) + ( (This)->lpVtbl -> GetDescriptorHandleIncrementSize(This,DescriptorHeapType) ) #define ID3D12Device3_CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) \ - ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) + ( (This)->lpVtbl -> CreateRootSignature(This,nodeMask,pBlobWithRootSignature,blobLengthInBytes,riid,ppvRootSignature) ) #define ID3D12Device3_CreateConstantBufferView(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateConstantBufferView(This,pDesc,DestDescriptor) ) #define ID3D12Device3_CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateShaderResourceView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device3_CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateUnorderedAccessView(This,pResource,pCounterResource,pDesc,DestDescriptor) ) #define ID3D12Device3_CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateRenderTargetView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device3_CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateDepthStencilView(This,pResource,pDesc,DestDescriptor) ) #define ID3D12Device3_CreateSampler(This,pDesc,DestDescriptor) \ - ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) + ( (This)->lpVtbl -> CreateSampler(This,pDesc,DestDescriptor) ) #define ID3D12Device3_CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptors(This,NumDestDescriptorRanges,pDestDescriptorRangeStarts,pDestDescriptorRangeSizes,NumSrcDescriptorRanges,pSrcDescriptorRangeStarts,pSrcDescriptorRangeSizes,DescriptorHeapsType) ) #define ID3D12Device3_CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) \ - ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) + ( (This)->lpVtbl -> CopyDescriptorsSimple(This,NumDescriptors,DestDescriptorRangeStart,SrcDescriptorRangeStart,DescriptorHeapsType) ) #define ID3D12Device3_GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) \ - ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) + ( (This)->lpVtbl -> GetResourceAllocationInfo(This,visibleMask,numResourceDescs,pResourceDescs) ) #define ID3D12Device3_GetCustomHeapProperties(This,nodeMask,heapType) \ - ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) + ( (This)->lpVtbl -> GetCustomHeapProperties(This,nodeMask,heapType) ) #define ID3D12Device3_CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) \ - ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) + ( (This)->lpVtbl -> CreateCommittedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,riidResource,ppvResource) ) #define ID3D12Device3_CreateHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device3_CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreatePlacedResource(This,pHeap,HeapOffset,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device3_CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) \ - ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) + ( (This)->lpVtbl -> CreateReservedResource(This,pDesc,InitialState,pOptimizedClearValue,riid,ppvResource) ) #define ID3D12Device3_CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pObject,pAttributes,Access,Name,pHandle) ) #define ID3D12Device3_OpenSharedHandle(This,NTHandle,riid,ppvObj) \ - ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) + ( (This)->lpVtbl -> OpenSharedHandle(This,NTHandle,riid,ppvObj) ) #define ID3D12Device3_OpenSharedHandleByName(This,Name,Access,pNTHandle) \ - ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) + ( (This)->lpVtbl -> OpenSharedHandleByName(This,Name,Access,pNTHandle) ) #define ID3D12Device3_MakeResident(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> MakeResident(This,NumObjects,ppObjects) ) #define ID3D12Device3_Evict(This,NumObjects,ppObjects) \ - ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) + ( (This)->lpVtbl -> Evict(This,NumObjects,ppObjects) ) #define ID3D12Device3_CreateFence(This,InitialValue,Flags,riid,ppFence) \ - ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) + ( (This)->lpVtbl -> CreateFence(This,InitialValue,Flags,riid,ppFence) ) #define ID3D12Device3_GetDeviceRemovedReason(This) \ - ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) + ( (This)->lpVtbl -> GetDeviceRemovedReason(This) ) #define ID3D12Device3_GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) \ - ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) + ( (This)->lpVtbl -> GetCopyableFootprints(This,pResourceDesc,FirstSubresource,NumSubresources,BaseOffset,pLayouts,pNumRows,pRowSizeInBytes,pTotalBytes) ) #define ID3D12Device3_CreateQueryHeap(This,pDesc,riid,ppvHeap) \ - ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) + ( (This)->lpVtbl -> CreateQueryHeap(This,pDesc,riid,ppvHeap) ) #define ID3D12Device3_SetStablePowerState(This,Enable) \ - ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) + ( (This)->lpVtbl -> SetStablePowerState(This,Enable) ) #define ID3D12Device3_CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) \ - ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) + ( (This)->lpVtbl -> CreateCommandSignature(This,pDesc,pRootSignature,riid,ppvCommandSignature) ) #define ID3D12Device3_GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) \ - ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) + ( (This)->lpVtbl -> GetResourceTiling(This,pTiledResource,pNumTilesForEntireResource,pPackedMipDesc,pStandardTileShapeForNonPackedMips,pNumSubresourceTilings,FirstSubresourceTilingToGet,pSubresourceTilingsForNonPackedMips) ) #define ID3D12Device3_GetAdapterLuid(This) \ - ( (This)->lpVtbl -> GetAdapterLuid(This) ) + ( (This)->lpVtbl -> GetAdapterLuid(This) ) #define ID3D12Device3_CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) \ - ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) + ( (This)->lpVtbl -> CreatePipelineLibrary(This,pLibraryBlob,BlobLength,riid,ppPipelineLibrary) ) #define ID3D12Device3_SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) \ - ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) + ( (This)->lpVtbl -> SetEventOnMultipleFenceCompletion(This,ppFences,pFenceValues,NumFences,Flags,hEvent) ) #define ID3D12Device3_SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) \ - ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) + ( (This)->lpVtbl -> SetResidencyPriority(This,NumObjects,ppObjects,pPriorities) ) #define ID3D12Device3_CreatePipelineState(This,pDesc,riid,ppPipelineState) \ - ( (This)->lpVtbl -> CreatePipelineState(This,pDesc,riid,ppPipelineState) ) + ( (This)->lpVtbl -> CreatePipelineState(This,pDesc,riid,ppPipelineState) ) #define ID3D12Device3_OpenExistingHeapFromAddress(This,pAddress,riid,ppvHeap) \ - ( (This)->lpVtbl -> OpenExistingHeapFromAddress(This,pAddress,riid,ppvHeap) ) + ( (This)->lpVtbl -> OpenExistingHeapFromAddress(This,pAddress,riid,ppvHeap) ) #define ID3D12Device3_OpenExistingHeapFromFileMapping(This,hFileMapping,riid,ppvHeap) \ - ( (This)->lpVtbl -> OpenExistingHeapFromFileMapping(This,hFileMapping,riid,ppvHeap) ) + ( (This)->lpVtbl -> OpenExistingHeapFromFileMapping(This,hFileMapping,riid,ppvHeap) ) #define ID3D12Device3_EnqueueMakeResident(This,Flags,NumObjects,ppObjects,pFenceToSignal,FenceValueToSignal) \ - ( (This)->lpVtbl -> EnqueueMakeResident(This,Flags,NumObjects,ppObjects,pFenceToSignal,FenceValueToSignal) ) + ( (This)->lpVtbl -> EnqueueMakeResident(This,Flags,NumObjects,ppObjects,pFenceToSignal,FenceValueToSignal) ) #endif /* COBJMACROS */ @@ -9772,48 +9694,47 @@ EXTERN_C const IID IID_ID3D12Device3; #define __ID3D12Tools_INTERFACE_DEFINED__ /* interface ID3D12Tools */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Tools; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7071e1f0-e84b-4b33-974f-12fa49de65c5") ID3D12Tools : public IUnknown { public: - virtual void STDMETHODCALLTYPE EnableShaderInstrumentation( + virtual void STDMETHODCALLTYPE EnableShaderInstrumentation( BOOL bEnable) = 0; - + virtual BOOL STDMETHODCALLTYPE ShaderInstrumentationEnabled( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12ToolsVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Tools * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Tools * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Tools * This); - - void ( STDMETHODCALLTYPE *EnableShaderInstrumentation )( + + void ( STDMETHODCALLTYPE *EnableShaderInstrumentation )( ID3D12Tools * This, BOOL bEnable); - - BOOL ( STDMETHODCALLTYPE *ShaderInstrumentationEnabled )( + + BOOL ( STDMETHODCALLTYPE *ShaderInstrumentationEnabled )( ID3D12Tools * This); - + END_INTERFACE } ID3D12ToolsVtbl; @@ -9822,24 +9743,22 @@ EXTERN_C const IID IID_ID3D12Tools; CONST_VTBL struct ID3D12ToolsVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Tools_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Tools_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Tools_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Tools_EnableShaderInstrumentation(This,bEnable) \ - ( (This)->lpVtbl -> EnableShaderInstrumentation(This,bEnable) ) + ( (This)->lpVtbl -> EnableShaderInstrumentation(This,bEnable) ) #define ID3D12Tools_ShaderInstrumentationEnabled(This) \ - ( (This)->lpVtbl -> ShaderInstrumentationEnabled(This) ) + ( (This)->lpVtbl -> ShaderInstrumentationEnabled(This) ) #endif /* COBJMACROS */ @@ -9848,7 +9767,7 @@ EXTERN_C const IID IID_ID3D12Tools; #endif /* __ID3D12Tools_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12_0000_0027 */ -/* [local] */ +/* [local] */ typedef struct D3D12_SUBRESOURCE_DATA { @@ -9864,9 +9783,9 @@ typedef struct D3D12_MEMCPY_DEST SIZE_T SlicePitch; } D3D12_MEMCPY_DEST; -#if !defined( D3D12_IGNORE_SDK_LAYERS ) -#include "d3d12sdklayers.h" -#endif +#if !defined( D3D12_IGNORE_SDK_LAYERS ) +#include "d3d12sdklayers.h" +#endif /////////////////////////////////////////////////////////////////////////// // D3D12CreateDevice @@ -9883,14 +9802,14 @@ typedef struct D3D12_MEMCPY_DEST // Pointer to returned interface. May be NULL. // // Return Values -// Any of those documented for +// Any of those documented for // CreateDXGIFactory1 // IDXGIFactory::EnumAdapters // D3D12CreateDevice // /////////////////////////////////////////////////////////////////////////// -typedef HRESULT (WINAPI* PFN_D3D12_CREATE_DEVICE)( _In_opt_ IUnknown*, - D3D_FEATURE_LEVEL, +typedef HRESULT (WINAPI* PFN_D3D12_CREATE_DEVICE)( _In_opt_ IUnknown*, + D3D_FEATURE_LEVEL, _In_ REFIID, _COM_Outptr_opt_ void** ); HRESULT WINAPI D3D12CreateDevice( @@ -9907,16 +9826,16 @@ HRESULT WINAPI D3D12GetDebugInterface( _In_ REFIID riid, _COM_Outptr_opt_ void** // D3D12EnableExperimentalFeatures // // Pass in a list of feature GUIDs to be enabled together. -// +// // If a particular feature requires some configuration information on enablement, it will have // a configuration struct that can be passed alongside the GUID. -// +// // Some features might use an interface IID as the GUID. For these, once the feature is enabled via // D3D12EnableExperimentalFeatures, D3D12GetDebugInterface can then be called with the IID to retrieve the interface -// for manipulating the feature. This allows for control that might not cleanly be expressed by just +// for manipulating the feature. This allows for control that might not cleanly be expressed by just // the configuration struct that D3D12EnableExperimentalFeatures provides. // -// If this method is called and a change to existing feature enablement is made, +// If this method is called and a change to existing feature enablement is made, // all current D3D12 devices are set to DEVICE_REMOVED state, since under the covers there is really only one // singleton device for a process. Removing the devices when configuration changes prevents // mismatched expectations of how a device is supposed to work after it has been created from the app's point of view. diff --git a/gfx/include/dxsdk/d3d12sdklayers.h b/gfx/include/dxsdk/d3d12sdklayers.h index 4b807685bc..d4f8d1f0ca 100644 --- a/gfx/include/dxsdk/d3d12sdklayers.h +++ b/gfx/include/dxsdk/d3d12sdklayers.h @@ -37,7 +37,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D12Debug_FWD_DEFINED__ #define __ID3D12Debug_FWD_DEFINED__ @@ -106,10 +106,10 @@ typedef interface ID3D12InfoQueue ID3D12InfoQueue; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d12sdklayers_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ @@ -122,41 +122,40 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0000_v0_0_s_ifspec; #define __ID3D12Debug_INTERFACE_DEFINED__ /* interface ID3D12Debug */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Debug; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("344488b7-6846-474b-b989-f027448245e0") ID3D12Debug : public IUnknown { public: virtual void STDMETHODCALLTYPE EnableDebugLayer( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Debug * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Debug * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Debug * This); - - void ( STDMETHODCALLTYPE *EnableDebugLayer )( + + void ( STDMETHODCALLTYPE *EnableDebugLayer )( ID3D12Debug * This); - + END_INTERFACE } ID3D12DebugVtbl; @@ -165,21 +164,19 @@ EXTERN_C const IID IID_ID3D12Debug; CONST_VTBL struct ID3D12DebugVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Debug_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Debug_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Debug_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Debug_EnableDebugLayer(This) \ - ( (This)->lpVtbl -> EnableDebugLayer(This) ) + ( (This)->lpVtbl -> EnableDebugLayer(This) ) #endif /* COBJMACROS */ @@ -191,55 +188,54 @@ EXTERN_C const IID IID_ID3D12Debug; #define __ID3D12Debug1_INTERFACE_DEFINED__ /* interface ID3D12Debug1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Debug1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("affaa4ca-63fe-4d8e-b8ad-159000af4304") ID3D12Debug1 : public IUnknown { public: virtual void STDMETHODCALLTYPE EnableDebugLayer( void) = 0; - - virtual void STDMETHODCALLTYPE SetEnableGPUBasedValidation( + + virtual void STDMETHODCALLTYPE SetEnableGPUBasedValidation( BOOL Enable) = 0; - - virtual void STDMETHODCALLTYPE SetEnableSynchronizedCommandQueueValidation( + + virtual void STDMETHODCALLTYPE SetEnableSynchronizedCommandQueueValidation( BOOL Enable) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Debug1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Debug1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Debug1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Debug1 * This); - - void ( STDMETHODCALLTYPE *EnableDebugLayer )( + + void ( STDMETHODCALLTYPE *EnableDebugLayer )( ID3D12Debug1 * This); - - void ( STDMETHODCALLTYPE *SetEnableGPUBasedValidation )( + + void ( STDMETHODCALLTYPE *SetEnableGPUBasedValidation )( ID3D12Debug1 * This, BOOL Enable); - - void ( STDMETHODCALLTYPE *SetEnableSynchronizedCommandQueueValidation )( + + void ( STDMETHODCALLTYPE *SetEnableSynchronizedCommandQueueValidation )( ID3D12Debug1 * This, BOOL Enable); - + END_INTERFACE } ID3D12Debug1Vtbl; @@ -248,27 +244,25 @@ EXTERN_C const IID IID_ID3D12Debug1; CONST_VTBL struct ID3D12Debug1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Debug1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Debug1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Debug1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Debug1_EnableDebugLayer(This) \ - ( (This)->lpVtbl -> EnableDebugLayer(This) ) + ( (This)->lpVtbl -> EnableDebugLayer(This) ) #define ID3D12Debug1_SetEnableGPUBasedValidation(This,Enable) \ - ( (This)->lpVtbl -> SetEnableGPUBasedValidation(This,Enable) ) + ( (This)->lpVtbl -> SetEnableGPUBasedValidation(This,Enable) ) #define ID3D12Debug1_SetEnableSynchronizedCommandQueueValidation(This,Enable) \ - ( (This)->lpVtbl -> SetEnableSynchronizedCommandQueueValidation(This,Enable) ) + ( (This)->lpVtbl -> SetEnableSynchronizedCommandQueueValidation(This,Enable) ) #endif /* COBJMACROS */ @@ -277,9 +271,9 @@ EXTERN_C const IID IID_ID3D12Debug1; #endif /* __ID3D12Debug1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_GPU_BASED_VALIDATION_FLAGS { D3D12_GPU_BASED_VALIDATION_FLAGS_NONE = 0, @@ -295,43 +289,42 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0002_v0_0_s_ifspec; #define __ID3D12Debug2_INTERFACE_DEFINED__ /* interface ID3D12Debug2 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12Debug2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("93a665c4-a3b2-4e5d-b692-a26ae14e3374") ID3D12Debug2 : public IUnknown { public: - virtual void STDMETHODCALLTYPE SetGPUBasedValidationFlags( + virtual void STDMETHODCALLTYPE SetGPUBasedValidationFlags( D3D12_GPU_BASED_VALIDATION_FLAGS Flags) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12Debug2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12Debug2 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12Debug2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12Debug2 * This); - - void ( STDMETHODCALLTYPE *SetGPUBasedValidationFlags )( + + void ( STDMETHODCALLTYPE *SetGPUBasedValidationFlags )( ID3D12Debug2 * This, D3D12_GPU_BASED_VALIDATION_FLAGS Flags); - + END_INTERFACE } ID3D12Debug2Vtbl; @@ -340,21 +333,19 @@ EXTERN_C const IID IID_ID3D12Debug2; CONST_VTBL struct ID3D12Debug2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12Debug2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12Debug2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12Debug2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12Debug2_SetGPUBasedValidationFlags(This,Flags) \ - ( (This)->lpVtbl -> SetGPUBasedValidationFlags(This,Flags) ) + ( (This)->lpVtbl -> SetGPUBasedValidationFlags(This,Flags) ) #endif /* COBJMACROS */ @@ -363,9 +354,9 @@ EXTERN_C const IID IID_ID3D12Debug2; #endif /* __ID3D12Debug2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0003 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_RLDO_FLAGS { D3D12_RLDO_NONE = 0, @@ -375,36 +366,36 @@ enum D3D12_RLDO_FLAGS } D3D12_RLDO_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_RLDO_FLAGS) -typedef +typedef enum D3D12_DEBUG_DEVICE_PARAMETER_TYPE { D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS = 0, D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS = ( D3D12_DEBUG_DEVICE_PARAMETER_FEATURE_FLAGS + 1 ) , - D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR = ( D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS + 1 ) + D3D12_DEBUG_DEVICE_PARAMETER_GPU_SLOWDOWN_PERFORMANCE_FACTOR = ( D3D12_DEBUG_DEVICE_PARAMETER_GPU_BASED_VALIDATION_SETTINGS + 1 ) } D3D12_DEBUG_DEVICE_PARAMETER_TYPE; -typedef +typedef enum D3D12_DEBUG_FEATURE { D3D12_DEBUG_FEATURE_NONE = 0, D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS = 0x1, D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING = 0x2, D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION = 0x4, - D3D12_DEBUG_FEATURE_VALID_MASK = ( ( D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS | D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING ) | D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION ) + D3D12_DEBUG_FEATURE_VALID_MASK = ( ( D3D12_DEBUG_FEATURE_ALLOW_BEHAVIOR_CHANGING_DEBUG_AIDS | D3D12_DEBUG_FEATURE_CONSERVATIVE_RESOURCE_STATE_TRACKING ) | D3D12_DEBUG_FEATURE_DISABLE_VIRTUALIZED_BUNDLES_VALIDATION ) } D3D12_DEBUG_FEATURE; DEFINE_ENUM_FLAG_OPERATORS(D3D12_DEBUG_FEATURE) -typedef +typedef enum D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE { D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE = 0, D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY = ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_NONE + 1 ) , D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION = ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_STATE_TRACKING_ONLY + 1 ) , D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION = ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_UNGUARDED_VALIDATION + 1 ) , - NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION + 1 ) + NUM_D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODES = ( D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE_GUARDED_VALIDATION + 1 ) } D3D12_GPU_BASED_VALIDATION_SHADER_PATCH_MODE; -typedef +typedef enum D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAGS { D3D12_GPU_BASED_VALIDATION_PIPELINE_STATE_CREATE_FLAG_NONE = 0, @@ -434,65 +425,64 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0003_v0_0_s_ifspec; #define __ID3D12DebugDevice1_INTERFACE_DEFINED__ /* interface ID3D12DebugDevice1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DebugDevice1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a9b71770-d099-4a65-a698-3dee10020f88") ID3D12DebugDevice1 : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( + virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type, _In_reads_bytes_(DataSize) const void *pData, UINT DataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( + + virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type, _Out_writes_bytes_(DataSize) void *pData, UINT DataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( + + virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( D3D12_RLDO_FLAGS Flags) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugDevice1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DebugDevice1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DebugDevice1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DebugDevice1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( + + HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( ID3D12DebugDevice1 * This, D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type, _In_reads_bytes_(DataSize) const void *pData, UINT DataSize); - - HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( + + HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( ID3D12DebugDevice1 * This, D3D12_DEBUG_DEVICE_PARAMETER_TYPE Type, _Out_writes_bytes_(DataSize) void *pData, UINT DataSize); - - HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( + + HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( ID3D12DebugDevice1 * This, D3D12_RLDO_FLAGS Flags); - + END_INTERFACE } ID3D12DebugDevice1Vtbl; @@ -501,27 +491,25 @@ EXTERN_C const IID IID_ID3D12DebugDevice1; CONST_VTBL struct ID3D12DebugDevice1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DebugDevice1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DebugDevice1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DebugDevice1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DebugDevice1_SetDebugParameter(This,Type,pData,DataSize) \ - ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) + ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) #define ID3D12DebugDevice1_GetDebugParameter(This,Type,pData,DataSize) \ - ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) + ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) #define ID3D12DebugDevice1_ReportLiveDeviceObjects(This,Flags) \ - ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) + ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) #endif /* COBJMACROS */ @@ -533,55 +521,54 @@ EXTERN_C const IID IID_ID3D12DebugDevice1; #define __ID3D12DebugDevice_INTERFACE_DEFINED__ /* interface ID3D12DebugDevice */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DebugDevice; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3febd6dd-4973-4787-8194-e45f9e28923e") ID3D12DebugDevice : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( + virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( D3D12_DEBUG_FEATURE Mask) = 0; - + virtual D3D12_DEBUG_FEATURE STDMETHODCALLTYPE GetFeatureMask( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( + + virtual HRESULT STDMETHODCALLTYPE ReportLiveDeviceObjects( D3D12_RLDO_FLAGS Flags) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugDeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DebugDevice * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DebugDevice * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DebugDevice * This); - - HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( + + HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( ID3D12DebugDevice * This, D3D12_DEBUG_FEATURE Mask); - - D3D12_DEBUG_FEATURE ( STDMETHODCALLTYPE *GetFeatureMask )( + + D3D12_DEBUG_FEATURE ( STDMETHODCALLTYPE *GetFeatureMask )( ID3D12DebugDevice * This); - - HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( + + HRESULT ( STDMETHODCALLTYPE *ReportLiveDeviceObjects )( ID3D12DebugDevice * This, D3D12_RLDO_FLAGS Flags); - + END_INTERFACE } ID3D12DebugDeviceVtbl; @@ -590,27 +577,25 @@ EXTERN_C const IID IID_ID3D12DebugDevice; CONST_VTBL struct ID3D12DebugDeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DebugDevice_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DebugDevice_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DebugDevice_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DebugDevice_SetFeatureMask(This,Mask) \ - ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) + ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) #define ID3D12DebugDevice_GetFeatureMask(This) \ - ( (This)->lpVtbl -> GetFeatureMask(This) ) + ( (This)->lpVtbl -> GetFeatureMask(This) ) #define ID3D12DebugDevice_ReportLiveDeviceObjects(This,Flags) \ - ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) + ( (This)->lpVtbl -> ReportLiveDeviceObjects(This,Flags) ) #endif /* COBJMACROS */ @@ -619,7 +604,7 @@ EXTERN_C const IID IID_ID3D12DebugDevice; #endif /* __ID3D12DebugDevice_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0005 */ -/* [local] */ +/* [local] */ DEFINE_GUID(DXGI_DEBUG_D3D12, 0xcf59a98c, 0xa950, 0x4326, 0x91, 0xef, 0x9b, 0xba, 0xa1, 0x7b, 0xfd, 0x95); @@ -630,47 +615,46 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0005_v0_0_s_ifspec; #define __ID3D12DebugCommandQueue_INTERFACE_DEFINED__ /* interface ID3D12DebugCommandQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DebugCommandQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("09e0bf36-54ac-484f-8847-4baeeab6053a") ID3D12DebugCommandQueue : public IUnknown { public: - virtual BOOL STDMETHODCALLTYPE AssertResourceState( + virtual BOOL STDMETHODCALLTYPE AssertResourceState( _In_ ID3D12Resource *pResource, UINT Subresource, UINT State) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugCommandQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DebugCommandQueue * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DebugCommandQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DebugCommandQueue * This); - - BOOL ( STDMETHODCALLTYPE *AssertResourceState )( + + BOOL ( STDMETHODCALLTYPE *AssertResourceState )( ID3D12DebugCommandQueue * This, _In_ ID3D12Resource *pResource, UINT Subresource, UINT State); - + END_INTERFACE } ID3D12DebugCommandQueueVtbl; @@ -679,21 +663,19 @@ EXTERN_C const IID IID_ID3D12DebugCommandQueue; CONST_VTBL struct ID3D12DebugCommandQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DebugCommandQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DebugCommandQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DebugCommandQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DebugCommandQueue_AssertResourceState(This,pResource,Subresource,State) \ - ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) + ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) #endif /* COBJMACROS */ @@ -702,9 +684,9 @@ EXTERN_C const IID IID_ID3D12DebugCommandQueue; #endif /* __ID3D12DebugCommandQueue_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0006 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE { D3D12_DEBUG_COMMAND_LIST_PARAMETER_GPU_BASED_VALIDATION_SETTINGS = 0 @@ -722,69 +704,68 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0006_v0_0_s_ifspec; #define __ID3D12DebugCommandList1_INTERFACE_DEFINED__ /* interface ID3D12DebugCommandList1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DebugCommandList1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("102ca951-311b-4b01-b11f-ecb83e061b37") ID3D12DebugCommandList1 : public IUnknown { public: - virtual BOOL STDMETHODCALLTYPE AssertResourceState( + virtual BOOL STDMETHODCALLTYPE AssertResourceState( _In_ ID3D12Resource *pResource, UINT Subresource, UINT State) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( + + virtual HRESULT STDMETHODCALLTYPE SetDebugParameter( D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type, _In_reads_bytes_(DataSize) const void *pData, UINT DataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( + + virtual HRESULT STDMETHODCALLTYPE GetDebugParameter( D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type, _Out_writes_bytes_(DataSize) void *pData, UINT DataSize) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugCommandList1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DebugCommandList1 * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DebugCommandList1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DebugCommandList1 * This); - - BOOL ( STDMETHODCALLTYPE *AssertResourceState )( + + BOOL ( STDMETHODCALLTYPE *AssertResourceState )( ID3D12DebugCommandList1 * This, _In_ ID3D12Resource *pResource, UINT Subresource, UINT State); - - HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( + + HRESULT ( STDMETHODCALLTYPE *SetDebugParameter )( ID3D12DebugCommandList1 * This, D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type, _In_reads_bytes_(DataSize) const void *pData, UINT DataSize); - - HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( + + HRESULT ( STDMETHODCALLTYPE *GetDebugParameter )( ID3D12DebugCommandList1 * This, D3D12_DEBUG_COMMAND_LIST_PARAMETER_TYPE Type, _Out_writes_bytes_(DataSize) void *pData, UINT DataSize); - + END_INTERFACE } ID3D12DebugCommandList1Vtbl; @@ -793,27 +774,25 @@ EXTERN_C const IID IID_ID3D12DebugCommandList1; CONST_VTBL struct ID3D12DebugCommandList1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DebugCommandList1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DebugCommandList1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DebugCommandList1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DebugCommandList1_AssertResourceState(This,pResource,Subresource,State) \ - ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) + ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) #define ID3D12DebugCommandList1_SetDebugParameter(This,Type,pData,DataSize) \ - ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) + ( (This)->lpVtbl -> SetDebugParameter(This,Type,pData,DataSize) ) #define ID3D12DebugCommandList1_GetDebugParameter(This,Type,pData,DataSize) \ - ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) + ( (This)->lpVtbl -> GetDebugParameter(This,Type,pData,DataSize) ) #endif /* COBJMACROS */ @@ -825,59 +804,58 @@ EXTERN_C const IID IID_ID3D12DebugCommandList1; #define __ID3D12DebugCommandList_INTERFACE_DEFINED__ /* interface ID3D12DebugCommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12DebugCommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("09e0bf36-54ac-484f-8847-4baeeab6053f") ID3D12DebugCommandList : public IUnknown { public: - virtual BOOL STDMETHODCALLTYPE AssertResourceState( + virtual BOOL STDMETHODCALLTYPE AssertResourceState( _In_ ID3D12Resource *pResource, UINT Subresource, UINT State) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( + + virtual HRESULT STDMETHODCALLTYPE SetFeatureMask( D3D12_DEBUG_FEATURE Mask) = 0; - + virtual D3D12_DEBUG_FEATURE STDMETHODCALLTYPE GetFeatureMask( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12DebugCommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12DebugCommandList * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12DebugCommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12DebugCommandList * This); - - BOOL ( STDMETHODCALLTYPE *AssertResourceState )( + + BOOL ( STDMETHODCALLTYPE *AssertResourceState )( ID3D12DebugCommandList * This, _In_ ID3D12Resource *pResource, UINT Subresource, UINT State); - - HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( + + HRESULT ( STDMETHODCALLTYPE *SetFeatureMask )( ID3D12DebugCommandList * This, D3D12_DEBUG_FEATURE Mask); - - D3D12_DEBUG_FEATURE ( STDMETHODCALLTYPE *GetFeatureMask )( + + D3D12_DEBUG_FEATURE ( STDMETHODCALLTYPE *GetFeatureMask )( ID3D12DebugCommandList * This); - + END_INTERFACE } ID3D12DebugCommandListVtbl; @@ -886,27 +864,25 @@ EXTERN_C const IID IID_ID3D12DebugCommandList; CONST_VTBL struct ID3D12DebugCommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12DebugCommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12DebugCommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12DebugCommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12DebugCommandList_AssertResourceState(This,pResource,Subresource,State) \ - ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) + ( (This)->lpVtbl -> AssertResourceState(This,pResource,Subresource,State) ) #define ID3D12DebugCommandList_SetFeatureMask(This,Mask) \ - ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) + ( (This)->lpVtbl -> SetFeatureMask(This,Mask) ) #define ID3D12DebugCommandList_GetFeatureMask(This) \ - ( (This)->lpVtbl -> GetFeatureMask(This) ) + ( (This)->lpVtbl -> GetFeatureMask(This) ) #endif /* COBJMACROS */ @@ -918,54 +894,53 @@ EXTERN_C const IID IID_ID3D12DebugCommandList; #define __ID3D12SharingContract_INTERFACE_DEFINED__ /* interface ID3D12SharingContract */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12SharingContract; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a251ff70-cdeb-49fa-9bcf-5ebdf4dbaca9") ID3D12SharingContract : public IUnknown { public: - virtual void STDMETHODCALLTYPE Present( + virtual void STDMETHODCALLTYPE Present( _In_ ID3D12Resource *pResource, UINT Subresource) = 0; - - virtual void STDMETHODCALLTYPE SharedFenceSignal( + + virtual void STDMETHODCALLTYPE SharedFenceSignal( _In_ ID3D12Fence *pFence, UINT64 FenceValue) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12SharingContractVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12SharingContract * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12SharingContract * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12SharingContract * This); - - void ( STDMETHODCALLTYPE *Present )( + + void ( STDMETHODCALLTYPE *Present )( ID3D12SharingContract * This, _In_ ID3D12Resource *pResource, UINT Subresource); - - void ( STDMETHODCALLTYPE *SharedFenceSignal )( + + void ( STDMETHODCALLTYPE *SharedFenceSignal )( ID3D12SharingContract * This, _In_ ID3D12Fence *pFence, UINT64 FenceValue); - + END_INTERFACE } ID3D12SharingContractVtbl; @@ -974,24 +949,22 @@ EXTERN_C const IID IID_ID3D12SharingContract; CONST_VTBL struct ID3D12SharingContractVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12SharingContract_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12SharingContract_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12SharingContract_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12SharingContract_Present(This,pResource,Subresource) \ - ( (This)->lpVtbl -> Present(This,pResource,Subresource) ) + ( (This)->lpVtbl -> Present(This,pResource,Subresource) ) #define ID3D12SharingContract_SharedFenceSignal(This,pFence,FenceValue) \ - ( (This)->lpVtbl -> SharedFenceSignal(This,pFence,FenceValue) ) + ( (This)->lpVtbl -> SharedFenceSignal(This,pFence,FenceValue) ) #endif /* COBJMACROS */ @@ -1000,9 +973,9 @@ EXTERN_C const IID IID_ID3D12SharingContract; #endif /* __ID3D12SharingContract_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0009 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_MESSAGE_CATEGORY { D3D12_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0, @@ -1015,20 +988,20 @@ enum D3D12_MESSAGE_CATEGORY D3D12_MESSAGE_CATEGORY_STATE_GETTING = ( D3D12_MESSAGE_CATEGORY_STATE_SETTING + 1 ) , D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = ( D3D12_MESSAGE_CATEGORY_STATE_GETTING + 1 ) , D3D12_MESSAGE_CATEGORY_EXECUTION = ( D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 ) , - D3D12_MESSAGE_CATEGORY_SHADER = ( D3D12_MESSAGE_CATEGORY_EXECUTION + 1 ) + D3D12_MESSAGE_CATEGORY_SHADER = ( D3D12_MESSAGE_CATEGORY_EXECUTION + 1 ) } D3D12_MESSAGE_CATEGORY; -typedef +typedef enum D3D12_MESSAGE_SEVERITY { D3D12_MESSAGE_SEVERITY_CORRUPTION = 0, D3D12_MESSAGE_SEVERITY_ERROR = ( D3D12_MESSAGE_SEVERITY_CORRUPTION + 1 ) , D3D12_MESSAGE_SEVERITY_WARNING = ( D3D12_MESSAGE_SEVERITY_ERROR + 1 ) , D3D12_MESSAGE_SEVERITY_INFO = ( D3D12_MESSAGE_SEVERITY_WARNING + 1 ) , - D3D12_MESSAGE_SEVERITY_MESSAGE = ( D3D12_MESSAGE_SEVERITY_INFO + 1 ) + D3D12_MESSAGE_SEVERITY_MESSAGE = ( D3D12_MESSAGE_SEVERITY_INFO + 1 ) } D3D12_MESSAGE_SEVERITY; -typedef +typedef enum D3D12_MESSAGE_ID { D3D12_MESSAGE_ID_UNKNOWN = 0, @@ -2142,7 +2115,7 @@ enum D3D12_MESSAGE_ID D3D12_MESSAGE_ID_ENQUEUE_MAKE_RESIDENT_INVALID_FLAGS = 1111, D3D12_MESSAGE_ID_OPENEXISTINGHEAP_UNSUPPORTED = 1112, D3D12_MESSAGE_ID_VIDEO_PROCESS_FRAMES_INVALID_ARGUMENT = 1113, - D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_VIDEO_PROCESS_FRAMES_INVALID_ARGUMENT + 1 ) + D3D12_MESSAGE_ID_D3D12_MESSAGES_END = ( D3D12_MESSAGE_ID_VIDEO_PROCESS_FRAMES_INVALID_ARGUMENT + 1 ) } D3D12_MESSAGE_ID; typedef struct D3D12_MESSAGE @@ -2179,267 +2152,266 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12sdklayers_0000_0009_v0_0_s_ifspec; #define __ID3D12InfoQueue_INTERFACE_DEFINED__ /* interface ID3D12InfoQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12InfoQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0742a90b-c387-483f-b946-30a7e4e61458") ID3D12InfoQueue : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( + virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( _In_ UINT64 MessageCountLimit) = 0; - + virtual void STDMETHODCALLTYPE ClearStoredMessages( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMessage( + + virtual HRESULT STDMETHODCALLTYPE GetMessage( _In_ UINT64 MessageIndex, _Out_writes_bytes_opt_(*pMessageByteLength) D3D12_MESSAGE *pMessage, _Inout_ SIZE_T *pMessageByteLength) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilter( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( void) = 0; - + virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( + + virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( _In_ D3D12_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( + + virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( _Out_writes_bytes_opt_(*pFilterByteLength) D3D12_INFO_QUEUE_FILTER *pFilter, _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( + + virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( _In_ D3D12_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopStorageFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( + + virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( _In_ D3D12_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( + + virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( _Out_writes_bytes_opt_(*pFilterByteLength) D3D12_INFO_QUEUE_FILTER *pFilter, _Inout_ SIZE_T *pFilterByteLength) = 0; - + virtual void STDMETHODCALLTYPE ClearRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( + + virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( _In_ D3D12_INFO_QUEUE_FILTER *pFilter) = 0; - + virtual void STDMETHODCALLTYPE PopRetrievalFilter( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMessage( + + virtual HRESULT STDMETHODCALLTYPE AddMessage( _In_ D3D12_MESSAGE_CATEGORY Category, _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ D3D12_MESSAGE_ID ID, _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( + + virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( _In_ D3D12_MESSAGE_CATEGORY Category, _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( _In_ D3D12_MESSAGE_ID ID, _In_ BOOL bEnable) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( + + virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( _In_ D3D12_MESSAGE_CATEGORY Category) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( + + virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( _In_ D3D12_MESSAGE_SEVERITY Severity) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnID( + + virtual BOOL STDMETHODCALLTYPE GetBreakOnID( _In_ D3D12_MESSAGE_ID ID) = 0; - - virtual void STDMETHODCALLTYPE SetMuteDebugOutput( + + virtual void STDMETHODCALLTYPE SetMuteDebugOutput( _In_ BOOL bMute) = 0; - + virtual BOOL STDMETHODCALLTYPE GetMuteDebugOutput( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12InfoQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12InfoQueue * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12InfoQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( + + HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( ID3D12InfoQueue * This, _In_ UINT64 MessageCountLimit); - - void ( STDMETHODCALLTYPE *ClearStoredMessages )( + + void ( STDMETHODCALLTYPE *ClearStoredMessages )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *GetMessage )( + + HRESULT ( STDMETHODCALLTYPE *GetMessage )( ID3D12InfoQueue * This, _In_ UINT64 MessageIndex, _Out_writes_bytes_opt_(*pMessageByteLength) D3D12_MESSAGE *pMessage, _Inout_ SIZE_T *pMessageByteLength); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( ID3D12InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( ID3D12InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( ID3D12InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilter )( ID3D12InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( ID3D12InfoQueue * This); - - UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( ID3D12InfoQueue * This, _In_ D3D12_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( ID3D12InfoQueue * This, _Out_writes_bytes_opt_(*pFilterByteLength) D3D12_INFO_QUEUE_FILTER *pFilter, _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearStorageFilter )( + + void ( STDMETHODCALLTYPE *ClearStorageFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( ID3D12InfoQueue * This, _In_ D3D12_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopStorageFilter )( + + void ( STDMETHODCALLTYPE *PopStorageFilter )( ID3D12InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( ID3D12InfoQueue * This, _In_ D3D12_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( ID3D12InfoQueue * This, _Out_writes_bytes_opt_(*pFilterByteLength) D3D12_INFO_QUEUE_FILTER *pFilter, _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( + + void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( ID3D12InfoQueue * This, _In_ D3D12_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopRetrievalFilter )( + + void ( STDMETHODCALLTYPE *PopRetrievalFilter )( ID3D12InfoQueue * This); - - UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( ID3D12InfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *AddMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddMessage )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_CATEGORY Category, _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ D3D12_MESSAGE_ID ID, _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_CATEGORY Category, _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_SEVERITY Severity, _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_ID ID, _In_ BOOL bEnable); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_CATEGORY Category); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_SEVERITY Severity); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( ID3D12InfoQueue * This, _In_ D3D12_MESSAGE_ID ID); - - void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( + + void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( ID3D12InfoQueue * This, _In_ BOOL bMute); - - BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( + + BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( ID3D12InfoQueue * This); - + END_INTERFACE } ID3D12InfoQueueVtbl; @@ -2448,123 +2420,121 @@ EXTERN_C const IID IID_ID3D12InfoQueue; CONST_VTBL struct ID3D12InfoQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12InfoQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12InfoQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12InfoQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12InfoQueue_SetMessageCountLimit(This,MessageCountLimit) \ - ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) + ( (This)->lpVtbl -> SetMessageCountLimit(This,MessageCountLimit) ) #define ID3D12InfoQueue_ClearStoredMessages(This) \ - ( (This)->lpVtbl -> ClearStoredMessages(This) ) + ( (This)->lpVtbl -> ClearStoredMessages(This) ) #define ID3D12InfoQueue_GetMessage(This,MessageIndex,pMessage,pMessageByteLength) \ - ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) + ( (This)->lpVtbl -> GetMessage(This,MessageIndex,pMessage,pMessageByteLength) ) #define ID3D12InfoQueue_GetNumMessagesAllowedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This) ) #define ID3D12InfoQueue_GetNumMessagesDeniedByStorageFilter(This) \ - ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) + ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This) ) #define ID3D12InfoQueue_GetNumStoredMessages(This) \ - ( (This)->lpVtbl -> GetNumStoredMessages(This) ) + ( (This)->lpVtbl -> GetNumStoredMessages(This) ) #define ID3D12InfoQueue_GetNumStoredMessagesAllowedByRetrievalFilter(This) \ - ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) + ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilter(This) ) #define ID3D12InfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This) ) #define ID3D12InfoQueue_GetMessageCountLimit(This) \ - ( (This)->lpVtbl -> GetMessageCountLimit(This) ) + ( (This)->lpVtbl -> GetMessageCountLimit(This) ) #define ID3D12InfoQueue_AddStorageFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddStorageFilterEntries(This,pFilter) ) #define ID3D12InfoQueue_GetStorageFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetStorageFilter(This,pFilter,pFilterByteLength) ) #define ID3D12InfoQueue_ClearStorageFilter(This) \ - ( (This)->lpVtbl -> ClearStorageFilter(This) ) + ( (This)->lpVtbl -> ClearStorageFilter(This) ) #define ID3D12InfoQueue_PushEmptyStorageFilter(This) \ - ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) + ( (This)->lpVtbl -> PushEmptyStorageFilter(This) ) #define ID3D12InfoQueue_PushCopyOfStorageFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfStorageFilter(This) ) #define ID3D12InfoQueue_PushStorageFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushStorageFilter(This,pFilter) ) #define ID3D12InfoQueue_PopStorageFilter(This) \ - ( (This)->lpVtbl -> PopStorageFilter(This) ) + ( (This)->lpVtbl -> PopStorageFilter(This) ) #define ID3D12InfoQueue_GetStorageFilterStackSize(This) \ - ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) + ( (This)->lpVtbl -> GetStorageFilterStackSize(This) ) #define ID3D12InfoQueue_AddRetrievalFilterEntries(This,pFilter) \ - ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) + ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,pFilter) ) #define ID3D12InfoQueue_GetRetrievalFilter(This,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetRetrievalFilter(This,pFilter,pFilterByteLength) ) #define ID3D12InfoQueue_ClearRetrievalFilter(This) \ - ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) + ( (This)->lpVtbl -> ClearRetrievalFilter(This) ) #define ID3D12InfoQueue_PushEmptyRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This) ) #define ID3D12InfoQueue_PushCopyOfRetrievalFilter(This) \ - ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) + ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This) ) #define ID3D12InfoQueue_PushRetrievalFilter(This,pFilter) \ - ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) + ( (This)->lpVtbl -> PushRetrievalFilter(This,pFilter) ) #define ID3D12InfoQueue_PopRetrievalFilter(This) \ - ( (This)->lpVtbl -> PopRetrievalFilter(This) ) + ( (This)->lpVtbl -> PopRetrievalFilter(This) ) #define ID3D12InfoQueue_GetRetrievalFilterStackSize(This) \ - ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) + ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This) ) #define ID3D12InfoQueue_AddMessage(This,Category,Severity,ID,pDescription) \ - ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) + ( (This)->lpVtbl -> AddMessage(This,Category,Severity,ID,pDescription) ) #define ID3D12InfoQueue_AddApplicationMessage(This,Severity,pDescription) \ - ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) + ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) #define ID3D12InfoQueue_SetBreakOnCategory(This,Category,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnCategory(This,Category,bEnable) ) #define ID3D12InfoQueue_SetBreakOnSeverity(This,Severity,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnSeverity(This,Severity,bEnable) ) #define ID3D12InfoQueue_SetBreakOnID(This,ID,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnID(This,ID,bEnable) ) #define ID3D12InfoQueue_GetBreakOnCategory(This,Category) \ - ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) + ( (This)->lpVtbl -> GetBreakOnCategory(This,Category) ) #define ID3D12InfoQueue_GetBreakOnSeverity(This,Severity) \ - ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) + ( (This)->lpVtbl -> GetBreakOnSeverity(This,Severity) ) #define ID3D12InfoQueue_GetBreakOnID(This,ID) \ - ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) + ( (This)->lpVtbl -> GetBreakOnID(This,ID) ) #define ID3D12InfoQueue_SetMuteDebugOutput(This,bMute) \ - ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) + ( (This)->lpVtbl -> SetMuteDebugOutput(This,bMute) ) #define ID3D12InfoQueue_GetMuteDebugOutput(This) \ - ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) + ( (This)->lpVtbl -> GetMuteDebugOutput(This) ) #endif /* COBJMACROS */ @@ -2573,7 +2543,7 @@ EXTERN_C const IID IID_ID3D12InfoQueue; #endif /* __ID3D12InfoQueue_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12sdklayers_0000_0010 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/d3d12shader.h b/gfx/include/dxsdk/d3d12shader.h index 8d1bc7c5d0..6c060acfef 100644 --- a/gfx/include/dxsdk/d3d12shader.h +++ b/gfx/include/dxsdk/d3d12shader.h @@ -17,7 +17,7 @@ typedef enum D3D12_SHADER_VERSION_TYPE D3D12_SHVER_PIXEL_SHADER = 0, D3D12_SHVER_VERTEX_SHADER = 1, D3D12_SHVER_GEOMETRY_SHADER = 2, - + // D3D11 Shaders D3D12_SHVER_HULL_SHADER = 3, D3D12_SHVER_DOMAIN_SHADER = 4, @@ -49,7 +49,7 @@ typedef struct _D3D12_SIGNATURE_PARAMETER_DESC D3D_REGISTER_COMPONENT_TYPE ComponentType; // Scalar type (e.g. uint, float, etc.) BYTE Mask; // Mask to indicate which components of the register // are used (combination of D3D10_COMPONENT_MASK values) - BYTE ReadWriteMask; // Mask to indicate whether a given component is + BYTE ReadWriteMask; // Mask to indicate whether a given component is // never written (if this is an output signature) or // always read (if this is an input signature). // (combination of D3D_MASK_* values) @@ -102,16 +102,16 @@ typedef struct _D3D12_SHADER_DESC UINT Version; // Shader version LPCSTR Creator; // Creator string UINT Flags; // Shader compilation/parse flags - + UINT ConstantBuffers; // Number of constant buffers UINT BoundResources; // Number of bound resources UINT InputParameters; // Number of parameters in the input signature UINT OutputParameters; // Number of parameters in the output signature UINT InstructionCount; // Number of emitted instructions - UINT TempRegisterCount; // Number of temporary registers used + UINT TempRegisterCount; // Number of temporary registers used UINT TempArrayCount; // Number of temporary arrays used - UINT DefCount; // Number of constant defines + UINT DefCount; // Number of constant defines UINT DclCount; // Number of declarations (input + output) UINT TextureNormalInstructions; // Number of non-categorized texture instructions UINT TextureLoadInstructions; // Number of texture load instructions @@ -184,14 +184,14 @@ typedef struct _D3D12_FUNCTION_DESC UINT Version; // Shader version LPCSTR Creator; // Creator string UINT Flags; // Shader compilation/parse flags - + UINT ConstantBuffers; // Number of constant buffers UINT BoundResources; // Number of bound resources UINT InstructionCount; // Number of emitted instructions - UINT TempRegisterCount; // Number of temporary registers used + UINT TempRegisterCount; // Number of temporary registers used UINT TempArrayCount; // Number of temporary arrays used - UINT DefCount; // Number of constant defines + UINT DefCount; // Number of constant defines UINT DclCount; // Number of declarations (input + output) UINT TextureNormalInstructions; // Number of non-categorized texture instructions UINT TextureLoadInstructions; // Number of texture load instructions @@ -263,7 +263,7 @@ typedef interface ID3D12FunctionParameterReflection *LPD3D12FUNCTIONPARAMETERREF // {E913C351-783D-48CA-A1D1-4F306284AD56} interface DECLSPEC_UUID("E913C351-783D-48CA-A1D1-4F306284AD56") ID3D12ShaderReflectionType; -DEFINE_GUID(IID_ID3D12ShaderReflectionType, +DEFINE_GUID(IID_ID3D12ShaderReflectionType, 0xe913c351, 0x783d, 0x48ca, 0xa1, 0xd1, 0x4f, 0x30, 0x62, 0x84, 0xad, 0x56); #undef INTERFACE @@ -272,7 +272,7 @@ DEFINE_GUID(IID_ID3D12ShaderReflectionType, DECLARE_INTERFACE(ID3D12ShaderReflectionType) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_TYPE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionType*, GetMemberTypeByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D12ShaderReflectionType*, GetMemberTypeByName)(THIS_ _In_ LPCSTR Name) PURE; STDMETHOD_(LPCSTR, GetMemberTypeName)(THIS_ _In_ UINT Index) PURE; @@ -288,7 +288,7 @@ DECLARE_INTERFACE(ID3D12ShaderReflectionType) // {8337A8A6-A216-444A-B2F4-314733A73AEA} interface DECLSPEC_UUID("8337A8A6-A216-444A-B2F4-314733A73AEA") ID3D12ShaderReflectionVariable; -DEFINE_GUID(IID_ID3D12ShaderReflectionVariable, +DEFINE_GUID(IID_ID3D12ShaderReflectionVariable, 0x8337a8a6, 0xa216, 0x444a, 0xb2, 0xf4, 0x31, 0x47, 0x33, 0xa7, 0x3a, 0xea); #undef INTERFACE @@ -297,7 +297,7 @@ DEFINE_GUID(IID_ID3D12ShaderReflectionVariable, DECLARE_INTERFACE(ID3D12ShaderReflectionVariable) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_VARIABLE_DESC *pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionType*, GetType)(THIS) PURE; STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetBuffer)(THIS) PURE; @@ -306,7 +306,7 @@ DECLARE_INTERFACE(ID3D12ShaderReflectionVariable) // {C59598B4-48B3-4869-B9B1-B1618B14A8B7} interface DECLSPEC_UUID("C59598B4-48B3-4869-B9B1-B1618B14A8B7") ID3D12ShaderReflectionConstantBuffer; -DEFINE_GUID(IID_ID3D12ShaderReflectionConstantBuffer, +DEFINE_GUID(IID_ID3D12ShaderReflectionConstantBuffer, 0xc59598b4, 0x48b3, 0x4869, 0xb9, 0xb1, 0xb1, 0x61, 0x8b, 0x14, 0xa8, 0xb7); #undef INTERFACE @@ -315,7 +315,7 @@ DEFINE_GUID(IID_ID3D12ShaderReflectionConstantBuffer, DECLARE_INTERFACE(ID3D12ShaderReflectionConstantBuffer) { STDMETHOD(GetDesc)(THIS_ D3D12_SHADER_BUFFER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionVariable*, GetVariableByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D12ShaderReflectionVariable*, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE; }; @@ -327,7 +327,7 @@ DECLARE_INTERFACE(ID3D12ShaderReflectionConstantBuffer) // {5A58797D-A72C-478D-8BA2-EFC6B0EFE88E} interface DECLSPEC_UUID("5A58797D-A72C-478D-8BA2-EFC6B0EFE88E") ID3D12ShaderReflection; -DEFINE_GUID(IID_ID3D12ShaderReflection, +DEFINE_GUID(IID_ID3D12ShaderReflection, 0x5a58797d, 0xa72c, 0x478d, 0x8b, 0xa2, 0xef, 0xc6, 0xb0, 0xef, 0xe8, 0x8e); #undef INTERFACE @@ -341,13 +341,13 @@ DECLARE_INTERFACE_(ID3D12ShaderReflection, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_SHADER_DESC *pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetConstantBufferByIndex)(THIS_ _In_ UINT Index) PURE; STDMETHOD_(ID3D12ShaderReflectionConstantBuffer*, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex, _Out_ D3D12_SHADER_INPUT_BIND_DESC *pDesc) PURE; - + STDMETHOD(GetInputParameterDesc)(THIS_ _In_ UINT ParameterIndex, _Out_ D3D12_SIGNATURE_PARAMETER_DESC *pDesc) PURE; STDMETHOD(GetOutputParameterDesc)(THIS_ _In_ UINT ParameterIndex, @@ -364,7 +364,7 @@ DECLARE_INTERFACE_(ID3D12ShaderReflection, IUnknown) STDMETHOD_(UINT, GetMovcInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetConversionInstructionCount)(THIS) PURE; STDMETHOD_(UINT, GetBitwiseInstructionCount)(THIS) PURE; - + STDMETHOD_(D3D_PRIMITIVE, GetGSInputPrimitive)(THIS) PURE; STDMETHOD_(BOOL, IsSampleFrequencyShader)(THIS) PURE; @@ -381,7 +381,7 @@ DECLARE_INTERFACE_(ID3D12ShaderReflection, IUnknown) // {8E349D19-54DB-4A56-9DC9-119D87BDB804} interface DECLSPEC_UUID("8E349D19-54DB-4A56-9DC9-119D87BDB804") ID3D12LibraryReflection; -DEFINE_GUID(IID_ID3D12LibraryReflection, +DEFINE_GUID(IID_ID3D12LibraryReflection, 0x8e349d19, 0x54db, 0x4a56, 0x9d, 0xc9, 0x11, 0x9d, 0x87, 0xbd, 0xb8, 0x4); #undef INTERFACE @@ -394,13 +394,13 @@ DECLARE_INTERFACE_(ID3D12LibraryReflection, IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_LIBRARY_DESC * pDesc) PURE; - + STDMETHOD_(ID3D12FunctionReflection *, GetFunctionByIndex)(THIS_ _In_ INT FunctionIndex) PURE; }; // {1108795C-2772-4BA9-B2A8-D464DC7E2799} interface DECLSPEC_UUID("1108795C-2772-4BA9-B2A8-D464DC7E2799") ID3D12FunctionReflection; -DEFINE_GUID(IID_ID3D12FunctionReflection, +DEFINE_GUID(IID_ID3D12FunctionReflection, 0x1108795c, 0x2772, 0x4ba9, 0xb2, 0xa8, 0xd4, 0x64, 0xdc, 0x7e, 0x27, 0x99); #undef INTERFACE @@ -409,13 +409,13 @@ DEFINE_GUID(IID_ID3D12FunctionReflection, DECLARE_INTERFACE(ID3D12FunctionReflection) { STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_FUNCTION_DESC * pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionConstantBuffer *, GetConstantBufferByIndex)(THIS_ _In_ UINT BufferIndex) PURE; STDMETHOD_(ID3D12ShaderReflectionConstantBuffer *, GetConstantBufferByName)(THIS_ _In_ LPCSTR Name) PURE; - + STDMETHOD(GetResourceBindingDesc)(THIS_ _In_ UINT ResourceIndex, _Out_ D3D12_SHADER_INPUT_BIND_DESC * pDesc) PURE; - + STDMETHOD_(ID3D12ShaderReflectionVariable *, GetVariableByName)(THIS_ _In_ LPCSTR Name) PURE; STDMETHOD(GetResourceBindingDescByName)(THIS_ _In_ LPCSTR Name, @@ -427,7 +427,7 @@ DECLARE_INTERFACE(ID3D12FunctionReflection) // {EC25F42D-7006-4F2B-B33E-02CC3375733F} interface DECLSPEC_UUID("EC25F42D-7006-4F2B-B33E-02CC3375733F") ID3D12FunctionParameterReflection; -DEFINE_GUID(IID_ID3D12FunctionParameterReflection, +DEFINE_GUID(IID_ID3D12FunctionParameterReflection, 0xec25f42d, 0x7006, 0x4f2b, 0xb3, 0x3e, 0x2, 0xcc, 0x33, 0x75, 0x73, 0x3f); #undef INTERFACE @@ -449,5 +449,5 @@ extern "C" { #ifdef __cplusplus } #endif //__cplusplus - + #endif //__D3D12SHADER_H__ diff --git a/gfx/include/dxsdk/d3d12video.h b/gfx/include/dxsdk/d3d12video.h index 65a40cf467..2f50ff8230 100644 --- a/gfx/include/dxsdk/d3d12video.h +++ b/gfx/include/dxsdk/d3d12video.h @@ -37,7 +37,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D12VideoDecoderHeap_FWD_DEFINED__ #define __ID3D12VideoDecoderHeap_FWD_DEFINED__ @@ -83,15 +83,15 @@ typedef interface ID3D12VideoProcessCommandList ID3D12VideoProcessCommandList; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3d12video_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ -typedef +typedef enum D3D12_VIDEO_FIELD_TYPE { D3D12_VIDEO_FIELD_TYPE_NONE = 0, @@ -99,7 +99,7 @@ enum D3D12_VIDEO_FIELD_TYPE D3D12_VIDEO_FIELD_TYPE_INTERLACED_BOTTOM_FIELD_FIRST = 2 } D3D12_VIDEO_FIELD_TYPE; -typedef +typedef enum D3D12_VIDEO_FRAME_STEREO_FORMAT { D3D12_VIDEO_FRAME_STEREO_FORMAT_NONE = 0, @@ -122,14 +122,14 @@ typedef struct D3D12_VIDEO_SAMPLE D3D12_VIDEO_FORMAT Format; } D3D12_VIDEO_SAMPLE; -typedef +typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE { D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE = 0, D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED = 1 } D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE; -typedef +typedef enum D3D12_FEATURE_VIDEO { D3D12_FEATURE_VIDEO_DECODE_SUPPORT = 0, @@ -146,7 +146,7 @@ enum D3D12_FEATURE_VIDEO D3D12_FEATURE_VIDEO_ARCHITECTURE = 17 } D3D12_FEATURE_VIDEO; -typedef +typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE { D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE = 0 @@ -185,7 +185,7 @@ typedef struct D3D12_VIDEO_SIZE_RANGE UINT MinHeight; } D3D12_VIDEO_SIZE_RANGE; -typedef +typedef enum D3D12_VIDEO_PROCESS_FILTER { D3D12_VIDEO_PROCESS_FILTER_BRIGHTNESS = 0, @@ -198,7 +198,7 @@ enum D3D12_VIDEO_PROCESS_FILTER D3D12_VIDEO_PROCESS_FILTER_STEREO_ADJUSTMENT = 7 } D3D12_VIDEO_PROCESS_FILTER; -typedef +typedef enum D3D12_VIDEO_PROCESS_FILTER_FLAGS { D3D12_VIDEO_PROCESS_FILTER_FLAG_NONE = 0, @@ -209,11 +209,11 @@ enum D3D12_VIDEO_PROCESS_FILTER_FLAGS D3D12_VIDEO_PROCESS_FILTER_FLAG_NOISE_REDUCTION = ( 1 << D3D12_VIDEO_PROCESS_FILTER_NOISE_REDUCTION ) , D3D12_VIDEO_PROCESS_FILTER_FLAG_EDGE_ENHANCEMENT = ( 1 << D3D12_VIDEO_PROCESS_FILTER_EDGE_ENHANCEMENT ) , D3D12_VIDEO_PROCESS_FILTER_FLAG_ANAMORPHIC_SCALING = ( 1 << D3D12_VIDEO_PROCESS_FILTER_ANAMORPHIC_SCALING ) , - D3D12_VIDEO_PROCESS_FILTER_FLAG_STEREO_ADJUSTMENT = ( 1 << D3D12_VIDEO_PROCESS_FILTER_STEREO_ADJUSTMENT ) + D3D12_VIDEO_PROCESS_FILTER_FLAG_STEREO_ADJUSTMENT = ( 1 << D3D12_VIDEO_PROCESS_FILTER_STEREO_ADJUSTMENT ) } D3D12_VIDEO_PROCESS_FILTER_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_FILTER_FLAGS ); -typedef +typedef enum D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS { D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_NONE = 0, @@ -256,7 +256,7 @@ typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC BOOL EnableAutoProcessing; } D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC; -typedef +typedef enum D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE { D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_OPAQUE = 0, @@ -283,67 +283,66 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12video_0000_0000_v0_0_s_ifspec; #define __ID3D12VideoDecoderHeap_INTERFACE_DEFINED__ /* interface ID3D12VideoDecoderHeap */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoDecoderHeap; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0946B7C9-EBF6-4047-BB73-8683E27DBB1F") ID3D12VideoDecoderHeap : public ID3D12Pageable { public: virtual D3D12_VIDEO_DECODER_HEAP_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoDecoderHeapVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoDecoderHeap * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoDecoderHeap * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoDecoderHeap * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12VideoDecoderHeap * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12VideoDecoderHeap * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12VideoDecoderHeap * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12VideoDecoderHeap * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12VideoDecoderHeap * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_VIDEO_DECODER_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_VIDEO_DECODER_HEAP_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12VideoDecoderHeap * This); - + END_INTERFACE } ID3D12VideoDecoderHeapVtbl; @@ -352,36 +351,34 @@ EXTERN_C const IID IID_ID3D12VideoDecoderHeap; CONST_VTBL struct ID3D12VideoDecoderHeapVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoDecoderHeap_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoDecoderHeap_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoDecoderHeap_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoDecoderHeap_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12VideoDecoderHeap_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12VideoDecoderHeap_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12VideoDecoderHeap_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12VideoDecoderHeap_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12VideoDecoderHeap_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #endif /* COBJMACROS */ @@ -393,78 +390,77 @@ EXTERN_C const IID IID_ID3D12VideoDecoderHeap; #define __ID3D12VideoDevice_INTERFACE_DEFINED__ /* interface ID3D12VideoDevice */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoDevice; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1F052807-0B46-4ACC-8A89-364F793718A4") ID3D12VideoDevice : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( + virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( D3D12_FEATURE_VIDEO FeatureVideo, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoder( + + virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoder( _In_ const D3D12_VIDEO_DECODER_DESC *pDesc, _In_ REFIID riid, _COM_Outptr_ void **ppVideoDecoder) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoderHeap( + + virtual HRESULT STDMETHODCALLTYPE CreateVideoDecoderHeap( _In_ const D3D12_VIDEO_DECODER_HEAP_DESC *pVideoDecoderHeapDesc, _In_ REFIID riid, _COM_Outptr_ void **ppVideoDecoderHeap) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessor( + + virtual HRESULT STDMETHODCALLTYPE CreateVideoProcessor( UINT NodeMask, _In_ const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *pOutputStreamDesc, UINT NumInputStreamDescs, _In_reads_(NumInputStreamDescs) const D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs, _In_ REFIID riid, _COM_Outptr_ void **ppVideoProcessor) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoDeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoDevice * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoDevice * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoDevice * This); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( ID3D12VideoDevice * This, D3D12_FEATURE_VIDEO FeatureVideo, _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoder )( ID3D12VideoDevice * This, _In_ const D3D12_VIDEO_DECODER_DESC *pDesc, _In_ REFIID riid, _COM_Outptr_ void **ppVideoDecoder); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderHeap )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoDecoderHeap )( ID3D12VideoDevice * This, _In_ const D3D12_VIDEO_DECODER_HEAP_DESC *pVideoDecoderHeapDesc, _In_ REFIID riid, _COM_Outptr_ void **ppVideoDecoderHeap); - - HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( + + HRESULT ( STDMETHODCALLTYPE *CreateVideoProcessor )( ID3D12VideoDevice * This, UINT NodeMask, _In_ const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *pOutputStreamDesc, @@ -472,7 +468,7 @@ EXTERN_C const IID IID_ID3D12VideoDevice; _In_reads_(NumInputStreamDescs) const D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs, _In_ REFIID riid, _COM_Outptr_ void **ppVideoProcessor); - + END_INTERFACE } ID3D12VideoDeviceVtbl; @@ -481,30 +477,28 @@ EXTERN_C const IID IID_ID3D12VideoDevice; CONST_VTBL struct ID3D12VideoDeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoDevice_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoDevice_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoDevice_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoDevice_CheckFeatureSupport(This,FeatureVideo,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,FeatureVideo,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,FeatureVideo,pFeatureSupportData,FeatureSupportDataSize) ) #define ID3D12VideoDevice_CreateVideoDecoder(This,pDesc,riid,ppVideoDecoder) \ - ( (This)->lpVtbl -> CreateVideoDecoder(This,pDesc,riid,ppVideoDecoder) ) + ( (This)->lpVtbl -> CreateVideoDecoder(This,pDesc,riid,ppVideoDecoder) ) #define ID3D12VideoDevice_CreateVideoDecoderHeap(This,pVideoDecoderHeapDesc,riid,ppVideoDecoderHeap) \ - ( (This)->lpVtbl -> CreateVideoDecoderHeap(This,pVideoDecoderHeapDesc,riid,ppVideoDecoderHeap) ) + ( (This)->lpVtbl -> CreateVideoDecoderHeap(This,pVideoDecoderHeapDesc,riid,ppVideoDecoderHeap) ) #define ID3D12VideoDevice_CreateVideoProcessor(This,NodeMask,pOutputStreamDesc,NumInputStreamDescs,pInputStreamDescs,riid,ppVideoProcessor) \ - ( (This)->lpVtbl -> CreateVideoProcessor(This,NodeMask,pOutputStreamDesc,NumInputStreamDescs,pInputStreamDescs,riid,ppVideoProcessor) ) + ( (This)->lpVtbl -> CreateVideoProcessor(This,NodeMask,pOutputStreamDesc,NumInputStreamDescs,pInputStreamDescs,riid,ppVideoProcessor) ) #endif /* COBJMACROS */ @@ -516,67 +510,66 @@ EXTERN_C const IID IID_ID3D12VideoDevice; #define __ID3D12VideoDecoder_INTERFACE_DEFINED__ /* interface ID3D12VideoDecoder */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoDecoder; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("C59B6BDC-7720-4074-A136-17A156037470") ID3D12VideoDecoder : public ID3D12Pageable { public: virtual D3D12_VIDEO_DECODER_DESC STDMETHODCALLTYPE GetDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoDecoderVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoDecoder * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoDecoder * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoDecoder * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12VideoDecoder * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12VideoDecoder * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12VideoDecoder * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12VideoDecoder * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12VideoDecoder * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_VIDEO_DECODER_DESC ( STDMETHODCALLTYPE *GetDesc )( + + D3D12_VIDEO_DECODER_DESC ( STDMETHODCALLTYPE *GetDesc )( ID3D12VideoDecoder * This); - + END_INTERFACE } ID3D12VideoDecoderVtbl; @@ -585,36 +578,34 @@ EXTERN_C const IID IID_ID3D12VideoDecoder; CONST_VTBL struct ID3D12VideoDecoderVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoDecoder_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoDecoder_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoDecoder_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoDecoder_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12VideoDecoder_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12VideoDecoder_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12VideoDecoder_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12VideoDecoder_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12VideoDecoder_GetDesc(This) \ - ( (This)->lpVtbl -> GetDesc(This) ) + ( (This)->lpVtbl -> GetDesc(This) ) #endif /* COBJMACROS */ @@ -623,9 +614,9 @@ EXTERN_C const IID IID_ID3D12VideoDecoder; #endif /* __ID3D12VideoDecoder_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12video_0000_0003 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_VIDEO_DECODE_TIER { D3D12_VIDEO_DECODE_TIER_NOT_SUPPORTED = 0, @@ -634,7 +625,7 @@ enum D3D12_VIDEO_DECODE_TIER D3D12_VIDEO_DECODE_TIER_3 = 3 } D3D12_VIDEO_DECODE_TIER; -typedef +typedef enum D3D12_VIDEO_DECODE_SUPPORT_FLAGS { D3D12_VIDEO_DECODE_SUPPORT_FLAG_NONE = 0, @@ -642,7 +633,7 @@ enum D3D12_VIDEO_DECODE_SUPPORT_FLAGS } D3D12_VIDEO_DECODE_SUPPORT_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_DECODE_SUPPORT_FLAGS ); -typedef +typedef enum D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS { D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_NONE = 0, @@ -653,7 +644,7 @@ enum D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS } D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS ); -typedef +typedef enum D3D12_VIDEO_DECODE_STATUS { D3D12_VIDEO_DECODE_STATUS_OK = 0, @@ -662,7 +653,7 @@ enum D3D12_VIDEO_DECODE_STATUS D3D12_VIDEO_DECODE_STATUS_RESTART = 3 } D3D12_VIDEO_DECODE_STATUS; -typedef +typedef enum D3D12_VIDEO_DECODE_ARGUMENT_TYPE { D3D12_VIDEO_DECODE_ARGUMENT_TYPE_PICTURE_PARAMETERS = 0, @@ -718,7 +709,7 @@ typedef struct D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE BOOL IOCoherent; } D3D12_FEATURE_DATA_VIDEO_ARCHITECTURE; -typedef +typedef enum D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS { D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAG_NONE = 0, @@ -726,7 +717,7 @@ enum D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS } D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_DECODE_CONVERSION_SUPPORT_FLAGS ); -typedef +typedef enum D3D12_VIDEO_SCALE_SUPPORT_FLAGS { D3D12_VIDEO_SCALE_SUPPORT_FLAG_NONE = 0, @@ -838,86 +829,85 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12video_0000_0003_v0_0_s_ifspec; #define __ID3D12VideoProcessor_INTERFACE_DEFINED__ /* interface ID3D12VideoProcessor */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoProcessor; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("304FDB32-BEDE-410A-8545-943AC6A46138") ID3D12VideoProcessor : public ID3D12Pageable { public: virtual UINT STDMETHODCALLTYPE GetNodeMask( void) = 0; - + virtual UINT STDMETHODCALLTYPE GetNumInputStreamDescs( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetInputStreamDescs( + + virtual HRESULT STDMETHODCALLTYPE GetInputStreamDescs( UINT NumInputStreamDescs, _Out_writes_(NumInputStreamDescs) D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs) = 0; - + virtual D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC STDMETHODCALLTYPE GetOutputStreamDesc( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoProcessorVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoProcessor * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoProcessor * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoProcessor * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12VideoProcessor * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12VideoProcessor * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12VideoProcessor * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12VideoProcessor * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12VideoProcessor * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - UINT ( STDMETHODCALLTYPE *GetNodeMask )( + + UINT ( STDMETHODCALLTYPE *GetNodeMask )( ID3D12VideoProcessor * This); - - UINT ( STDMETHODCALLTYPE *GetNumInputStreamDescs )( + + UINT ( STDMETHODCALLTYPE *GetNumInputStreamDescs )( ID3D12VideoProcessor * This); - - HRESULT ( STDMETHODCALLTYPE *GetInputStreamDescs )( + + HRESULT ( STDMETHODCALLTYPE *GetInputStreamDescs )( ID3D12VideoProcessor * This, UINT NumInputStreamDescs, _Out_writes_(NumInputStreamDescs) D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs); - - D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC ( STDMETHODCALLTYPE *GetOutputStreamDesc )( + + D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC ( STDMETHODCALLTYPE *GetOutputStreamDesc )( ID3D12VideoProcessor * This); - + END_INTERFACE } ID3D12VideoProcessorVtbl; @@ -926,45 +916,43 @@ EXTERN_C const IID IID_ID3D12VideoProcessor; CONST_VTBL struct ID3D12VideoProcessorVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoProcessor_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoProcessor_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoProcessor_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoProcessor_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12VideoProcessor_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12VideoProcessor_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12VideoProcessor_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12VideoProcessor_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12VideoProcessor_GetNodeMask(This) \ - ( (This)->lpVtbl -> GetNodeMask(This) ) + ( (This)->lpVtbl -> GetNodeMask(This) ) #define ID3D12VideoProcessor_GetNumInputStreamDescs(This) \ - ( (This)->lpVtbl -> GetNumInputStreamDescs(This) ) + ( (This)->lpVtbl -> GetNumInputStreamDescs(This) ) #define ID3D12VideoProcessor_GetInputStreamDescs(This,NumInputStreamDescs,pInputStreamDescs) \ - ( (This)->lpVtbl -> GetInputStreamDescs(This,NumInputStreamDescs,pInputStreamDescs) ) + ( (This)->lpVtbl -> GetInputStreamDescs(This,NumInputStreamDescs,pInputStreamDescs) ) #define ID3D12VideoProcessor_GetOutputStreamDesc(This) \ - ( (This)->lpVtbl -> GetOutputStreamDesc(This) ) + ( (This)->lpVtbl -> GetOutputStreamDesc(This) ) #endif /* COBJMACROS */ @@ -973,9 +961,9 @@ EXTERN_C const IID IID_ID3D12VideoProcessor; #endif /* __ID3D12VideoProcessor_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12video_0000_0004 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D12_VIDEO_PROCESS_FEATURE_FLAGS { D3D12_VIDEO_PROCESS_FEATURE_FLAG_NONE = 0, @@ -989,7 +977,7 @@ enum D3D12_VIDEO_PROCESS_FEATURE_FLAGS } D3D12_VIDEO_PROCESS_FEATURE_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_FEATURE_FLAGS ); -typedef +typedef enum D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS { D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAG_NONE = 0, @@ -1005,7 +993,7 @@ enum D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS } D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS; DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_PROCESS_AUTO_PROCESSING_FLAGS ); -typedef +typedef enum D3D12_VIDEO_PROCESS_ORIENTATION { D3D12_VIDEO_PROCESS_ORIENTATION_DEFAULT = 0, @@ -1018,7 +1006,7 @@ enum D3D12_VIDEO_PROCESS_ORIENTATION D3D12_VIDEO_PROCESS_ORIENTATION_CLOCKWISE_270_FLIP_HORIZONTAL = 7 } D3D12_VIDEO_PROCESS_ORIENTATION; -typedef +typedef enum D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAGS { D3D12_VIDEO_PROCESS_INPUT_STREAM_FLAG_NONE = 0, @@ -1035,7 +1023,7 @@ typedef struct D3D12_VIDEO_PROCESS_FILTER_RANGE FLOAT Multiplier; } D3D12_VIDEO_PROCESS_FILTER_RANGE; -typedef +typedef enum D3D12_VIDEO_PROCESS_SUPPORT_FLAGS { D3D12_VIDEO_PROCESS_SUPPORT_FLAG_NONE = 0, @@ -1140,158 +1128,157 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12video_0000_0004_v0_0_s_ifspec; #define __ID3D12VideoDecodeCommandList_INTERFACE_DEFINED__ /* interface ID3D12VideoDecodeCommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoDecodeCommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3B60536E-AD29-4E64-A269-F853837E5E53") ID3D12VideoDecodeCommandList : public ID3D12CommandList { public: virtual HRESULT STDMETHODCALLTYPE Close( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( + + virtual HRESULT STDMETHODCALLTYPE Reset( _In_ ID3D12CommandAllocator *pAllocator) = 0; - + virtual void STDMETHODCALLTYPE ClearState( void) = 0; - - virtual void STDMETHODCALLTYPE ResourceBarrier( + + virtual void STDMETHODCALLTYPE ResourceBarrier( _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers) = 0; - - virtual void STDMETHODCALLTYPE DiscardResource( + + virtual void STDMETHODCALLTYPE DiscardResource( _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion) = 0; - - virtual void STDMETHODCALLTYPE BeginQuery( + + virtual void STDMETHODCALLTYPE BeginQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE EndQuery( + + virtual void STDMETHODCALLTYPE EndQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE ResolveQueryData( + + virtual void STDMETHODCALLTYPE ResolveQueryData( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT StartIndex, _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset) = 0; - - virtual void STDMETHODCALLTYPE SetPredication( + + virtual void STDMETHODCALLTYPE SetPredication( _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation) = 0; - - virtual void STDMETHODCALLTYPE SetMarker( + + virtual void STDMETHODCALLTYPE SetMarker( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - - virtual void STDMETHODCALLTYPE BeginEvent( + + virtual void STDMETHODCALLTYPE BeginEvent( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - + virtual void STDMETHODCALLTYPE EndEvent( void) = 0; - - virtual void STDMETHODCALLTYPE DecodeFrame( + + virtual void STDMETHODCALLTYPE DecodeFrame( _In_ ID3D12VideoDecoder *pDecoder, _In_ const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, _In_ const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *pInputArguments) = 0; - - virtual void STDMETHODCALLTYPE WriteBufferImmediate( + + virtual void STDMETHODCALLTYPE WriteBufferImmediate( UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoDecodeCommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoDecodeCommandList * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoDecodeCommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoDecodeCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12VideoDecodeCommandList * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12VideoDecodeCommandList * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12VideoDecodeCommandList * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12VideoDecodeCommandList * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12VideoDecodeCommandList * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12VideoDecodeCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Close )( + + HRESULT ( STDMETHODCALLTYPE *Close )( ID3D12VideoDecodeCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12CommandAllocator *pAllocator); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D12VideoDecodeCommandList * This); - - void ( STDMETHODCALLTYPE *ResourceBarrier )( + + void ( STDMETHODCALLTYPE *ResourceBarrier )( ID3D12VideoDecodeCommandList * This, _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion); - - void ( STDMETHODCALLTYPE *BeginQuery )( + + void ( STDMETHODCALLTYPE *BeginQuery )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *EndQuery )( + + void ( STDMETHODCALLTYPE *EndQuery )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *ResolveQueryData )( + + void ( STDMETHODCALLTYPE *ResolveQueryData )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, @@ -1299,40 +1286,40 @@ EXTERN_C const IID IID_ID3D12VideoDecodeCommandList; _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D12VideoDecodeCommandList * This, _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12VideoDecodeCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12VideoDecodeCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12VideoDecodeCommandList * This); - - void ( STDMETHODCALLTYPE *DecodeFrame )( + + void ( STDMETHODCALLTYPE *DecodeFrame )( ID3D12VideoDecodeCommandList * This, _In_ ID3D12VideoDecoder *pDecoder, _In_ const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, _In_ const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *pInputArguments); - - void ( STDMETHODCALLTYPE *WriteBufferImmediate )( + + void ( STDMETHODCALLTYPE *WriteBufferImmediate )( ID3D12VideoDecodeCommandList * This, UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); - + END_INTERFACE } ID3D12VideoDecodeCommandListVtbl; @@ -1341,78 +1328,76 @@ EXTERN_C const IID IID_ID3D12VideoDecodeCommandList; CONST_VTBL struct ID3D12VideoDecodeCommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoDecodeCommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoDecodeCommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoDecodeCommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoDecodeCommandList_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12VideoDecodeCommandList_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12VideoDecodeCommandList_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12VideoDecodeCommandList_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12VideoDecodeCommandList_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12VideoDecodeCommandList_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D12VideoDecodeCommandList_Close(This) \ - ( (This)->lpVtbl -> Close(This) ) + ( (This)->lpVtbl -> Close(This) ) #define ID3D12VideoDecodeCommandList_Reset(This,pAllocator) \ - ( (This)->lpVtbl -> Reset(This,pAllocator) ) + ( (This)->lpVtbl -> Reset(This,pAllocator) ) #define ID3D12VideoDecodeCommandList_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D12VideoDecodeCommandList_ResourceBarrier(This,NumBarriers,pBarriers) \ - ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) + ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) #define ID3D12VideoDecodeCommandList_DiscardResource(This,pResource,pRegion) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) #define ID3D12VideoDecodeCommandList_BeginQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) #define ID3D12VideoDecodeCommandList_EndQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) #define ID3D12VideoDecodeCommandList_ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) \ - ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) + ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) #define ID3D12VideoDecodeCommandList_SetPredication(This,pBuffer,AlignedBufferOffset,Operation) \ - ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) + ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) #define ID3D12VideoDecodeCommandList_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12VideoDecodeCommandList_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12VideoDecodeCommandList_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12VideoDecodeCommandList_DecodeFrame(This,pDecoder,pOutputArguments,pInputArguments) \ - ( (This)->lpVtbl -> DecodeFrame(This,pDecoder,pOutputArguments,pInputArguments) ) + ( (This)->lpVtbl -> DecodeFrame(This,pDecoder,pOutputArguments,pInputArguments) ) #define ID3D12VideoDecodeCommandList_WriteBufferImmediate(This,Count,pParams,pModes) \ - ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) + ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) #endif /* COBJMACROS */ @@ -1424,159 +1409,158 @@ EXTERN_C const IID IID_ID3D12VideoDecodeCommandList; #define __ID3D12VideoProcessCommandList_INTERFACE_DEFINED__ /* interface ID3D12VideoProcessCommandList */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D12VideoProcessCommandList; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("AEB2543A-167F-4682-ACC8-D159ED4A6209") ID3D12VideoProcessCommandList : public ID3D12CommandList { public: virtual HRESULT STDMETHODCALLTYPE Close( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( + + virtual HRESULT STDMETHODCALLTYPE Reset( _In_ ID3D12CommandAllocator *pAllocator) = 0; - + virtual void STDMETHODCALLTYPE ClearState( void) = 0; - - virtual void STDMETHODCALLTYPE ResourceBarrier( + + virtual void STDMETHODCALLTYPE ResourceBarrier( _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers) = 0; - - virtual void STDMETHODCALLTYPE DiscardResource( + + virtual void STDMETHODCALLTYPE DiscardResource( _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion) = 0; - - virtual void STDMETHODCALLTYPE BeginQuery( + + virtual void STDMETHODCALLTYPE BeginQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE EndQuery( + + virtual void STDMETHODCALLTYPE EndQuery( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index) = 0; - - virtual void STDMETHODCALLTYPE ResolveQueryData( + + virtual void STDMETHODCALLTYPE ResolveQueryData( _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT StartIndex, _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset) = 0; - - virtual void STDMETHODCALLTYPE SetPredication( + + virtual void STDMETHODCALLTYPE SetPredication( _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation) = 0; - - virtual void STDMETHODCALLTYPE SetMarker( + + virtual void STDMETHODCALLTYPE SetMarker( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - - virtual void STDMETHODCALLTYPE BeginEvent( + + virtual void STDMETHODCALLTYPE BeginEvent( UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size) = 0; - + virtual void STDMETHODCALLTYPE EndEvent( void) = 0; - - virtual void STDMETHODCALLTYPE ProcessFrames( + + virtual void STDMETHODCALLTYPE ProcessFrames( _In_ ID3D12VideoProcessor *pVideoProcessor, _In_ const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, UINT NumInputStreams, _In_reads_(NumInputStreams) const D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS *pInputArguments) = 0; - - virtual void STDMETHODCALLTYPE WriteBufferImmediate( + + virtual void STDMETHODCALLTYPE WriteBufferImmediate( UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D12VideoProcessCommandListVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D12VideoProcessCommandList * This, REFIID riid, _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D12VideoProcessCommandList * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D12VideoProcessCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( ID3D12VideoProcessCommandList * This, _In_ REFGUID guid, _Inout_ UINT *pDataSize, _Out_writes_bytes_opt_( *pDataSize ) void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( ID3D12VideoProcessCommandList * This, _In_ REFGUID guid, _In_ UINT DataSize, _In_reads_bytes_opt_( DataSize ) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( ID3D12VideoProcessCommandList * This, _In_ REFGUID guid, _In_opt_ const IUnknown *pData); - - HRESULT ( STDMETHODCALLTYPE *SetName )( + + HRESULT ( STDMETHODCALLTYPE *SetName )( ID3D12VideoProcessCommandList * This, _In_z_ LPCWSTR Name); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( ID3D12VideoProcessCommandList * This, REFIID riid, _COM_Outptr_opt_ void **ppvDevice); - - D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( + + D3D12_COMMAND_LIST_TYPE ( STDMETHODCALLTYPE *GetType )( ID3D12VideoProcessCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Close )( + + HRESULT ( STDMETHODCALLTYPE *Close )( ID3D12VideoProcessCommandList * This); - - HRESULT ( STDMETHODCALLTYPE *Reset )( + + HRESULT ( STDMETHODCALLTYPE *Reset )( ID3D12VideoProcessCommandList * This, _In_ ID3D12CommandAllocator *pAllocator); - - void ( STDMETHODCALLTYPE *ClearState )( + + void ( STDMETHODCALLTYPE *ClearState )( ID3D12VideoProcessCommandList * This); - - void ( STDMETHODCALLTYPE *ResourceBarrier )( + + void ( STDMETHODCALLTYPE *ResourceBarrier )( ID3D12VideoProcessCommandList * This, _In_ UINT NumBarriers, _In_reads_(NumBarriers) const D3D12_RESOURCE_BARRIER *pBarriers); - - void ( STDMETHODCALLTYPE *DiscardResource )( + + void ( STDMETHODCALLTYPE *DiscardResource )( ID3D12VideoProcessCommandList * This, _In_ ID3D12Resource *pResource, _In_opt_ const D3D12_DISCARD_REGION *pRegion); - - void ( STDMETHODCALLTYPE *BeginQuery )( + + void ( STDMETHODCALLTYPE *BeginQuery )( ID3D12VideoProcessCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *EndQuery )( + + void ( STDMETHODCALLTYPE *EndQuery )( ID3D12VideoProcessCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, _In_ UINT Index); - - void ( STDMETHODCALLTYPE *ResolveQueryData )( + + void ( STDMETHODCALLTYPE *ResolveQueryData )( ID3D12VideoProcessCommandList * This, _In_ ID3D12QueryHeap *pQueryHeap, _In_ D3D12_QUERY_TYPE Type, @@ -1584,41 +1568,41 @@ EXTERN_C const IID IID_ID3D12VideoProcessCommandList; _In_ UINT NumQueries, _In_ ID3D12Resource *pDestinationBuffer, _In_ UINT64 AlignedDestinationBufferOffset); - - void ( STDMETHODCALLTYPE *SetPredication )( + + void ( STDMETHODCALLTYPE *SetPredication )( ID3D12VideoProcessCommandList * This, _In_opt_ ID3D12Resource *pBuffer, _In_ UINT64 AlignedBufferOffset, _In_ D3D12_PREDICATION_OP Operation); - - void ( STDMETHODCALLTYPE *SetMarker )( + + void ( STDMETHODCALLTYPE *SetMarker )( ID3D12VideoProcessCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *BeginEvent )( + + void ( STDMETHODCALLTYPE *BeginEvent )( ID3D12VideoProcessCommandList * This, UINT Metadata, _In_reads_bytes_opt_(Size) const void *pData, UINT Size); - - void ( STDMETHODCALLTYPE *EndEvent )( + + void ( STDMETHODCALLTYPE *EndEvent )( ID3D12VideoProcessCommandList * This); - - void ( STDMETHODCALLTYPE *ProcessFrames )( + + void ( STDMETHODCALLTYPE *ProcessFrames )( ID3D12VideoProcessCommandList * This, _In_ ID3D12VideoProcessor *pVideoProcessor, _In_ const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, UINT NumInputStreams, _In_reads_(NumInputStreams) const D3D12_VIDEO_PROCESS_INPUT_STREAM_ARGUMENTS *pInputArguments); - - void ( STDMETHODCALLTYPE *WriteBufferImmediate )( + + void ( STDMETHODCALLTYPE *WriteBufferImmediate )( ID3D12VideoProcessCommandList * This, UINT Count, _In_reads_(Count) const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, _In_reads_opt_(Count) const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); - + END_INTERFACE } ID3D12VideoProcessCommandListVtbl; @@ -1627,78 +1611,76 @@ EXTERN_C const IID IID_ID3D12VideoProcessCommandList; CONST_VTBL struct ID3D12VideoProcessCommandListVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D12VideoProcessCommandList_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D12VideoProcessCommandList_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D12VideoProcessCommandList_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D12VideoProcessCommandList_GetPrivateData(This,guid,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,guid,pDataSize,pData) ) #define ID3D12VideoProcessCommandList_SetPrivateData(This,guid,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,guid,DataSize,pData) ) #define ID3D12VideoProcessCommandList_SetPrivateDataInterface(This,guid,pData) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,guid,pData) ) #define ID3D12VideoProcessCommandList_SetName(This,Name) \ - ( (This)->lpVtbl -> SetName(This,Name) ) + ( (This)->lpVtbl -> SetName(This,Name) ) #define ID3D12VideoProcessCommandList_GetDevice(This,riid,ppvDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppvDevice) ) #define ID3D12VideoProcessCommandList_GetType(This) \ - ( (This)->lpVtbl -> GetType(This) ) + ( (This)->lpVtbl -> GetType(This) ) #define ID3D12VideoProcessCommandList_Close(This) \ - ( (This)->lpVtbl -> Close(This) ) + ( (This)->lpVtbl -> Close(This) ) #define ID3D12VideoProcessCommandList_Reset(This,pAllocator) \ - ( (This)->lpVtbl -> Reset(This,pAllocator) ) + ( (This)->lpVtbl -> Reset(This,pAllocator) ) #define ID3D12VideoProcessCommandList_ClearState(This) \ - ( (This)->lpVtbl -> ClearState(This) ) + ( (This)->lpVtbl -> ClearState(This) ) #define ID3D12VideoProcessCommandList_ResourceBarrier(This,NumBarriers,pBarriers) \ - ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) + ( (This)->lpVtbl -> ResourceBarrier(This,NumBarriers,pBarriers) ) #define ID3D12VideoProcessCommandList_DiscardResource(This,pResource,pRegion) \ - ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) + ( (This)->lpVtbl -> DiscardResource(This,pResource,pRegion) ) #define ID3D12VideoProcessCommandList_BeginQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> BeginQuery(This,pQueryHeap,Type,Index) ) #define ID3D12VideoProcessCommandList_EndQuery(This,pQueryHeap,Type,Index) \ - ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) + ( (This)->lpVtbl -> EndQuery(This,pQueryHeap,Type,Index) ) #define ID3D12VideoProcessCommandList_ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) \ - ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) + ( (This)->lpVtbl -> ResolveQueryData(This,pQueryHeap,Type,StartIndex,NumQueries,pDestinationBuffer,AlignedDestinationBufferOffset) ) #define ID3D12VideoProcessCommandList_SetPredication(This,pBuffer,AlignedBufferOffset,Operation) \ - ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) + ( (This)->lpVtbl -> SetPredication(This,pBuffer,AlignedBufferOffset,Operation) ) #define ID3D12VideoProcessCommandList_SetMarker(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> SetMarker(This,Metadata,pData,Size) ) #define ID3D12VideoProcessCommandList_BeginEvent(This,Metadata,pData,Size) \ - ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) + ( (This)->lpVtbl -> BeginEvent(This,Metadata,pData,Size) ) #define ID3D12VideoProcessCommandList_EndEvent(This) \ - ( (This)->lpVtbl -> EndEvent(This) ) + ( (This)->lpVtbl -> EndEvent(This) ) #define ID3D12VideoProcessCommandList_ProcessFrames(This,pVideoProcessor,pOutputArguments,NumInputStreams,pInputArguments) \ - ( (This)->lpVtbl -> ProcessFrames(This,pVideoProcessor,pOutputArguments,NumInputStreams,pInputArguments) ) + ( (This)->lpVtbl -> ProcessFrames(This,pVideoProcessor,pOutputArguments,NumInputStreams,pInputArguments) ) #define ID3D12VideoProcessCommandList_WriteBufferImmediate(This,Count,pParams,pModes) \ - ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) + ( (This)->lpVtbl -> WriteBufferImmediate(This,Count,pParams,pModes) ) #endif /* COBJMACROS */ @@ -1707,10 +1689,10 @@ EXTERN_C const IID IID_ID3D12VideoProcessCommandList; #endif /* __ID3D12VideoProcessCommandList_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3d12video_0000_0006 */ -/* [local] */ +/* [local] */ -DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG2, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9); -DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG1_AND_MPEG2, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60); +DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG2, 0xee27417f, 0x5e28, 0x4e65, 0xbe, 0xea, 0x1d, 0x26, 0xb5, 0x08, 0xad, 0xc9); +DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_MPEG1_AND_MPEG2, 0x86695f12, 0x340e, 0x4f04, 0x9f, 0xd3, 0x92, 0x53, 0xdd, 0x32, 0x74, 0x60); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_H264, 0x1b81be68, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_H264_STEREO_PROGRESSIVE, 0xd79be8da, 0x0cf1, 0x4c81, 0xb8, 0x2a, 0x69, 0xa4, 0xe2, 0x36, 0xf4, 0x3d); DEFINE_GUID(D3D12_VIDEO_DECODE_PROFILE_H264_STEREO, 0xf9aaccbb, 0xc2b6, 0x4cfc, 0x87, 0x79, 0x57, 0x07, 0xb1, 0x76, 0x05, 0x52); diff --git a/gfx/include/dxsdk/d3dcommon.h b/gfx/include/dxsdk/d3dcommon.h index 8cef6d293c..63a802d1ef 100644 --- a/gfx/include/dxsdk/d3dcommon.h +++ b/gfx/include/dxsdk/d3dcommon.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __ID3D10Blob_FWD_DEFINED__ #define __ID3D10Blob_FWD_DEFINED__ @@ -53,12 +53,12 @@ typedef interface ID3DDestructionNotifier ID3DDestructionNotifier; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_d3dcommon_0000_0000 */ -/* [local] */ +/* [local] */ -typedef +typedef enum D3D_DRIVER_TYPE { D3D_DRIVER_TYPE_UNKNOWN = 0, @@ -66,10 +66,10 @@ enum D3D_DRIVER_TYPE D3D_DRIVER_TYPE_REFERENCE = ( D3D_DRIVER_TYPE_HARDWARE + 1 ) , D3D_DRIVER_TYPE_NULL = ( D3D_DRIVER_TYPE_REFERENCE + 1 ) , D3D_DRIVER_TYPE_SOFTWARE = ( D3D_DRIVER_TYPE_NULL + 1 ) , - D3D_DRIVER_TYPE_WARP = ( D3D_DRIVER_TYPE_SOFTWARE + 1 ) + D3D_DRIVER_TYPE_WARP = ( D3D_DRIVER_TYPE_SOFTWARE + 1 ) } D3D_DRIVER_TYPE; -typedef +typedef enum D3D_FEATURE_LEVEL { D3D_FEATURE_LEVEL_9_1 = 0x9100, @@ -98,7 +98,7 @@ enum D3D_FEATURE_LEVEL #define D3D_FL9_1_MAX_TEXTURE_REPEAT 128 #define D3D_FL9_2_MAX_TEXTURE_REPEAT 2048 #define D3D_FL9_3_MAX_TEXTURE_REPEAT 8192 -typedef +typedef enum D3D_PRIMITIVE_TOPOLOGY { D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0, @@ -197,7 +197,7 @@ enum D3D_PRIMITIVE_TOPOLOGY D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST } D3D_PRIMITIVE_TOPOLOGY; -typedef +typedef enum D3D_PRIMITIVE { D3D_PRIMITIVE_UNDEFINED = 0, @@ -284,7 +284,7 @@ enum D3D_PRIMITIVE D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH = D3D_PRIMITIVE_32_CONTROL_POINT_PATCH } D3D_PRIMITIVE; -typedef +typedef enum D3D_SRV_DIMENSION { D3D_SRV_DIMENSION_UNKNOWN = 0, @@ -351,47 +351,46 @@ extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0000_v0_0_s_ifspec; #define __ID3D10Blob_INTERFACE_DEFINED__ /* interface ID3D10Blob */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3D10Blob; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8BA5FB08-5195-40e2-AC58-0D989C3A0102") ID3D10Blob : public IUnknown { public: virtual LPVOID STDMETHODCALLTYPE GetBufferPointer( void) = 0; - + virtual SIZE_T STDMETHODCALLTYPE GetBufferSize( void) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3D10BlobVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3D10Blob * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3D10Blob * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3D10Blob * This); - - LPVOID ( STDMETHODCALLTYPE *GetBufferPointer )( + + LPVOID ( STDMETHODCALLTYPE *GetBufferPointer )( ID3D10Blob * This); - - SIZE_T ( STDMETHODCALLTYPE *GetBufferSize )( + + SIZE_T ( STDMETHODCALLTYPE *GetBufferSize )( ID3D10Blob * This); - + END_INTERFACE } ID3D10BlobVtbl; @@ -400,24 +399,22 @@ EXTERN_C const IID IID_ID3D10Blob; CONST_VTBL struct ID3D10BlobVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3D10Blob_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3D10Blob_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3D10Blob_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3D10Blob_GetBufferPointer(This) \ - ( (This)->lpVtbl -> GetBufferPointer(This) ) + ( (This)->lpVtbl -> GetBufferPointer(This) ) #define ID3D10Blob_GetBufferSize(This) \ - ( (This)->lpVtbl -> GetBufferSize(This) ) + ( (This)->lpVtbl -> GetBufferSize(This) ) #endif /* COBJMACROS */ @@ -426,14 +423,14 @@ EXTERN_C const IID IID_ID3D10Blob; #endif /* __ID3D10Blob_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3dcommon_0000_0001 */ -/* [local] */ +/* [local] */ typedef interface ID3D10Blob* LPD3D10BLOB; typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; #define IID_ID3DBlob IID_ID3D10Blob -typedef void ( __stdcall *PFN_DESTRUCTION_CALLBACK )( +typedef void ( __stdcall *PFN_DESTRUCTION_CALLBACK )( void *pData); extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_c_ifspec; @@ -443,63 +440,62 @@ extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_s_ifspec; #define __ID3DDestructionNotifier_INTERFACE_DEFINED__ /* interface ID3DDestructionNotifier */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_ID3DDestructionNotifier; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a06eb39a-50da-425b-8c31-4eecd6c270f3") ID3DDestructionNotifier : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE RegisterDestructionCallback( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE RegisterDestructionCallback( + /* [annotation] */ _In_ PFN_DESTRUCTION_CALLBACK callbackFn, - /* [annotation] */ + /* [annotation] */ _In_ void *pData, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCallbackID) = 0; - - virtual HRESULT STDMETHODCALLTYPE UnregisterDestructionCallback( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE UnregisterDestructionCallback( + /* [annotation] */ _In_ UINT callbackID) = 0; - + }; - - + #else /* C style interface */ typedef struct ID3DDestructionNotifierVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( ID3DDestructionNotifier * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( ID3DDestructionNotifier * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( ID3DDestructionNotifier * This); - - HRESULT ( STDMETHODCALLTYPE *RegisterDestructionCallback )( + + HRESULT ( STDMETHODCALLTYPE *RegisterDestructionCallback )( ID3DDestructionNotifier * This, - /* [annotation] */ + /* [annotation] */ _In_ PFN_DESTRUCTION_CALLBACK callbackFn, - /* [annotation] */ + /* [annotation] */ _In_ void *pData, - /* [annotation] */ + /* [annotation] */ _Out_ UINT *pCallbackID); - - HRESULT ( STDMETHODCALLTYPE *UnregisterDestructionCallback )( + + HRESULT ( STDMETHODCALLTYPE *UnregisterDestructionCallback )( ID3DDestructionNotifier * This, - /* [annotation] */ + /* [annotation] */ _In_ UINT callbackID); - + END_INTERFACE } ID3DDestructionNotifierVtbl; @@ -508,24 +504,22 @@ EXTERN_C const IID IID_ID3DDestructionNotifier; CONST_VTBL struct ID3DDestructionNotifierVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define ID3DDestructionNotifier_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define ID3DDestructionNotifier_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define ID3DDestructionNotifier_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define ID3DDestructionNotifier_RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) \ - ( (This)->lpVtbl -> RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) ) + ( (This)->lpVtbl -> RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) ) #define ID3DDestructionNotifier_UnregisterDestructionCallback(This,callbackID) \ - ( (This)->lpVtbl -> UnregisterDestructionCallback(This,callbackID) ) + ( (This)->lpVtbl -> UnregisterDestructionCallback(This,callbackID) ) #endif /* COBJMACROS */ @@ -534,9 +528,9 @@ EXTERN_C const IID IID_ID3DDestructionNotifier; #endif /* __ID3DDestructionNotifier_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_d3dcommon_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum _D3D_INCLUDE_TYPE { D3D_INCLUDE_LOCAL = 0, @@ -555,7 +549,7 @@ DECLARE_INTERFACE(ID3DInclude) STDMETHOD(Close)(THIS_ LPCVOID pData) PURE; }; typedef ID3DInclude* LPD3DINCLUDE; -typedef +typedef enum _D3D_SHADER_VARIABLE_CLASS { D3D_SVC_SCALAR = 0, @@ -577,7 +571,7 @@ enum _D3D_SHADER_VARIABLE_CLASS D3D_SVC_FORCE_DWORD = 0x7fffffff } D3D_SHADER_VARIABLE_CLASS; -typedef +typedef enum _D3D_SHADER_VARIABLE_FLAGS { D3D_SVF_USERPACKED = 1, @@ -591,7 +585,7 @@ enum _D3D_SHADER_VARIABLE_FLAGS D3D_SVF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_VARIABLE_FLAGS; -typedef +typedef enum _D3D_SHADER_VARIABLE_TYPE { D3D_SVT_VOID = 0, @@ -707,7 +701,7 @@ enum _D3D_SHADER_VARIABLE_TYPE D3D_SVT_FORCE_DWORD = 0x7fffffff } D3D_SHADER_VARIABLE_TYPE; -typedef +typedef enum _D3D_SHADER_INPUT_FLAGS { D3D_SIF_USERPACKED = 0x1, @@ -724,7 +718,7 @@ enum _D3D_SHADER_INPUT_FLAGS D3D_SIF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_INPUT_FLAGS; -typedef +typedef enum _D3D_SHADER_INPUT_TYPE { D3D_SIT_CBUFFER = 0, @@ -753,7 +747,7 @@ enum _D3D_SHADER_INPUT_TYPE D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER = D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER } D3D_SHADER_INPUT_TYPE; -typedef +typedef enum _D3D_SHADER_CBUFFER_FLAGS { D3D_CBF_USERPACKED = 1, @@ -761,7 +755,7 @@ enum _D3D_SHADER_CBUFFER_FLAGS D3D_CBF_FORCE_DWORD = 0x7fffffff } D3D_SHADER_CBUFFER_FLAGS; -typedef +typedef enum _D3D_CBUFFER_TYPE { D3D_CT_CBUFFER = 0, @@ -776,7 +770,7 @@ enum _D3D_CBUFFER_TYPE D3D11_CT_RESOURCE_BIND_INFO = D3D_CT_RESOURCE_BIND_INFO } D3D_CBUFFER_TYPE; -typedef +typedef enum D3D_NAME { D3D_NAME_UNDEFINED = 0, @@ -831,7 +825,7 @@ enum D3D_NAME D3D12_NAME_BARYCENTRICS = D3D_NAME_BARYCENTRICS } D3D_NAME; -typedef +typedef enum D3D_RESOURCE_RETURN_TYPE { D3D_RETURN_TYPE_UNORM = 1, @@ -858,7 +852,7 @@ enum D3D_RESOURCE_RETURN_TYPE D3D11_RETURN_TYPE_CONTINUED = D3D_RETURN_TYPE_CONTINUED } D3D_RESOURCE_RETURN_TYPE; -typedef +typedef enum D3D_REGISTER_COMPONENT_TYPE { D3D_REGISTER_COMPONENT_UNKNOWN = 0, @@ -871,7 +865,7 @@ enum D3D_REGISTER_COMPONENT_TYPE D3D10_REGISTER_COMPONENT_FLOAT32 = D3D_REGISTER_COMPONENT_FLOAT32 } D3D_REGISTER_COMPONENT_TYPE; -typedef +typedef enum D3D_TESSELLATOR_DOMAIN { D3D_TESSELLATOR_DOMAIN_UNDEFINED = 0, @@ -884,7 +878,7 @@ enum D3D_TESSELLATOR_DOMAIN D3D11_TESSELLATOR_DOMAIN_QUAD = D3D_TESSELLATOR_DOMAIN_QUAD } D3D_TESSELLATOR_DOMAIN; -typedef +typedef enum D3D_TESSELLATOR_PARTITIONING { D3D_TESSELLATOR_PARTITIONING_UNDEFINED = 0, @@ -899,7 +893,7 @@ enum D3D_TESSELLATOR_PARTITIONING D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN = D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN } D3D_TESSELLATOR_PARTITIONING; -typedef +typedef enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE { D3D_TESSELLATOR_OUTPUT_UNDEFINED = 0, @@ -914,7 +908,7 @@ enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW = D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW } D3D_TESSELLATOR_OUTPUT_PRIMITIVE; -typedef +typedef enum D3D_MIN_PRECISION { D3D_MIN_PRECISION_DEFAULT = 0, @@ -927,7 +921,7 @@ enum D3D_MIN_PRECISION D3D_MIN_PRECISION_ANY_10 = 0xf1 } D3D_MIN_PRECISION; -typedef +typedef enum D3D_INTERPOLATION_MODE { D3D_INTERPOLATION_UNDEFINED = 0, @@ -940,7 +934,7 @@ enum D3D_INTERPOLATION_MODE D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE = 7 } D3D_INTERPOLATION_MODE; -typedef +typedef enum _D3D_PARAMETER_FLAGS { D3D_PF_NONE = 0, diff --git a/gfx/include/dxsdk/d3dcompiler.h b/gfx/include/dxsdk/d3dcompiler.h index 3cb367ab19..09de916ebd 100644 --- a/gfx/include/dxsdk/d3dcompiler.h +++ b/gfx/include/dxsdk/d3dcompiler.h @@ -22,7 +22,7 @@ #define D3D_COMPILER_VERSION 47 #ifdef UNICODE - #define D3DCOMPILER_DLL D3DCOMPILER_DLL_W + #define D3DCOMPILER_DLL D3DCOMPILER_DLL_W #else #define D3DCOMPILER_DLL D3DCOMPILER_DLL_A #endif @@ -75,9 +75,9 @@ D3DWriteBlobToFile(_In_ ID3DBlob* pBlob, // you KNOW will work. (ie. have compiled before without this option.) // Shaders are always validated by D3D before they are set to the device. // -// D3DCOMPILE_SKIP_OPTIMIZATION +// D3DCOMPILE_SKIP_OPTIMIZATION // Instructs the compiler to skip optimization steps during code generation. -// Unless you are trying to isolate a problem in your code using this option +// Unless you are trying to isolate a problem in your code using this option // is not recommended. // // D3DCOMPILE_PACK_MATRIX_ROW_MAJOR @@ -85,8 +85,8 @@ D3DWriteBlobToFile(_In_ ID3DBlob* pBlob, // on input and output from the shader. // // D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR -// Unless explicitly specified, matrices will be packed in column-major -// order on input and output from the shader. This is generally more +// Unless explicitly specified, matrices will be packed in column-major +// order on input and output from the shader. This is generally more // efficient, since it allows vector-matrix multiplication to be performed // using a series of dot-products. // @@ -96,16 +96,16 @@ D3DWriteBlobToFile(_In_ ID3DBlob* pBlob, // // D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT // Force compiler to compile against the next highest available software -// target for vertex shaders. This flag also turns optimizations off, -// and debugging on. +// target for vertex shaders. This flag also turns optimizations off, +// and debugging on. // // D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT // Force compiler to compile against the next highest available software -// target for pixel shaders. This flag also turns optimizations off, +// target for pixel shaders. This flag also turns optimizations off, // and debugging on. // // D3DCOMPILE_NO_PRESHADER -// Disables Preshaders. Using this flag will cause the compiler to not +// Disables Preshaders. Using this flag will cause the compiler to not // pull out static expression for evaluation on the host cpu // // D3DCOMPILE_AVOID_FLOW_CONTROL @@ -365,7 +365,7 @@ D3DDisassembleRegion(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, _In_ SIZE_T NumInsts, _Out_opt_ SIZE_T* pFinishByteOffset, _Out_ ID3DBlob** ppDisassembly); - + //---------------------------------------------------------------------------- // Shader linking and Function Linking Graph (FLG) APIs //---------------------------------------------------------------------------- @@ -485,7 +485,7 @@ typedef enum D3D_BLOB_PART D3D_BLOB_TEST_COMPILE_REPORT, } D3D_BLOB_PART; -HRESULT WINAPI +HRESULT WINAPI D3DGetBlobPart(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, _In_ SIZE_T SrcDataSize, _In_ D3D_BLOB_PART Part, @@ -498,7 +498,7 @@ D3DGetBlobPart(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, // Update information in a compilation result. //---------------------------------------------------------------------------- -HRESULT WINAPI +HRESULT WINAPI D3DSetBlobPart(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, _In_ SIZE_T SrcDataSize, _In_ D3D_BLOB_PART Part, @@ -546,7 +546,7 @@ D3DCompressShaders(_In_ UINT uNumShaders, HRESULT WINAPI D3DDecompressShaders(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, _In_ SIZE_T SrcDataSize, - _In_ UINT uNumShaders, + _In_ UINT uNumShaders, _In_ UINT uStartIndex, _In_reads_opt_(uNumShaders) UINT* pIndices, _In_ UINT uFlags, @@ -567,7 +567,7 @@ D3DDecompressShaders(_In_reads_bytes_(SrcDataSize) LPCVOID pSrcData, //---------------------------------------------------------------------------- HRESULT WINAPI -D3DDisassemble10Effect(_In_ interface ID3D10Effect *pEffect, +D3DDisassemble10Effect(_In_ interface ID3D10Effect *pEffect, _In_ UINT Flags, _Out_ ID3DBlob** ppDisassembly); @@ -577,5 +577,5 @@ D3DDisassemble10Effect(_In_ interface ID3D10Effect *pEffect, #ifdef __cplusplus } #endif //__cplusplus - + #endif // #ifndef __D3DCOMPILER_H__ diff --git a/gfx/include/dxsdk/d3dcsx.h b/gfx/include/dxsdk/d3dcsx.h index a12e76aec2..2895fabc60 100644 --- a/gfx/include/dxsdk/d3dcsx.h +++ b/gfx/include/dxsdk/d3dcsx.h @@ -24,7 +24,7 @@ #define D3DCSX_DLL_A "d3dcsx_47.dll" #ifdef UNICODE - #define D3DCSX_DLL D3DCSX_DLL_W + #define D3DCSX_DLL D3DCSX_DLL_W #else #define D3DCSX_DLL D3DCSX_DLL_A #endif @@ -214,16 +214,16 @@ DECLARE_INTERFACE_(ID3DX11FFT, IUnknown) STDMETHOD(SetForwardScale)(THIS_ FLOAT ForwardScale) PURE; STDMETHOD_(FLOAT, GetForwardScale)(THIS) PURE; - // scale for inverse transform (defaults to 1/N if set to 0, where N is + // scale for inverse transform (defaults to 1/N if set to 0, where N is // the product of the transformed dimension lengths STDMETHOD(SetInverseScale)(THIS_ FLOAT InverseScale) PURE; STDMETHOD_(FLOAT, GetInverseScale)(THIS) PURE; //------------------------------------------------------------------------------ - // Attaches buffers to the context and performs any required precomputation. + // Attaches buffers to the context and performs any required precomputation. // The buffers must be no smaller than the corresponding buffer sizes returned // by D3DX11CreateFFT*(). Temp buffers may beshared between multiple contexts, - // though care should be taken to concurrently execute multiple FFTs which share + // though care should be taken to concurrently execute multiple FFTs which share // temp buffers. // // NumTempBuffers number of buffers in ppTempBuffers @@ -232,26 +232,26 @@ DECLARE_INTERFACE_(ID3DX11FFT, IUnknown) // ppPrecomputeBufferSizes buffers to hold precomputed data STDMETHOD(AttachBuffersAndPrecompute)( THIS_ _In_range_(0,D3DX11_FFT_MAX_TEMP_BUFFERS) UINT NumTempBuffers, - _In_reads_(NumTempBuffers) ID3D11UnorderedAccessView* const* ppTempBuffers, + _In_reads_(NumTempBuffers) ID3D11UnorderedAccessView* const* ppTempBuffers, _In_range_(0,D3DX11_FFT_MAX_PRECOMPUTE_BUFFERS) UINT NumPrecomputeBuffers, _In_reads_(NumPrecomputeBuffers) ID3D11UnorderedAccessView* const* ppPrecomputeBufferSizes ) PURE; //------------------------------------------------------------------------------ - // Call after buffers have been attached to the context, pInput and *ppOuput can + // Call after buffers have been attached to the context, pInput and *ppOuput can // be one of the temp buffers. If *ppOutput == NULL, then the computation will ping-pong // between temp buffers and the last buffer written to is stored at *ppOutput. // Otherwise, *ppOutput is used as the output buffer (which may incur an extra copy). // - // The format of complex data is interleaved components, e.g. (Real0, Imag0), + // The format of complex data is interleaved components, e.g. (Real0, Imag0), // (Real1, Imag1) ... etc. Data is stored in row major order // // pInputBuffer view onto input buffer // ppOutpuBuffert pointer to view of output buffer - STDMETHOD(ForwardTransform)( THIS_ + STDMETHOD(ForwardTransform)( THIS_ _In_ const ID3D11UnorderedAccessView* pInputBuffer, _Inout_ ID3D11UnorderedAccessView** ppOutputBuffer ) PURE; - STDMETHOD(InverseTransform)( THIS_ + STDMETHOD(InverseTransform)( THIS_ _In_ const ID3D11UnorderedAccessView* pInputBuffer, _Inout_ ID3D11UnorderedAccessView** ppOutputBuffer ) PURE; }; @@ -266,7 +266,7 @@ typedef enum D3DX11_FFT_DATA_TYPE D3DX11_FFT_DATA_TYPE_COMPLEX, } D3DX11_FFT_DATA_TYPE; -typedef enum D3DX11_FFT_DIM_MASK +typedef enum D3DX11_FFT_DIM_MASK { D3DX11_FFT_DIM_MASK_1D = 0x1, D3DX11_FFT_DIM_MASK_2D = 0x3, @@ -277,7 +277,7 @@ typedef struct D3DX11_FFT_DESC { UINT NumDimensions; // number of dimensions UINT ElementLengths[D3DX11_FFT_MAX_DIMENSIONS]; // length of each dimension - UINT DimensionMask; // a bit set for each dimensions to transform + UINT DimensionMask; // a bit set for each dimensions to transform // (see D3DX11_FFT_DIM_MASK for common masks) D3DX11_FFT_DATA_TYPE Type; // type of the elements in spatial domain } D3DX11_FFT_DESC; @@ -294,7 +294,7 @@ typedef struct D3DX11_FFT_BUFFER_INFO _Field_range_(0,D3DX11_FFT_MAX_TEMP_BUFFERS) UINT NumTempBufferSizes; UINT TempBufferFloatSizes[D3DX11_FFT_MAX_TEMP_BUFFERS]; _Field_range_(0,D3DX11_FFT_MAX_PRECOMPUTE_BUFFERS) UINT NumPrecomputeBufferSizes; - UINT PrecomputeBufferFloatSizes[D3DX11_FFT_MAX_PRECOMPUTE_BUFFERS]; + UINT PrecomputeBufferFloatSizes[D3DX11_FFT_MAX_PRECOMPUTE_BUFFERS]; } D3DX11_FFT_BUFFER_INFO; typedef enum D3DX11_FFT_CREATE_FLAG @@ -303,11 +303,11 @@ typedef enum D3DX11_FFT_CREATE_FLAG } D3DX11_FFT_CREATE_FLAG; //------------------------------------------------------------------------------ -// Creates an ID3DX11FFT COM interface object and returns a pointer to it at *ppFFT. +// Creates an ID3DX11FFT COM interface object and returns a pointer to it at *ppFFT. // The descriptor describes the shape of the data as well as the scaling factors -// that should be used for forward and inverse transforms. +// that should be used for forward and inverse transforms. // The FFT computation may require temporaries that act as ping-pong buffers -// and for other purposes. aTempSizes is a list of the sizes required for +// and for other purposes. aTempSizes is a list of the sizes required for // temporaries. Likewise, some data may need to be precomputed and the sizes // of those sizes are returned in aPrecomputedBufferSizes. // @@ -316,7 +316,7 @@ typedef enum D3DX11_FFT_CREATE_FLAG // 2) Precompute (and Attach temp working buffers of at least the required size) // 3) Call Compute() on some input data // -// Compute() may be called repeatedly with different inputs and transform +// Compute() may be called repeatedly with different inputs and transform // directions. When finished with the FFT work, release the FFT interface() // // Device Direct3DDeviceContext to use in @@ -327,7 +327,7 @@ typedef enum D3DX11_FFT_CREATE_FLAG // ppFFT Pointer to returned context pointer out //------------------------------------------------------------------------------ -HRESULT WINAPI D3DX11CreateFFT( +HRESULT WINAPI D3DX11CreateFFT( ID3D11DeviceContext* pDeviceContext, _In_ const D3DX11_FFT_DESC* pDesc, UINT Flags, @@ -335,21 +335,21 @@ HRESULT WINAPI D3DX11CreateFFT( _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT1DReal( +HRESULT WINAPI D3DX11CreateFFT1DReal( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Flags, _Out_ D3DX11_FFT_BUFFER_INFO* pBufferInfo, _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT1DComplex( +HRESULT WINAPI D3DX11CreateFFT1DComplex( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Flags, _Out_ D3DX11_FFT_BUFFER_INFO* pBufferInfo, _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT2DReal( +HRESULT WINAPI D3DX11CreateFFT2DReal( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Y, @@ -357,7 +357,7 @@ HRESULT WINAPI D3DX11CreateFFT2DReal( _Out_ D3DX11_FFT_BUFFER_INFO* pBufferInfo, _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT2DComplex( +HRESULT WINAPI D3DX11CreateFFT2DComplex( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Y, @@ -365,7 +365,7 @@ HRESULT WINAPI D3DX11CreateFFT2DComplex( _Out_ D3DX11_FFT_BUFFER_INFO* pBufferInfo, _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT3DReal( +HRESULT WINAPI D3DX11CreateFFT3DReal( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Y, @@ -374,7 +374,7 @@ HRESULT WINAPI D3DX11CreateFFT3DReal( _Out_ D3DX11_FFT_BUFFER_INFO* pBufferInfo, _Out_ ID3DX11FFT** ppFFT ); -HRESULT WINAPI D3DX11CreateFFT3DComplex( +HRESULT WINAPI D3DX11CreateFFT3DComplex( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Y, diff --git a/gfx/include/dxsdk/d3dx10async.h b/gfx/include/dxsdk/d3dx10async.h index b36841214c..b0848a51e9 100644 --- a/gfx/include/dxsdk/d3dx10async.h +++ b/gfx/include/dxsdk/d3dx10async.h @@ -45,7 +45,7 @@ extern "C" { // Instruction set to be used when generating code. Currently supported // profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "vs_3_0", // "vs_3_sw", "vs_4_0", "vs_4_1", -// "ps_2_0", "ps_2_a", "ps_2_b", "ps_2_sw", "ps_3_0", +// "ps_2_0", "ps_2_a", "ps_2_b", "ps_2_sw", "ps_3_0", // "ps_3_sw", "ps_4_0", "ps_4_1", // "gs_4_0", "gs_4_1", // "tx_1_0", @@ -83,10 +83,10 @@ HRESULT WINAPI D3DX10CompileFromFileW(LPCWSTR pSrcFile, CONST D3D10_SHADER_MACRO #define D3DX10CompileFromFile D3DX10CompileFromFileA #endif -HRESULT WINAPI D3DX10CompileFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10CompileFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX10CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); #ifdef UNICODE @@ -95,7 +95,7 @@ HRESULT WINAPI D3DX10CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResour #define D3DX10CompileFromResource D3DX10CompileFromResourceA #endif -HRESULT WINAPI D3DX10CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX10CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); //---------------------------------------------------------------------------- @@ -147,7 +147,7 @@ HRESULT WINAPI D3DX10CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCST // ppEffectPool // Address of the newly created Effect pool interface // ppErrors -// If non-NULL, address of a buffer with error messages that occurred +// If non-NULL, address of a buffer with error messages that occurred // during parsing or compilation // pHResult // Pointer to a memory location to receive the return value upon completion. @@ -156,24 +156,24 @@ HRESULT WINAPI D3DX10CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCST // the asynchronous execution completes. //---------------------------------------------------------------------------- -HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, +HRESULT WINAPI D3DX10CreateEffectFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, +HRESULT WINAPI D3DX10CreateEffectFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, +HRESULT WINAPI D3DX10CreateEffectFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, +HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, +HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pEffectPool, ID3DX10ThreadPump* pPump, ID3D10Effect **ppEffect, ID3D10Blob **ppErrors, HRESULT* pHResult); #ifdef UNICODE @@ -184,23 +184,23 @@ HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE hModule, LPCWSTR pResourc #define D3DX10CreateEffectFromResource D3DX10CreateEffectFromResourceA #endif -HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, +HRESULT WINAPI D3DX10CreateEffectPoolFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, - ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, +HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO *pDefines, + ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, +HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(LPCVOID pData, SIZE_T DataLength, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors, HRESULT* pHResult); -HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, +HRESULT WINAPI D3DX10CreateEffectPoolFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors, HRESULT* pHResult); - -HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, + +HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO *pDefines, ID3D10Include *pInclude, LPCSTR pProfile, UINT HLSLFlags, UINT FXFlags, ID3D10Device *pDevice, ID3DX10ThreadPump* pPump, ID3D10EffectPool **ppEffectPool, ID3D10Blob **ppErrors, HRESULT* pHResult); @@ -212,19 +212,19 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromResourceW(HMODULE hModule, LPCWSTR pRes #define D3DX10CreateEffectPoolFromResource D3DX10CreateEffectPoolFromResourceA #endif -HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX10ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); #ifdef UNICODE @@ -239,19 +239,19 @@ HRESULT WINAPI D3DX10PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pRes // Async processors //---------------------------------------------------------------------------- -HRESULT WINAPI D3DX10CreateAsyncCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX10CreateAsyncCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor); -HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX10CreateAsyncEffectCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pProfile, UINT Flags, UINT FXFlags, ID3D10Device *pDevice, ID3D10EffectPool *pPool, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor); -HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX10CreateAsyncEffectPoolCreateProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pProfile, UINT Flags, UINT FXFlags, ID3D10Device *pDevice, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor); -HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX10CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob **ppErrorBuffer, ID3DX10DataProcessor **ppProcessor); //---------------------------------------------------------------------------- diff --git a/gfx/include/dxsdk/d3dx10core.h b/gfx/include/dxsdk/d3dx10core.h index 155424c841..5947559931 100644 --- a/gfx/include/dxsdk/d3dx10core.h +++ b/gfx/include/dxsdk/d3dx10core.h @@ -18,7 +18,7 @@ #define D3DX10_DLL_A "d3dx10_43.dll" #ifdef UNICODE - #define D3DX10_DLL D3DX10_DLL_W + #define D3DX10_DLL D3DX10_DLL_W #else #define D3DX10_DLL D3DX10_DLL_A #endif @@ -31,9 +31,9 @@ extern "C" { // D3DX10_SDK_VERSION: // ----------------- // This identifier is passed to D3DX10CheckVersion in order to ensure that an -// application was built against the correct header files and lib files. -// This number is incremented whenever a header (or other) change would -// require applications to be rebuilt. If the version doesn't match, +// application was built against the correct header files and lib files. +// This number is incremented whenever a header (or other) change would +// require applications to be rebuilt. If the version doesn't match, // D3DX10CreateVersion will return FALSE. (The number itself has no meaning.) /////////////////////////////////////////////////////////////////////////// @@ -55,14 +55,14 @@ HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *pAdapter, HMODULE Software, UINT Flags, DXGI_SWAP_CHAIN_DESC *pSwapChainDesc, - IDXGISwapChain **ppSwapChain, + IDXGISwapChain **ppSwapChain, ID3D10Device **ppDevice); typedef interface ID3D10Device1 ID3D10Device1; HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *pDevice, ID3D10Device1 **ppDevice1); #ifdef D3D_DIAG_DLL -BOOL WINAPI D3DX10DebugMute(BOOL Mute); +BOOL WINAPI D3DX10DebugMute(BOOL Mute); #endif HRESULT WINAPI D3DX10CheckVersion(UINT D3DSdkVersion, UINT D3DX10SdkVersion); @@ -80,10 +80,10 @@ HRESULT WINAPI D3DX10CheckVersion(UINT D3DSdkVersion, UINT D3DX10SdkVersion); // drawing non-overlapping sprites of uniform depth. For example, drawing // screen-aligned text with ID3DX10Font. // D3DX10SPRITE_SORT_DEPTH_FRONT_TO_BACK -// Sprites are sorted by depth front-to-back prior to drawing. This is +// Sprites are sorted by depth front-to-back prior to drawing. This is // recommended when drawing opaque sprites of varying depths. // D3DX10SPRITE_SORT_DEPTH_BACK_TO_FRONT -// Sprites are sorted by depth back-to-front prior to drawing. This is +// Sprites are sorted by depth back-to-front prior to drawing. This is // recommended when drawing transparent sprites of varying depths. // D3DX10SPRITE_ADDREF_TEXTURES // AddRef/Release all textures passed in to DrawSpritesBuffered @@ -116,7 +116,7 @@ typedef struct _D3DX10_SPRITE // ------------ // This object intends to provide an easy way to drawing sprites using D3D. // -// Begin - +// Begin - // Prepares device for drawing sprites. // // Draw - @@ -125,7 +125,7 @@ typedef struct _D3DX10_SPRITE // Flush - // Forces all batched sprites to submitted to the device. // -// End - +// End - // Restores device state to how it was when Begin was called. // ////////////////////////////////////////////////////////////////////////////// @@ -134,7 +134,7 @@ typedef interface ID3DX10Sprite ID3DX10Sprite; typedef interface ID3DX10Sprite *LPD3DX10SPRITE; // {BA0B762D-8D28-43ec-B9DC-2F84443B0614} -DEFINE_GUID(IID_ID3DX10Sprite, +DEFINE_GUID(IID_ID3DX10Sprite, 0xba0b762d, 0x8d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x6, 0x14); #undef INTERFACE @@ -149,7 +149,7 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown) // ID3DX10Sprite STDMETHOD(Begin)(THIS_ UINT flags) PURE; - + STDMETHOD(DrawSpritesBuffered)(THIS_ D3DX10_SPRITE *pSprites, UINT cSprites) PURE; STDMETHOD(Flush)(THIS) PURE; @@ -168,9 +168,9 @@ DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown) extern "C" { #endif //__cplusplus -HRESULT WINAPI - D3DX10CreateSprite( - ID3D10Device* pDevice, +HRESULT WINAPI + D3DX10CreateSprite( + ID3D10Device* pDevice, UINT cDeviceBufferSize, LPD3DX10SPRITE* ppSprite); @@ -203,7 +203,7 @@ DECLARE_INTERFACE(ID3DX10DataProcessor) }; // {C93FECFA-6967-478a-ABBC-402D90621FCB} -DEFINE_GUID(IID_ID3DX10ThreadPump, +DEFINE_GUID(IID_ID3DX10ThreadPump, 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb); #undef INTERFACE @@ -219,13 +219,13 @@ DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown) // ID3DX10ThreadPump STDMETHOD(AddWorkItem)(THIS_ ID3DX10DataLoader *pDataLoader, ID3DX10DataProcessor *pDataProcessor, HRESULT *pHResult, void **ppDeviceObject) PURE; STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE; - + STDMETHOD(WaitForAllItems)(THIS) PURE; STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT iWorkItemCount); STDMETHOD(PurgeAllItems)(THIS) PURE; STDMETHOD(GetQueueStatus)(THIS_ UINT *pIoQueue, UINT *pProcessQueue, UINT *pDeviceQueue) PURE; - + }; HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX10ThreadPump **ppThreadPump); @@ -233,7 +233,7 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1 ////////////////////////////////////////////////////////////////////////////// // ID3DX10Font: // ---------- -// Font objects contain the textures and resources needed to render a specific +// Font objects contain the textures and resources needed to render a specific // font on a specific device. // // GetGlyphData - @@ -243,8 +243,8 @@ HRESULT WINAPI D3DX10CreateThreadPump(UINT cIoThreads, UINT cProcThreads, ID3DX1 // Preloads glyphs into the glyph cache textures. // // DrawText - -// Draws formatted text on a D3D device. Some parameters are -// surprisingly similar to those of GDI's DrawText function. See GDI +// Draws formatted text on a D3D device. Some parameters are +// surprisingly similar to those of GDI's DrawText function. See GDI // documentation for a detailed description of these parameters. // If pSprite is NULL, an internal sprite object will be used. // @@ -292,7 +292,7 @@ typedef interface ID3DX10Font ID3DX10Font; typedef interface ID3DX10Font *LPD3DX10FONT; // {D79DBB70-5F21-4d36-BBC2-FF525C213CDC} -DEFINE_GUID(IID_ID3DX10Font, +DEFINE_GUID(IID_ID3DX10Font, 0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc); #undef INTERFACE @@ -354,9 +354,9 @@ DECLARE_INTERFACE_(ID3DX10Font, IUnknown) extern "C" { #endif //__cplusplus -HRESULT WINAPI +HRESULT WINAPI D3DX10CreateFontA( - ID3D10Device* pDevice, + ID3D10Device* pDevice, INT Height, UINT Width, UINT Weight, @@ -369,9 +369,9 @@ HRESULT WINAPI LPCSTR pFaceName, LPD3DX10FONT* ppFont); -HRESULT WINAPI +HRESULT WINAPI D3DX10CreateFontW( - ID3D10Device* pDevice, + ID3D10Device* pDevice, INT Height, UINT Width, UINT Weight, @@ -390,16 +390,16 @@ HRESULT WINAPI #define D3DX10CreateFont D3DX10CreateFontA #endif -HRESULT WINAPI - D3DX10CreateFontIndirectA( - ID3D10Device* pDevice, - CONST D3DX10_FONT_DESCA* pDesc, +HRESULT WINAPI + D3DX10CreateFontIndirectA( + ID3D10Device* pDevice, + CONST D3DX10_FONT_DESCA* pDesc, LPD3DX10FONT* ppFont); -HRESULT WINAPI - D3DX10CreateFontIndirectW( - ID3D10Device* pDevice, - CONST D3DX10_FONT_DESCW* pDesc, +HRESULT WINAPI + D3DX10CreateFontIndirectW( + ID3D10Device* pDevice, + CONST D3DX10_FONT_DESCW* pDesc, LPD3DX10FONT* ppFont); #ifdef UNICODE diff --git a/gfx/include/dxsdk/d3dx10math.h b/gfx/include/dxsdk/d3dx10math.h index 8ac1d84d8c..d27e9ab115 100644 --- a/gfx/include/dxsdk/d3dx10math.h +++ b/gfx/include/dxsdk/d3dx10math.h @@ -380,7 +380,7 @@ typedef struct _D3DMATRIX D3DXMATRIX, *LPD3DXMATRIX; // This class helps keep matrices 16-byte aligned as preferred by P4 cpus. // It aligns matrices on the stack and on the heap or in global scope. // It does this using __declspec(align(16)) which works on VC7 and on VC 6 -// with the processor pack. Unfortunately there is no way to detect the +// with the processor pack. Unfortunately there is no way to detect the // latter so this is turned on only on VC7. On other compilers this is the // the same as D3DXMATRIX. // @@ -407,9 +407,9 @@ typedef struct _D3DXMATRIXA16 : public D3DXMATRIX void* operator new[] ( size_t ); // delete operators - void operator delete ( void* ); // These are NOT virtual; Do not + void operator delete ( void* ); // These are NOT virtual; Do not void operator delete[] ( void* ); // cast to D3DXMATRIX and delete. - + // assignment operators _D3DXMATRIXA16& operator = ( CONST D3DXMATRIX& ); @@ -667,7 +667,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoord // Transform (x, y, 0, 0) by matrix. D3DXVECTOR2* WINAPI D3DXVec2TransformNormal ( D3DXVECTOR2 *pOut, CONST D3DXVECTOR2 *pV, CONST D3DXMATRIX *pM ); - + // Transform Array (x, y, 0, 1) by matrix. D3DXVECTOR4* WINAPI D3DXVec2TransformArray ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n); @@ -679,8 +679,6 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray // Transform Array (x, y, 0, 0) by matrix. D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray ( D3DXVECTOR2 *pOut, UINT OutStride, CONST D3DXVECTOR2 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n ); - - #ifdef __cplusplus } @@ -758,14 +756,13 @@ D3DXVECTOR4* WINAPI D3DXVec3Transform D3DXVECTOR3* WINAPI D3DXVec3TransformCoord ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM ); -// Transform (x, y, z, 0) by matrix. If you transforming a normal by a -// non-affine matrix, the matrix you pass to this function should be the +// Transform (x, y, z, 0) by matrix. If you transforming a normal by a +// non-affine matrix, the matrix you pass to this function should be the // transpose of the inverse of the matrix you would use to transform a coord. D3DXVECTOR3* WINAPI D3DXVec3TransformNormal ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3DXMATRIX *pM ); - - -// Transform Array (x, y, z, 1) by matrix. + +// Transform Array (x, y, z, 1) by matrix. D3DXVECTOR4* WINAPI D3DXVec3TransformArray ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n ); @@ -773,8 +770,8 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n ); -// Transform (x, y, z, 0) by matrix. If you transforming a normal by a -// non-affine matrix, the matrix you pass to this function should be the +// Transform (x, y, z, 0) by matrix. If you transforming a normal by a +// non-affine matrix, the matrix you pass to this function should be the // transpose of the inverse of the matrix you would use to transform a coord. D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray ( D3DXVECTOR3 *pOut, UINT OutStride, CONST D3DXVECTOR3 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n ); @@ -788,7 +785,7 @@ D3DXVECTOR3* WINAPI D3DXVec3Project D3DXVECTOR3* WINAPI D3DXVec3Unproject ( D3DXVECTOR3 *pOut, CONST D3DXVECTOR3 *pV, CONST D3D10_VIEWPORT *pViewport, CONST D3DXMATRIX *pProjection, CONST D3DXMATRIX *pView, CONST D3DXMATRIX *pWorld); - + // Project vector Array from object space into screen space D3DXVECTOR3* WINAPI D3DXVec3ProjectArray ( D3DXVECTOR3 *pOut, UINT OutStride,CONST D3DXVECTOR3 *pV, UINT VStride,CONST D3D10_VIEWPORT *pViewport, @@ -872,7 +869,7 @@ D3DXVECTOR4* WINAPI D3DXVec4BaryCentric // Transform vector by matrix. D3DXVECTOR4* WINAPI D3DXVec4Transform ( D3DXVECTOR4 *pOut, CONST D3DXVECTOR4 *pV, CONST D3DXMATRIX *pM ); - + // Transform vector array by matrix. D3DXVECTOR4* WINAPI D3DXVec4TransformArray ( D3DXVECTOR4 *pOut, UINT OutStride, CONST D3DXVECTOR4 *pV, UINT VStride, CONST D3DXMATRIX *pM, UINT n ); @@ -902,7 +899,7 @@ FLOAT WINAPI D3DXMatrixDeterminant ( CONST D3DXMATRIX *pM ); HRESULT WINAPI D3DXMatrixDecompose - ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation, + ( D3DXVECTOR3 *pOutScale, D3DXQUATERNION *pOutRotation, D3DXVECTOR3 *pOutTranslation, CONST D3DXMATRIX *pM ); D3DXMATRIX* WINAPI D3DXMatrixTranspose @@ -967,9 +964,9 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation // Build 2D transformation matrix in XY plane. NULL arguments are treated as identity. // Mout = Msc-1 * Msr-1 * Ms * Msr * Msc * Mrc-1 * Mr * Mrc * Mt D3DXMATRIX* WINAPI D3DXMatrixTransformation2D - ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter, - FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling, - CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, + ( D3DXMATRIX *pOut, CONST D3DXVECTOR2* pScalingCenter, + FLOAT ScalingRotation, CONST D3DXVECTOR2* pScaling, + CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, CONST D3DXVECTOR2* pTranslation); // Build affine transformation matrix. NULL arguments are treated as identity. @@ -981,7 +978,7 @@ D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation // Build 2D affine transformation matrix in XY plane. NULL arguments are treated as identity. // Mout = Ms * Mrc-1 * Mr * Mrc * Mt D3DXMATRIX* WINAPI D3DXMatrixAffineTransformation2D - ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter, + ( D3DXMATRIX *pOut, FLOAT Scaling, CONST D3DXVECTOR2* pRotationCenter, FLOAT Rotation, CONST D3DXVECTOR2* pTranslation); // Build a lookat matrix. (right-handed) @@ -1123,7 +1120,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionLn // if q = (0, theta * v); exp(q) = (cos(theta), sin(theta) * v) D3DXQUATERNION* WINAPI D3DXQuaternionExp ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ ); - + // Spherical linear interpolation between Q1 (t == 0) and Q2 (t == 1). // Expects unit quaternions. D3DXQUATERNION* WINAPI D3DXQuaternionSlerp @@ -1138,11 +1135,11 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad CONST D3DXQUATERNION *pC, FLOAT t ); // Setup control points for spherical quadrangle interpolation -// from Q1 to Q2. The control points are chosen in such a way +// from Q1 to Q2. The control points are chosen in such a way // to ensure the continuity of tangents with adjacent segments. void WINAPI D3DXQuaternionSquadSetup ( D3DXQUATERNION *pAOut, D3DXQUATERNION *pBOut, D3DXQUATERNION *pCOut, - CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1, + CONST D3DXQUATERNION *pQ0, CONST D3DXQUATERNION *pQ1, CONST D3DXQUATERNION *pQ2, CONST D3DXQUATERNION *pQ3 ); // Barycentric interpolation. @@ -1205,7 +1202,7 @@ D3DXPLANE* WINAPI D3DXPlaneFromPoints // M should be the inverse transpose of the transformation desired. D3DXPLANE* WINAPI D3DXPlaneTransform ( D3DXPLANE *pOut, CONST D3DXPLANE *pP, CONST D3DXMATRIX *pM ); - + // Transform an array of planes by a matrix. The vectors (a,b,c) must be normal. // M should be the inverse transpose of the transformation desired. D3DXPLANE* WINAPI D3DXPlaneTransformArray @@ -1271,7 +1268,7 @@ extern "C" { // Calculate Fresnel term given the cosine of theta (likely obtained by // taking the dot of two normals), and the refraction index of the material. FLOAT WINAPI D3DXFresnelTerm - (FLOAT CosTheta, FLOAT RefractionIndex); + (FLOAT CosTheta, FLOAT RefractionIndex); #ifdef __cplusplus } @@ -1287,7 +1284,7 @@ typedef interface ID3DXMatrixStack ID3DXMatrixStack; typedef interface ID3DXMatrixStack *LPD3DXMATRIXSTACK; // {C7885BA7-F990-4fe7-922D-8515E477DD85} -DEFINE_GUID(IID_ID3DXMatrixStack, +DEFINE_GUID(IID_ID3DXMatrixStack, 0xc7885ba7, 0xf990, 0x4fe7, 0x92, 0x2d, 0x85, 0x15, 0xe4, 0x77, 0xdd, 0x85); #undef INTERFACE @@ -1381,9 +1378,9 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) extern "C" { #endif -HRESULT WINAPI - D3DXCreateMatrixStack( - UINT Flags, +HRESULT WINAPI + D3DXCreateMatrixStack( + UINT Flags, LPD3DXMATRIXSTACK* ppStack); #ifdef __cplusplus @@ -1423,7 +1420,7 @@ extern "C" { FLOAT* WINAPI D3DXSHEvalDirection ( FLOAT *pOut, UINT Order, CONST D3DXVECTOR3 *pDir ); - + //============================================================================ // // D3DXSHRotate: @@ -1446,7 +1443,7 @@ FLOAT* WINAPI D3DXSHEvalDirection FLOAT* WINAPI D3DXSHRotate ( __out_ecount(Order*Order) FLOAT *pOut, UINT Order, CONST D3DXMATRIX *pMatrix, CONST FLOAT *pIn ); - + //============================================================================ // // D3DXSHRotateZ: @@ -1468,7 +1465,7 @@ FLOAT* WINAPI D3DXSHRotate FLOAT* WINAPI D3DXSHRotateZ ( FLOAT *pOut, UINT Order, FLOAT Angle, CONST FLOAT *pIn ); - + //============================================================================ // // D3DXSHAdd: @@ -1512,7 +1509,7 @@ FLOAT* WINAPI D3DXSHAdd FLOAT* WINAPI D3DXSHScale ( __out_ecount(Order*Order) FLOAT *pOut, UINT Order, CONST FLOAT *pIn, CONST FLOAT Scale ); - + //============================================================================ // // D3DXSHDot: @@ -1539,10 +1536,10 @@ FLOAT WINAPI D3DXSHDot // Computes the product of two functions represented using SH (f and g), where: // pOut[i] = int(y_i(s) * f(s) * g(s)), where y_i(s) is the ith SH basis // function, f(s) and g(s) are SH functions (sum_i(y_i(s)*c_i)). The order O -// determines the lengths of the arrays, where there should always be O^2 +// determines the lengths of the arrays, where there should always be O^2 // coefficients. In general the product of two SH functions of order O generates // and SH function of order 2*O - 1, but we truncate the result. This means -// that the product commutes (f*g == g*f) but doesn't associate +// that the product commutes (f*g == g*f) but doesn't associate // (f*(g*h) != (f*g)*h. // // Parameters: @@ -1572,7 +1569,7 @@ __out_ecount(36) FLOAT* WINAPI D3DXSHMultiply6(__out_ecount(36) FLOAT *pOut,__in // // D3DXSHEvalDirectionalLight: // -------------------- -// Evaluates a directional light and returns spectral SH data. The output +// Evaluates a directional light and returns spectral SH data. The output // vector is computed so that if the intensity of R/G/B is unit the resulting // exit radiance of a point directly under the light on a diffuse object with // an albedo of 1 would be 1.0. This will compute 3 spectral samples, pROut @@ -1594,25 +1591,25 @@ __out_ecount(36) FLOAT* WINAPI D3DXSHMultiply6(__out_ecount(36) FLOAT *pOut,__in // pGOut // Output SH vector for Green (optional.) // pBOut -// Output SH vector for Blue (optional.) +// Output SH vector for Blue (optional.) // //============================================================================ HRESULT WINAPI D3DXSHEvalDirectionalLight - ( UINT Order, CONST D3DXVECTOR3 *pDir, + ( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity, - __out_ecount_opt(Order*Order) FLOAT *pROut, - __out_ecount_opt(Order*Order) FLOAT *pGOut, + __out_ecount_opt(Order*Order) FLOAT *pROut, + __out_ecount_opt(Order*Order) FLOAT *pGOut, __out_ecount_opt(Order*Order) FLOAT *pBOut ); //============================================================================ // // D3DXSHEvalSphericalLight: // -------------------- -// Evaluates a spherical light and returns spectral SH data. There is no +// Evaluates a spherical light and returns spectral SH data. There is no // normalization of the intensity of the light like there is for directional -// lights, care has to be taken when specifiying the intensities. This will -// compute 3 spectral samples, pROut has to be specified, while pGout and +// lights, care has to be taken when specifiying the intensities. This will +// compute 3 spectral samples, pROut has to be specified, while pGout and // pBout are optional. // // Parameters: @@ -1633,15 +1630,15 @@ HRESULT WINAPI D3DXSHEvalDirectionalLight // pGOut // Output SH vector for Green (optional.) // pBOut -// Output SH vector for Blue (optional.) +// Output SH vector for Blue (optional.) // //============================================================================ HRESULT WINAPI D3DXSHEvalSphericalLight ( UINT Order, CONST D3DXVECTOR3 *pPos, FLOAT Radius, FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity, - __out_ecount_opt(Order*Order) FLOAT *pROut, - __out_ecount_opt(Order*Order) FLOAT *pGOut, + __out_ecount_opt(Order*Order) FLOAT *pROut, + __out_ecount_opt(Order*Order) FLOAT *pGOut, __out_ecount_opt(Order*Order) FLOAT *pBOut ); //============================================================================ @@ -1673,17 +1670,17 @@ HRESULT WINAPI D3DXSHEvalSphericalLight // pGOut // Output SH vector for Green (optional.) // pBOut -// Output SH vector for Blue (optional.) +// Output SH vector for Blue (optional.) // //============================================================================ HRESULT WINAPI D3DXSHEvalConeLight ( UINT Order, CONST D3DXVECTOR3 *pDir, FLOAT Radius, FLOAT RIntensity, FLOAT GIntensity, FLOAT BIntensity, - __out_ecount_opt(Order*Order) FLOAT *pROut, - __out_ecount_opt(Order*Order) FLOAT *pGOut, + __out_ecount_opt(Order*Order) FLOAT *pROut, + __out_ecount_opt(Order*Order) FLOAT *pGOut, __out_ecount_opt(Order*Order) FLOAT *pBOut ); - + //============================================================================ // // D3DXSHEvalHemisphereLight: @@ -1695,7 +1692,7 @@ HRESULT WINAPI D3DXSHEvalConeLight // is normalized so that a point on a perfectly diffuse surface with no // shadowing and a normal pointed in the direction pDir would result in exit // radiance with a value of 1 if the top color was white and the bottom color -// was black. This is a very simple model where Top represents the intensity +// was black. This is a very simple model where Top represents the intensity // of the "sky" and Bottom represents the intensity of the "ground". // // Parameters: @@ -1712,19 +1709,19 @@ HRESULT WINAPI D3DXSHEvalConeLight // pGOut // Output SH vector for Green // pBOut -// Output SH vector for Blue +// Output SH vector for Blue // //============================================================================ HRESULT WINAPI D3DXSHEvalHemisphereLight ( UINT Order, CONST D3DXVECTOR3 *pDir, D3DXCOLOR Top, D3DXCOLOR Bottom, - __out_ecount_opt(Order*Order) FLOAT *pROut, - __out_ecount_opt(Order*Order) FLOAT *pGOut, + __out_ecount_opt(Order*Order) FLOAT *pROut, + __out_ecount_opt(Order*Order) FLOAT *pGOut, __out_ecount_opt(Order*Order) FLOAT *pBOut ); // Math intersection functions -BOOL WINAPI D3DXIntersectTri +BOOL WINAPI D3DXIntersectTri ( CONST D3DXVECTOR3 *p0, // Triangle vertex 0 position CONST D3DXVECTOR3 *p1, // Triangle vertex 1 position @@ -1742,27 +1739,27 @@ BOOL WINAPI CONST D3DXVECTOR3 *pRayPosition, CONST D3DXVECTOR3 *pRayDirection); -BOOL WINAPI +BOOL WINAPI D3DXBoxBoundProbe( - CONST D3DXVECTOR3 *pMin, + CONST D3DXVECTOR3 *pMin, CONST D3DXVECTOR3 *pMax, CONST D3DXVECTOR3 *pRayPosition, CONST D3DXVECTOR3 *pRayDirection); -HRESULT WINAPI +HRESULT WINAPI D3DXComputeBoundingSphere( CONST D3DXVECTOR3 *pFirstPosition, // pointer to first position - DWORD NumVertices, + DWORD NumVertices, DWORD dwStride, // count in bytes to subsequent position vectors - D3DXVECTOR3 *pCenter, + D3DXVECTOR3 *pCenter, FLOAT *pRadius); -HRESULT WINAPI +HRESULT WINAPI D3DXComputeBoundingBox( CONST D3DXVECTOR3 *pFirstPosition, // pointer to first position - DWORD NumVertices, + DWORD NumVertices, DWORD dwStride, // count in bytes to subsequent position vectors - D3DXVECTOR3 *pMin, + D3DXVECTOR3 *pMin, D3DXVECTOR3 *pMax); /////////////////////////////////////////////////////////////////////////// @@ -1789,7 +1786,7 @@ typedef enum _D3DX_CPU_OPTIMIZATION //------------------------------------------------------------------------- // D3DXCpuOptimizations: // --------------------- -// Enables or disables CPU optimizations. Returns the type of CPU, which +// Enables or disables CPU optimizations. Returns the type of CPU, which // was detected, and for which optimizations exist. // // Parameters: @@ -1797,7 +1794,7 @@ typedef enum _D3DX_CPU_OPTIMIZATION // TRUE to enable CPU optimizations. FALSE to disable. //------------------------------------------------------------------------- -D3DX_CPU_OPTIMIZATION WINAPI +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL Enable); #ifdef __cplusplus diff --git a/gfx/include/dxsdk/d3dx10math.inl b/gfx/include/dxsdk/d3dx10math.inl index 34dff2f12b..0c66332bbf 100644 --- a/gfx/include/dxsdk/d3dx10math.inl +++ b/gfx/include/dxsdk/d3dx10math.inl @@ -10,7 +10,6 @@ #ifndef __D3DXMATH_INL__ #define __D3DXMATH_INL__ - //=========================================================================== // // Inline Class Methods @@ -73,7 +72,6 @@ D3DXFLOAT16::operator != ( CONST D3DXFLOAT16& f ) const return value != f.value; } - //-------------------------- // 2D Vector //-------------------------- @@ -98,7 +96,7 @@ D3DXVECTOR2::D3DXVECTOR2( CONST D3DXFLOAT16 *pf ) return; #endif - D3DXFloat16To32Array(&x, pf, 2); + D3DXFloat16To32Array(&x, pf, 2); } D3DX10INLINE @@ -108,7 +106,6 @@ D3DXVECTOR2::D3DXVECTOR2( FLOAT fx, FLOAT fy ) y = fy; } - // casting D3DX10INLINE D3DXVECTOR2::operator FLOAT* () @@ -122,7 +119,6 @@ D3DXVECTOR2::operator CONST FLOAT* () const return (CONST FLOAT *) &x; } - // assignment operators D3DX10INLINE D3DXVECTOR2& D3DXVECTOR2::operator += ( CONST D3DXVECTOR2& v ) @@ -157,7 +153,6 @@ D3DXVECTOR2::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXVECTOR2 D3DXVECTOR2::operator + () const @@ -171,7 +166,6 @@ D3DXVECTOR2::operator - () const return D3DXVECTOR2(-x, -y); } - // binary operators D3DX10INLINE D3DXVECTOR2 D3DXVECTOR2::operator + ( CONST D3DXVECTOR2& v ) const @@ -216,8 +210,6 @@ D3DXVECTOR2::operator != ( CONST D3DXVECTOR2& v ) const return x != v.x || y != v.y; } - - //-------------------------- // 2D Vector (16 bit) //-------------------------- @@ -251,7 +243,6 @@ D3DXVECTOR2_16F::D3DXVECTOR2_16F( CONST D3DXFLOAT16 &fx, CONST D3DXFLOAT16 &fy ) y = fy; } - // casting D3DX10INLINE D3DXVECTOR2_16F::operator D3DXFLOAT16* () @@ -265,21 +256,19 @@ D3DXVECTOR2_16F::operator CONST D3DXFLOAT16* () const return (CONST D3DXFLOAT16*) &x; } - // binary operators -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR2_16F::operator == ( CONST D3DXVECTOR2_16F &v ) const { return x == v.x && y == v.y; } -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR2_16F::operator != ( CONST D3DXVECTOR2_16F &v ) const { return x != v.x || y != v.y; } - //-------------------------- // 3D Vector //-------------------------- @@ -323,7 +312,6 @@ D3DXVECTOR3::D3DXVECTOR3( FLOAT fx, FLOAT fy, FLOAT fz ) z = fz; } - // casting D3DX10INLINE D3DXVECTOR3::operator FLOAT* () @@ -337,7 +325,6 @@ D3DXVECTOR3::operator CONST FLOAT* () const return (CONST FLOAT *) &x; } - // assignment operators D3DX10INLINE D3DXVECTOR3& D3DXVECTOR3::operator += ( CONST D3DXVECTOR3& v ) @@ -376,7 +363,6 @@ D3DXVECTOR3::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXVECTOR3 D3DXVECTOR3::operator + () const @@ -390,7 +376,6 @@ D3DXVECTOR3::operator - () const return D3DXVECTOR3(-x, -y, -z); } - // binary operators D3DX10INLINE D3DXVECTOR3 D3DXVECTOR3::operator + ( CONST D3DXVECTOR3& v ) const @@ -417,14 +402,12 @@ D3DXVECTOR3::operator / ( FLOAT f ) const return D3DXVECTOR3(x * fInv, y * fInv, z * fInv); } - D3DX10INLINE D3DXVECTOR3 operator * ( FLOAT f, CONST struct D3DXVECTOR3& v ) { return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); } - D3DX10INLINE BOOL D3DXVECTOR3::operator == ( CONST D3DXVECTOR3& v ) const { @@ -437,8 +420,6 @@ D3DXVECTOR3::operator != ( CONST D3DXVECTOR3& v ) const return x != v.x || y != v.y || z != v.z; } - - //-------------------------- // 3D Vector (16 bit) //-------------------------- @@ -482,7 +463,6 @@ D3DXVECTOR3_16F::D3DXVECTOR3_16F( CONST D3DXFLOAT16 &fx, CONST D3DXFLOAT16 &fy, z = fz; } - // casting D3DX10INLINE D3DXVECTOR3_16F::operator D3DXFLOAT16* () @@ -496,21 +476,19 @@ D3DXVECTOR3_16F::operator CONST D3DXFLOAT16* () const return (CONST D3DXFLOAT16*) &x; } - // binary operators -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR3_16F::operator == ( CONST D3DXVECTOR3_16F &v ) const { return x == v.x && y == v.y && z == v.z; } -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR3_16F::operator != ( CONST D3DXVECTOR3_16F &v ) const { return x != v.x || y != v.y || z != v.z; } - //-------------------------- // 4D Vector //-------------------------- @@ -557,7 +535,6 @@ D3DXVECTOR4::D3DXVECTOR4( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) w = fw; } - // casting D3DX10INLINE D3DXVECTOR4::operator FLOAT* () @@ -571,7 +548,6 @@ D3DXVECTOR4::operator CONST FLOAT* () const return (CONST FLOAT *) &x; } - // assignment operators D3DX10INLINE D3DXVECTOR4& D3DXVECTOR4::operator += ( CONST D3DXVECTOR4& v ) @@ -614,7 +590,6 @@ D3DXVECTOR4::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXVECTOR4 D3DXVECTOR4::operator + () const @@ -628,7 +603,6 @@ D3DXVECTOR4::operator - () const return D3DXVECTOR4(-x, -y, -z, -w); } - // binary operators D3DX10INLINE D3DXVECTOR4 D3DXVECTOR4::operator + ( CONST D3DXVECTOR4& v ) const @@ -661,7 +635,6 @@ operator * ( FLOAT f, CONST D3DXVECTOR4& v ) return D3DXVECTOR4(f * v.x, f * v.y, f * v.z, f * v.w); } - D3DX10INLINE BOOL D3DXVECTOR4::operator == ( CONST D3DXVECTOR4& v ) const { @@ -674,8 +647,6 @@ D3DXVECTOR4::operator != ( CONST D3DXVECTOR4& v ) const return x != v.x || y != v.y || z != v.z || w != v.w; } - - //-------------------------- // 4D Vector (16 bit) //-------------------------- @@ -721,7 +692,6 @@ D3DXVECTOR4_16F::D3DXVECTOR4_16F( CONST D3DXFLOAT16 &fx, CONST D3DXFLOAT16 &fy, w = fw; } - // casting D3DX10INLINE D3DXVECTOR4_16F::operator D3DXFLOAT16* () @@ -735,21 +705,19 @@ D3DXVECTOR4_16F::operator CONST D3DXFLOAT16* () const return (CONST D3DXFLOAT16*) &x; } - // binary operators -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR4_16F::operator == ( CONST D3DXVECTOR4_16F &v ) const { return x == v.x && y == v.y && z == v.z && w == v.w; } -D3DX10INLINE BOOL +D3DX10INLINE BOOL D3DXVECTOR4_16F::operator != ( CONST D3DXVECTOR4_16F &v ) const { return x != v.x || y != v.y || z != v.z || w != v.w; } - //-------------------------- // Matrix //-------------------------- @@ -793,8 +761,6 @@ D3DXMATRIX::D3DXMATRIX( FLOAT f11, FLOAT f12, FLOAT f13, FLOAT f14, _41 = f41; _42 = f42; _43 = f43; _44 = f44; } - - // access grants D3DX10INLINE FLOAT& D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) @@ -808,7 +774,6 @@ D3DXMATRIX::operator () ( UINT iRow, UINT iCol ) const return m[iRow][iCol]; } - // casting operators D3DX10INLINE D3DXMATRIX::operator FLOAT* () @@ -822,7 +787,6 @@ D3DXMATRIX::operator CONST FLOAT* () const return (CONST FLOAT *) &_11; } - // assignment operators D3DX10INLINE D3DXMATRIX& D3DXMATRIX::operator *= ( CONST D3DXMATRIX& mat ) @@ -872,7 +836,6 @@ D3DXMATRIX::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXMATRIX D3DXMATRIX::operator + () const @@ -889,7 +852,6 @@ D3DXMATRIX::operator - () const -_41, -_42, -_43, -_44); } - // binary operators D3DX10INLINE D3DXMATRIX D3DXMATRIX::operator * ( CONST D3DXMATRIX& mat ) const @@ -936,7 +898,6 @@ D3DXMATRIX::operator / ( FLOAT f ) const _41 * fInv, _42 * fInv, _43 * fInv, _44 * fInv); } - D3DX10INLINE D3DXMATRIX operator * ( FLOAT f, CONST D3DXMATRIX& mat ) { @@ -946,7 +907,6 @@ operator * ( FLOAT f, CONST D3DXMATRIX& mat ) f * mat._41, f * mat._42, f * mat._43, f * mat._44); } - D3DX10INLINE BOOL D3DXMATRIX::operator == ( CONST D3DXMATRIX& mat ) const { @@ -959,27 +919,25 @@ D3DXMATRIX::operator != ( CONST D3DXMATRIX& mat ) const return 0 != memcmp(this, &mat, sizeof(D3DXMATRIX)); } - - //-------------------------- // Aligned Matrices //-------------------------- D3DX10INLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST FLOAT* f ) : - D3DXMATRIX( f ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST FLOAT* f ) : + D3DXMATRIX( f ) { } D3DX10INLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DMATRIX& m ) : - D3DXMATRIX( m ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DMATRIX& m ) : + D3DXMATRIX( m ) { } D3DX10INLINE -_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DXFLOAT16* f ) : - D3DXMATRIX( f ) +_D3DXMATRIXA16::_D3DXMATRIXA16( CONST D3DXFLOAT16* f ) : + D3DXMATRIX( f ) { } @@ -991,7 +949,7 @@ _D3DXMATRIXA16::_D3DXMATRIXA16( FLOAT _11, FLOAT _12, FLOAT _13, FLOAT _14, D3DXMATRIX(_11, _12, _13, _14, _21, _22, _23, _24, _31, _32, _33, _34, - _41, _42, _43, _44) + _41, _42, _43, _44) { } @@ -999,7 +957,7 @@ _D3DXMATRIXA16::_D3DXMATRIXA16( FLOAT _11, FLOAT _12, FLOAT _13, FLOAT _14, #define SIZE_MAX ((SIZE_T)-1) #endif -D3DX10INLINE void* +D3DX10INLINE void* _D3DXMATRIXA16::operator new( size_t s ) { if (s > (SIZE_MAX-16)) @@ -1014,7 +972,7 @@ _D3DXMATRIXA16::operator new( size_t s ) return p; } -D3DX10INLINE void* +D3DX10INLINE void* _D3DXMATRIXA16::operator new[]( size_t s ) { if (s > (SIZE_MAX-16)) @@ -1029,7 +987,7 @@ _D3DXMATRIXA16::operator new[]( size_t s ) return p; } -D3DX10INLINE void +D3DX10INLINE void _D3DXMATRIXA16::operator delete(void* p) { if(p) @@ -1040,7 +998,7 @@ _D3DXMATRIXA16::operator delete(void* p) } } -D3DX10INLINE void +D3DX10INLINE void _D3DXMATRIXA16::operator delete[](void* p) { if(p) @@ -1051,14 +1009,13 @@ _D3DXMATRIXA16::operator delete[](void* p) } } -D3DX10INLINE _D3DXMATRIXA16& +D3DX10INLINE _D3DXMATRIXA16& _D3DXMATRIXA16::operator=(CONST D3DXMATRIX& rhs) { memcpy(&_11, &rhs, sizeof(D3DXMATRIX)); return *this; } - //-------------------------- // Quaternion //-------------------------- @@ -1097,7 +1054,6 @@ D3DXQUATERNION::D3DXQUATERNION( FLOAT fx, FLOAT fy, FLOAT fz, FLOAT fw ) w = fw; } - // casting D3DX10INLINE D3DXQUATERNION::operator FLOAT* () @@ -1111,7 +1067,6 @@ D3DXQUATERNION::operator CONST FLOAT* () const return (CONST FLOAT *) &x; } - // assignment operators D3DX10INLINE D3DXQUATERNION& D3DXQUATERNION::operator += ( CONST D3DXQUATERNION& q ) @@ -1161,7 +1116,6 @@ D3DXQUATERNION::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXQUATERNION D3DXQUATERNION::operator + () const @@ -1175,7 +1129,6 @@ D3DXQUATERNION::operator - () const return D3DXQUATERNION(-x, -y, -z, -w); } - // binary operators D3DX10INLINE D3DXQUATERNION D3DXQUATERNION::operator + ( CONST D3DXQUATERNION& q ) const @@ -1210,14 +1163,12 @@ D3DXQUATERNION::operator / ( FLOAT f ) const return D3DXQUATERNION(x * fInv, y * fInv, z * fInv, w * fInv); } - D3DX10INLINE D3DXQUATERNION operator * (FLOAT f, CONST D3DXQUATERNION& q ) { return D3DXQUATERNION(f * q.x, f * q.y, f * q.z, f * q.w); } - D3DX10INLINE BOOL D3DXQUATERNION::operator == ( CONST D3DXQUATERNION& q ) const { @@ -1230,8 +1181,6 @@ D3DXQUATERNION::operator != ( CONST D3DXQUATERNION& q ) const return x != q.x || y != q.y || z != q.z || w != q.w; } - - //-------------------------- // Plane //-------------------------- @@ -1270,7 +1219,6 @@ D3DXPLANE::D3DXPLANE( FLOAT fa, FLOAT fb, FLOAT fc, FLOAT fd ) d = fd; } - // casting D3DX10INLINE D3DXPLANE::operator FLOAT* () @@ -1284,7 +1232,6 @@ D3DXPLANE::operator CONST FLOAT* () const return (CONST FLOAT *) &a; } - // assignment operators D3DX10INLINE D3DXPLANE& D3DXPLANE::operator *= ( FLOAT f ) @@ -1307,7 +1254,6 @@ D3DXPLANE::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXPLANE D3DXPLANE::operator + () const @@ -1321,7 +1267,6 @@ D3DXPLANE::operator - () const return D3DXPLANE(-a, -b, -c, -d); } - // binary operators D3DX10INLINE D3DXPLANE D3DXPLANE::operator * ( FLOAT f ) const @@ -1354,9 +1299,6 @@ D3DXPLANE::operator != ( CONST D3DXPLANE& p ) const return a != p.a || b != p.b || c != p.c || d != p.d; } - - - //-------------------------- // Color //-------------------------- @@ -1405,7 +1347,6 @@ D3DXCOLOR::D3DXCOLOR( FLOAT fr, FLOAT fg, FLOAT fb, FLOAT fa ) a = fa; } - // casting D3DX10INLINE D3DXCOLOR::operator UINT () const @@ -1418,7 +1359,6 @@ D3DXCOLOR::operator UINT () const return (dwA << 24) | (dwR << 16) | (dwG << 8) | (dwB << 0); } - D3DX10INLINE D3DXCOLOR::operator FLOAT * () { @@ -1473,7 +1413,6 @@ D3DXCOLOR::operator /= ( FLOAT f ) return *this; } - // unary operators D3DX10INLINE D3DXCOLOR D3DXCOLOR::operator + () const @@ -1487,7 +1426,6 @@ D3DXCOLOR::operator - () const return D3DXCOLOR(-r, -g, -b, -a); } - // binary operators D3DX10INLINE D3DXCOLOR D3DXCOLOR::operator + ( CONST D3DXCOLOR& c ) const @@ -1514,14 +1452,12 @@ D3DXCOLOR::operator / ( FLOAT f ) const return D3DXCOLOR(r * fInv, g * fInv, b * fInv, a * fInv); } - D3DX10INLINE D3DXCOLOR operator * (FLOAT f, CONST D3DXCOLOR& c ) { return D3DXCOLOR(f * c.r, f * c.g, f * c.b, f * c.a); } - D3DX10INLINE BOOL D3DXCOLOR::operator == ( CONST D3DXCOLOR& c ) const { @@ -1534,18 +1470,14 @@ D3DXCOLOR::operator != ( CONST D3DXCOLOR& c ) const return r != c.r || g != c.g || b != c.b || a != c.a; } - #endif //__cplusplus - - //=========================================================================== // // Inline functions // //=========================================================================== - //-------------------------- // 2D Vector //-------------------------- @@ -1677,7 +1609,6 @@ D3DX10INLINE D3DXVECTOR2* D3DXVec2Lerp return pOut; } - //-------------------------- // 3D Vector //-------------------------- @@ -1822,7 +1753,6 @@ D3DX10INLINE D3DXVECTOR3* D3DXVec3Lerp return pOut; } - //-------------------------- // 4D Vector //-------------------------- @@ -1955,7 +1885,6 @@ D3DX10INLINE D3DXVECTOR4* D3DXVec4Lerp return pOut; } - //-------------------------- // 4D Matrix //-------------------------- @@ -1977,7 +1906,6 @@ D3DX10INLINE D3DXMATRIX* D3DXMatrixIdentity return pOut; } - D3DX10INLINE BOOL D3DXMatrixIsIdentity ( CONST D3DXMATRIX *pM ) { @@ -1992,7 +1920,6 @@ D3DX10INLINE BOOL D3DXMatrixIsIdentity pM->m[3][0] == 0.0f && pM->m[3][1] == 0.0f && pM->m[3][2] == 0.0f && pM->m[3][3] == 1.0f; } - //-------------------------- // Quaternion //-------------------------- @@ -2034,7 +1961,6 @@ D3DX10INLINE FLOAT D3DXQuaternionDot return pQ1->x * pQ2->x + pQ1->y * pQ2->y + pQ1->z * pQ2->z + pQ1->w * pQ2->w; } - D3DX10INLINE D3DXQUATERNION* D3DXQuaternionIdentity ( D3DXQUATERNION *pOut ) { @@ -2059,7 +1985,6 @@ D3DX10INLINE BOOL D3DXQuaternionIsIdentity return pQ->x == 0.0f && pQ->y == 0.0f && pQ->z == 0.0f && pQ->w == 1.0f; } - D3DX10INLINE D3DXQUATERNION* D3DXQuaternionConjugate ( D3DXQUATERNION *pOut, CONST D3DXQUATERNION *pQ ) { @@ -2075,7 +2000,6 @@ D3DX10INLINE D3DXQUATERNION* D3DXQuaternionConjugate return pOut; } - //-------------------------- // Plane //-------------------------- @@ -2128,7 +2052,6 @@ D3DX10INLINE D3DXPLANE* D3DXPlaneScale return pOut; } - //-------------------------- // Color //-------------------------- @@ -2223,5 +2146,4 @@ D3DX10INLINE D3DXCOLOR* D3DXColorLerp return pOut; } - #endif // __D3DXMATH_INL__ diff --git a/gfx/include/dxsdk/d3dx10mesh.h b/gfx/include/dxsdk/d3dx10mesh.h index 2e2ff2e94f..50af8b7f2c 100644 --- a/gfx/include/dxsdk/d3dx10mesh.h +++ b/gfx/include/dxsdk/d3dx10mesh.h @@ -13,27 +13,27 @@ #define __D3DX10MESH_H__ // {7ED943DD-52E8-40b5-A8D8-76685C406330} -DEFINE_GUID(IID_ID3DX10BaseMesh, +DEFINE_GUID(IID_ID3DX10BaseMesh, 0x7ed943dd, 0x52e8, 0x40b5, 0xa8, 0xd8, 0x76, 0x68, 0x5c, 0x40, 0x63, 0x30); // {04B0D117-1041-46b1-AA8A-3952848BA22E} -DEFINE_GUID(IID_ID3DX10MeshBuffer, +DEFINE_GUID(IID_ID3DX10MeshBuffer, 0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e); // {4020E5C2-1403-4929-883F-E2E849FAC195} -DEFINE_GUID(IID_ID3DX10Mesh, +DEFINE_GUID(IID_ID3DX10Mesh, 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); // {8875769A-D579-4088-AAEB-534D1AD84E96} -DEFINE_GUID(IID_ID3DX10PMesh, +DEFINE_GUID(IID_ID3DX10PMesh, 0x8875769a, 0xd579, 0x4088, 0xaa, 0xeb, 0x53, 0x4d, 0x1a, 0xd8, 0x4e, 0x96); // {667EA4C7-F1CD-4386-B523-7C0290B83CC5} -DEFINE_GUID(IID_ID3DX10SPMesh, +DEFINE_GUID(IID_ID3DX10SPMesh, 0x667ea4c7, 0xf1cd, 0x4386, 0xb5, 0x23, 0x7c, 0x2, 0x90, 0xb8, 0x3c, 0xc5); // {3CE6CC22-DBF2-44f4-894D-F9C34A337139} -DEFINE_GUID(IID_ID3DX10PatchMesh, +DEFINE_GUID(IID_ID3DX10PatchMesh, 0x3ce6cc22, 0xdbf2, 0x44f4, 0x89, 0x4d, 0xf9, 0xc3, 0x4a, 0x33, 0x71, 0x39); // Mesh options - lower 3 bytes only, upper byte used by _D3DX10MESHOPT option flags @@ -84,7 +84,7 @@ typedef D3DX10_WELD_EPSILONS* LPD3DX10_WELD_EPSILONS; typedef struct _D3DX10_INTERSECT_INFO { UINT FaceIndex; // index of face intersected - FLOAT U; // Barycentric Hit Coordinates + FLOAT U; // Barycentric Hit Coordinates FLOAT V; // Barycentric Hit Coordinates FLOAT Dist; // Ray-Intersection Parameter Distance } D3DX10_INTERSECT_INFO, *LPD3DX10_INTERSECT_INFO; @@ -99,7 +99,7 @@ DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; - + // ID3DX10MeshBuffer STDMETHOD(Map)(THIS_ void **ppData, SIZE_T *pSize) PURE; STDMETHOD(Unmap)(THIS) PURE; @@ -144,18 +144,18 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown) STDMETHOD(SetPointRepData)(THIS_ CONST UINT *pPointReps) PURE; STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **ppPointReps) PURE; - + STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS dwDiscard) PURE; STDMETHOD(CloneMesh)(THIS_ UINT Flags, LPCSTR pPosSemantic, CONST D3D10_INPUT_ELEMENT_DESC *pDesc, UINT DeclCount, ID3DX10Mesh** ppCloneMesh) PURE; STDMETHOD(Optimize)(THIS_ UINT Flags, UINT * pFaceRemap, LPD3D10BLOB *ppVertexRemap) PURE; STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE; - - STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, + + STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits); - STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, + STDMETHOD(IntersectSubset)(THIS_ UINT AttribId, D3DXVECTOR3 *pRayPos, D3DXVECTOR3 *pRayDir, UINT *pHitCount, UINT *pFaceIndex, float *pU, float *pV, float *pDist, ID3D10Blob **ppAllHits); - + // ID3DX10Mesh - Device functions STDMETHOD(CommitToDevice)(THIS) PURE; STDMETHOD(DrawSubset)(THIS_ UINT AttribId) PURE; @@ -170,15 +170,15 @@ DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown) extern "C" { #endif //__cplusplus -HRESULT WINAPI +HRESULT WINAPI D3DX10CreateMesh( ID3D10Device *pDevice, - CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration, + CONST D3D10_INPUT_ELEMENT_DESC *pDeclaration, UINT DeclCount, LPCSTR pPositionSemantic, UINT VertexCount, UINT FaceCount, - UINT Options, + UINT Options, ID3DX10Mesh **ppMesh); #ifdef __cplusplus @@ -194,7 +194,7 @@ enum _D3DX10_MESHOPT { D3DX10_MESHOPT_IGNORE_VERTS = 0x10000000, // optimize faces only, don't touch vertices D3DX10_MESHOPT_DO_NOT_SPLIT = 0x20000000, // do not split vertices shared between attribute groups when attribute sorting D3DX10_MESHOPT_DEVICE_INDEPENDENT = 0x00400000, // Only affects VCache. uses a static known good cache size for all cards - + // D3DX10_MESHOPT_SHAREVB has been removed, please use D3DX10MESH_VB_SHARE instead }; @@ -204,7 +204,7 @@ enum _D3DX10_MESHOPT { ////////////////////////////////////////////////////////////////////////// // {420BD604-1C76-4a34-A466-E45D0658A32C} -DEFINE_GUID(IID_ID3DX10SkinInfo, +DEFINE_GUID(IID_ID3DX10SkinInfo, 0x420bd604, 0x1c76, 0x4a34, 0xa4, 0x66, 0xe4, 0x5d, 0x6, 0x58, 0xa3, 0x2c); // scaling modes for ID3DX10SkinInfo::Compact() & ID3DX10SkinInfo::UpdateMesh() @@ -260,7 +260,7 @@ extern "C" { HRESULT WINAPI D3DX10CreateSkinInfo(LPD3DX10SKININFO* ppSkinInfo); - + #ifdef __cplusplus } #endif //__cplusplus diff --git a/gfx/include/dxsdk/d3dx10tex.h b/gfx/include/dxsdk/d3dx10tex.h index 5c28fc8587..702fe63142 100644 --- a/gfx/include/dxsdk/d3dx10tex.h +++ b/gfx/include/dxsdk/d3dx10tex.h @@ -26,14 +26,14 @@ // from the source image. // D3DX10_FILTER_LINEAR // Each destination pixel is computed by linearly interpolating between -// the nearest pixels in the source image. This filter works best +// the nearest pixels in the source image. This filter works best // when the scale on each axis is less than 2. // D3DX10_FILTER_TRIANGLE // Every pixel in the source image contributes equally to the // destination image. This is the slowest of all the filters. // D3DX10_FILTER_BOX -// Each pixel is computed by averaging a 2x2(x2) box pixels from -// the source image. Only works when the dimensions of the +// Each pixel is computed by averaging a 2x2(x2) box pixels from +// the source image. Only works when the dimensions of the // destination are half those of the source. (as with mip maps) // // And can be OR'd with any of these optional flags: @@ -97,7 +97,7 @@ typedef enum D3DX10_FILTER_FLAG // D3DX10_NORMALMAP_MIRROR // Same as specifying D3DX10_NORMALMAP_MIRROR_U | D3DX10_NORMALMAP_MIRROR_V // D3DX10_NORMALMAP_INVERTSIGN -// Inverts the direction of each normal +// Inverts the direction of each normal // D3DX10_NORMALMAP_COMPUTE_OCCLUSION // Compute the per pixel Occlusion term and encodes it into the alpha. // An Alpha of 1 means that the pixel is not obscured in anyway, and @@ -129,7 +129,7 @@ typedef enum D3DX10_NORMALMAP_FLAG // D3DX10_CHANNEL_ALPHA // Indicates the alpha channel should be used // D3DX10_CHANNEL_LUMINANCE -// Indicates the luminaces of the red green and blue channels should be +// Indicates the luminaces of the red green and blue channels should be // used. // //---------------------------------------------------------------------------- @@ -180,7 +180,7 @@ typedef enum D3DX10_SAVE_TEXTURE_FLAG // --------------- // This structure is used to return a rough description of what the // the original contents of an image file looked like. -// +// // Width // Width of original image in pixels // Height @@ -226,10 +226,10 @@ extern "C" { //---------------------------------------------------------------------------- // D3DX10_IMAGE_LOAD_INFO: // --------------- -// This structure can be optionally passed in to texture loader APIs to +// This structure can be optionally passed in to texture loader APIs to // control how textures get loaded. Pass in D3DX10_DEFAULT for any of these // to have D3DX automatically pick defaults based on the source file. -// +// // Width // Rescale texture to Width texels wide // Height @@ -253,10 +253,10 @@ extern "C" { // Filter // Filter the texture using the specified filter (only when resampling) // MipFilter -// Filter the texture mip levels using the specified filter (only if +// Filter the texture mip levels using the specified filter (only if // generating mips) // pSrcInfo -// (optional) pointer to a D3DX10_IMAGE_INFO structure that will get +// (optional) pointer to a D3DX10_IMAGE_INFO structure that will get // populated with source image information //---------------------------------------------------------------------------- @@ -275,7 +275,7 @@ typedef struct D3DX10_IMAGE_LOAD_INFO UINT Filter; UINT MipFilter; D3DX10_IMAGE_INFO* pSrcInfo; - + #ifdef __cplusplus D3DX10_IMAGE_LOAD_INFO() { @@ -292,7 +292,7 @@ typedef struct D3DX10_IMAGE_LOAD_INFO Filter = D3DX10_DEFAULT; MipFilter = D3DX10_DEFAULT; pSrcInfo = NULL; - } + } #endif } D3DX10_IMAGE_LOAD_INFO; @@ -317,7 +317,7 @@ typedef struct D3DX10_IMAGE_LOAD_INFO // pPump // Optional pointer to a thread pump object to use. // pSrcInfo -// Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the +// Pointer to a D3DX10_IMAGE_INFO structure to be filled in with the // description of the data in the source image file. // pHResult // Pointer to a memory location to receive the return value upon completion. @@ -500,8 +500,8 @@ HRESULT WINAPI ID3D10Device* pDevice, HMODULE hSrcModule, LPCSTR pSrcResource, - D3DX10_IMAGE_LOAD_INFO *pLoadInfo, - ID3DX10ThreadPump* pPump, + D3DX10_IMAGE_LOAD_INFO *pLoadInfo, + ID3DX10ThreadPump* pPump, ID3D10Resource** ppTexture, HRESULT* pHResult); @@ -529,7 +529,7 @@ HRESULT WINAPI LPCVOID pSrcData, SIZE_T SrcDataSize, D3DX10_IMAGE_LOAD_INFO* pLoadInfo, - ID3DX10ThreadPump* pPump, + ID3DX10ThreadPump* pPump, ID3D10ShaderResourceView** ppShaderResourceView, HRESULT* pHResult); @@ -538,8 +538,8 @@ HRESULT WINAPI ID3D10Device* pDevice, LPCVOID pSrcData, SIZE_T SrcDataSize, - D3DX10_IMAGE_LOAD_INFO* pLoadInfo, - ID3DX10ThreadPump* pPump, + D3DX10_IMAGE_LOAD_INFO* pLoadInfo, + ID3DX10ThreadPump* pPump, ID3D10Resource** ppTexture, HRESULT* pHResult); @@ -565,7 +565,7 @@ typedef struct _D3DX10_TEXTURE_LOAD_INFO UINT NumElements; UINT Filter; UINT MipFilter; - + #ifdef __cplusplus _D3DX10_TEXTURE_LOAD_INFO() { @@ -579,7 +579,7 @@ typedef struct _D3DX10_TEXTURE_LOAD_INFO NumElements = D3DX10_DEFAULT; Filter = D3DX10_DEFAULT; MipFilter = D3DX10_DEFAULT; - } + } #endif } D3DX10_TEXTURE_LOAD_INFO; @@ -608,7 +608,7 @@ HRESULT WINAPI // pBaseTexture // The texture object to be filtered // SrcLevel -// The level whose image is used to generate the subsequent levels. +// The level whose image is used to generate the subsequent levels. // MipFilter // D3DX10_FILTER flags controlling how each miplevel is filtered. // Or D3DX10_DEFAULT for D3DX10_FILTER_BOX, @@ -685,7 +685,7 @@ HRESULT WINAPI // // Parameters // pSrcTexture -// Pointer to the source heightmap texture +// Pointer to the source heightmap texture // Flags // D3DX10_NORMALMAP flags // Channel @@ -719,7 +719,7 @@ HRESULT WINAPI // pGOut // Output SH vector for Green // pBOut -// Output SH vector for Blue +// Output SH vector for Blue // //--------------------------------------------------------------------------- diff --git a/gfx/include/dxsdk/d3dx11async.h b/gfx/include/dxsdk/d3dx11async.h index f925f8d045..dc03ca7fbd 100644 --- a/gfx/include/dxsdk/d3dx11async.h +++ b/gfx/include/dxsdk/d3dx11async.h @@ -45,7 +45,7 @@ extern "C" { // Instruction set to be used when generating code. Currently supported // profiles are "vs_1_1", "vs_2_0", "vs_2_a", "vs_2_sw", "vs_3_0", // "vs_3_sw", "vs_4_0", "vs_4_1", -// "ps_2_0", "ps_2_a", "ps_2_b", "ps_2_sw", "ps_3_0", +// "ps_2_0", "ps_2_a", "ps_2_b", "ps_2_sw", "ps_3_0", // "ps_3_sw", "ps_4_0", "ps_4_1", // "gs_4_0", "gs_4_1", // "tx_1_0", @@ -83,10 +83,10 @@ HRESULT WINAPI D3DX11CompileFromFileW(LPCWSTR pSrcFile, CONST D3D10_SHADER_MACRO #define D3DX11CompileFromFile D3DX11CompileFromFileA #endif -HRESULT WINAPI D3DX11CompileFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11CompileFromResourceA(HMODULE hSrcModule, LPCSTR pSrcResource, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX11ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResource, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX11ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); #ifdef UNICODE @@ -95,22 +95,22 @@ HRESULT WINAPI D3DX11CompileFromResourceW(HMODULE hSrcModule, LPCWSTR pSrcResour #define D3DX11CompileFromResource D3DX11CompileFromResourceA #endif -HRESULT WINAPI D3DX11CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX11CompileFromMemory(LPCSTR pSrcData, SIZE_T SrcDataLen, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX11ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11PreprocessShaderFromFileA(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX11ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11PreprocessShaderFromFileW(LPCWSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX11ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11PreprocessShaderFromMemory(LPCSTR pSrcData, SIZE_T SrcDataSize, LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX11ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11PreprocessShaderFromResourceA(HMODULE hModule, LPCSTR pResourceName, LPCSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX11ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); -HRESULT WINAPI D3DX11PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, +HRESULT WINAPI D3DX11PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pResourceName, LPCWSTR pSrcFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3DX11ThreadPump *pPump, ID3D10Blob** ppShaderText, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult); #ifdef UNICODE @@ -125,11 +125,11 @@ HRESULT WINAPI D3DX11PreprocessShaderFromResourceW(HMODULE hModule, LPCWSTR pRes // Async processors //---------------------------------------------------------------------------- -HRESULT WINAPI D3DX11CreateAsyncCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX11CreateAsyncCompilerProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3D10Blob **ppCompiledShader, ID3D10Blob **ppErrorBuffer, ID3DX11DataProcessor **ppProcessor); -HRESULT WINAPI D3DX11CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, +HRESULT WINAPI D3DX11CreateAsyncShaderPreprocessProcessor(LPCSTR pFileName, CONST D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, ID3D10Blob** ppShaderText, ID3D10Blob **ppErrorBuffer, ID3DX11DataProcessor **ppProcessor); //---------------------------------------------------------------------------- diff --git a/gfx/include/dxsdk/d3dx11core.h b/gfx/include/dxsdk/d3dx11core.h index bbb26b94d2..d747b6e371 100644 --- a/gfx/include/dxsdk/d3dx11core.h +++ b/gfx/include/dxsdk/d3dx11core.h @@ -18,7 +18,7 @@ #define D3DX11_DLL_A "d3dx11_43.dll" #ifdef UNICODE - #define D3DX11_DLL D3DX11_DLL_W + #define D3DX11_DLL D3DX11_DLL_W #else #define D3DX11_DLL D3DX11_DLL_A #endif @@ -31,16 +31,16 @@ extern "C" { // D3DX11_SDK_VERSION: // ----------------- // This identifier is passed to D3DX11CheckVersion in order to ensure that an -// application was built against the correct header files and lib files. -// This number is incremented whenever a header (or other) change would -// require applications to be rebuilt. If the version doesn't match, +// application was built against the correct header files and lib files. +// This number is incremented whenever a header (or other) change would +// require applications to be rebuilt. If the version doesn't match, // D3DX11CreateVersion will return FALSE. (The number itself has no meaning.) /////////////////////////////////////////////////////////////////////////// #define D3DX11_SDK_VERSION 43 #ifdef D3D_DIAG_DLL -BOOL WINAPI D3DX11DebugMute(BOOL Mute); +BOOL WINAPI D3DX11DebugMute(BOOL Mute); #endif HRESULT WINAPI D3DX11CheckVersion(UINT D3DSdkVersion, UINT D3DX11SdkVersion); @@ -73,7 +73,7 @@ DECLARE_INTERFACE(ID3DX11DataProcessor) }; // {C93FECFA-6967-478a-ABBC-402D90621FCB} -DEFINE_GUID(IID_ID3DX11ThreadPump, +DEFINE_GUID(IID_ID3DX11ThreadPump, 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb); #undef INTERFACE @@ -89,13 +89,13 @@ DECLARE_INTERFACE_(ID3DX11ThreadPump, IUnknown) // ID3DX11ThreadPump STDMETHOD(AddWorkItem)(THIS_ ID3DX11DataLoader *pDataLoader, ID3DX11DataProcessor *pDataProcessor, HRESULT *pHResult, void **ppDeviceObject) PURE; STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE; - + STDMETHOD(WaitForAllItems)(THIS) PURE; STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT iWorkItemCount); STDMETHOD(PurgeAllItems)(THIS) PURE; STDMETHOD(GetQueueStatus)(THIS_ UINT *pIoQueue, UINT *pProcessQueue, UINT *pDeviceQueue) PURE; - + }; #ifdef __cplusplus diff --git a/gfx/include/dxsdk/d3dx11tex.h b/gfx/include/dxsdk/d3dx11tex.h index e0a7334e95..bc1339f8fd 100644 --- a/gfx/include/dxsdk/d3dx11tex.h +++ b/gfx/include/dxsdk/d3dx11tex.h @@ -26,14 +26,14 @@ // from the source image. // D3DX11_FILTER_LINEAR // Each destination pixel is computed by linearly interpolating between -// the nearest pixels in the source image. This filter works best +// the nearest pixels in the source image. This filter works best // when the scale on each axis is less than 2. // D3DX11_FILTER_TRIANGLE // Every pixel in the source image contributes equally to the // destination image. This is the slowest of all the filters. // D3DX11_FILTER_BOX -// Each pixel is computed by averaging a 2x2(x2) box pixels from -// the source image. Only works when the dimensions of the +// Each pixel is computed by averaging a 2x2(x2) box pixels from +// the source image. Only works when the dimensions of the // destination are half those of the source. (as with mip maps) // // And can be OR'd with any of these optional flags: @@ -97,7 +97,7 @@ typedef enum D3DX11_FILTER_FLAG // D3DX11_NORMALMAP_MIRROR // Same as specifying D3DX11_NORMALMAP_MIRROR_U | D3DX11_NORMALMAP_MIRROR_V // D3DX11_NORMALMAP_INVERTSIGN -// Inverts the direction of each normal +// Inverts the direction of each normal // D3DX11_NORMALMAP_COMPUTE_OCCLUSION // Compute the per pixel Occlusion term and encodes it into the alpha. // An Alpha of 1 means that the pixel is not obscured in anyway, and @@ -129,7 +129,7 @@ typedef enum D3DX11_NORMALMAP_FLAG // D3DX11_CHANNEL_ALPHA // Indicates the alpha channel should be used // D3DX11_CHANNEL_LUMINANCE -// Indicates the luminaces of the red green and blue channels should be +// Indicates the luminaces of the red green and blue channels should be // used. // //---------------------------------------------------------------------------- @@ -180,7 +180,7 @@ typedef enum D3DX11_SAVE_TEXTURE_FLAG // --------------- // This structure is used to return a rough description of what the // the original contents of an image file looked like. -// +// // Width // Width of original image in pixels // Height @@ -226,10 +226,10 @@ extern "C" { //---------------------------------------------------------------------------- // D3DX11_IMAGE_LOAD_INFO: // --------------- -// This structure can be optionally passed in to texture loader APIs to +// This structure can be optionally passed in to texture loader APIs to // control how textures get loaded. Pass in D3DX11_DEFAULT for any of these // to have D3DX automatically pick defaults based on the source file. -// +// // Width // Rescale texture to Width texels wide // Height @@ -253,10 +253,10 @@ extern "C" { // Filter // Filter the texture using the specified filter (only when resampling) // MipFilter -// Filter the texture mip levels using the specified filter (only if +// Filter the texture mip levels using the specified filter (only if // generating mips) // pSrcInfo -// (optional) pointer to a D3DX11_IMAGE_INFO structure that will get +// (optional) pointer to a D3DX11_IMAGE_INFO structure that will get // populated with source image information //---------------------------------------------------------------------------- @@ -275,7 +275,7 @@ typedef struct D3DX11_IMAGE_LOAD_INFO UINT Filter; UINT MipFilter; D3DX11_IMAGE_INFO* pSrcInfo; - + #ifdef __cplusplus D3DX11_IMAGE_LOAD_INFO() { @@ -292,7 +292,7 @@ typedef struct D3DX11_IMAGE_LOAD_INFO Filter = D3DX11_DEFAULT; MipFilter = D3DX11_DEFAULT; pSrcInfo = NULL; - } + } #endif } D3DX11_IMAGE_LOAD_INFO; @@ -317,7 +317,7 @@ typedef struct D3DX11_IMAGE_LOAD_INFO // pPump // Optional pointer to a thread pump object to use. // pSrcInfo -// Pointer to a D3DX11_IMAGE_INFO structure to be filled in with the +// Pointer to a D3DX11_IMAGE_INFO structure to be filled in with the // description of the data in the source image file. // pHResult // Pointer to a memory location to receive the return value upon completion. @@ -500,8 +500,8 @@ HRESULT WINAPI ID3D11Device* pDevice, HMODULE hSrcModule, LPCSTR pSrcResource, - D3DX11_IMAGE_LOAD_INFO *pLoadInfo, - ID3DX11ThreadPump* pPump, + D3DX11_IMAGE_LOAD_INFO *pLoadInfo, + ID3DX11ThreadPump* pPump, ID3D11Resource** ppTexture, HRESULT* pHResult); @@ -529,7 +529,7 @@ HRESULT WINAPI LPCVOID pSrcData, SIZE_T SrcDataSize, D3DX11_IMAGE_LOAD_INFO* pLoadInfo, - ID3DX11ThreadPump* pPump, + ID3DX11ThreadPump* pPump, ID3D11ShaderResourceView** ppShaderResourceView, HRESULT* pHResult); @@ -538,8 +538,8 @@ HRESULT WINAPI ID3D11Device* pDevice, LPCVOID pSrcData, SIZE_T SrcDataSize, - D3DX11_IMAGE_LOAD_INFO* pLoadInfo, - ID3DX11ThreadPump* pPump, + D3DX11_IMAGE_LOAD_INFO* pLoadInfo, + ID3DX11ThreadPump* pPump, ID3D11Resource** ppTexture, HRESULT* pHResult); @@ -565,7 +565,7 @@ typedef struct _D3DX11_TEXTURE_LOAD_INFO UINT NumElements; UINT Filter; UINT MipFilter; - + #ifdef __cplusplus _D3DX11_TEXTURE_LOAD_INFO() { @@ -579,7 +579,7 @@ typedef struct _D3DX11_TEXTURE_LOAD_INFO NumElements = D3DX11_DEFAULT; Filter = D3DX11_DEFAULT; MipFilter = D3DX11_DEFAULT; - } + } #endif } D3DX11_TEXTURE_LOAD_INFO; @@ -609,7 +609,7 @@ HRESULT WINAPI // pBaseTexture // The texture object to be filtered // SrcLevel -// The level whose image is used to generate the subsequent levels. +// The level whose image is used to generate the subsequent levels. // MipFilter // D3DX11_FILTER flags controlling how each miplevel is filtered. // Or D3DX11_DEFAULT for D3DX11_FILTER_BOX, @@ -690,7 +690,7 @@ HRESULT WINAPI // // Parameters // pSrcTexture -// Pointer to the source heightmap texture +// Pointer to the source heightmap texture // Flags // D3DX11_NORMALMAP flags // Channel @@ -725,7 +725,7 @@ HRESULT WINAPI // pGOut // Output SH vector for Green // pBOut -// Output SH vector for Blue +// Output SH vector for Blue // //--------------------------------------------------------------------------- diff --git a/gfx/include/dxsdk/d3dx_dxgiformatconvert.inl b/gfx/include/dxsdk/d3dx_dxgiformatconvert.inl index 1cfba72780..18eaaabd05 100644 --- a/gfx/include/dxsdk/d3dx_dxgiformatconvert.inl +++ b/gfx/include/dxsdk/d3dx_dxgiformatconvert.inl @@ -16,22 +16,22 @@ // D3D11's Unordered Access View (UAV) of a Texture1D/2D/3D resource // allows random access reads and writes to memory from a Compute Shader // or Pixel Shader. However, the only texture format that supports this -// is DXGI_FORMAT_R32_UINT. e.g. Other more interesting formats like -// DXGI_FORMAT_R8G8B8A8_UNORM do not support simultaneous read and -// write. You can use such formats for random access writing only +// is DXGI_FORMAT_R32_UINT. e.g. Other more interesting formats like +// DXGI_FORMAT_R8G8B8A8_UNORM do not support simultaneous read and +// write. You can use such formats for random access writing only // using a UAV, or reading only using a Shader Resource View (SRV). // But for simultaneous read+write, the format conversion hardware is // not available. // // There is a workaround to this limitation, involving casting the texture // to R32_UINT when creating a UAV, as long as the original format of the -// resource supports it (most 32 bit per element formats). This allows -// simultaneous read+write as long as the shader does manual format +// resource supports it (most 32 bit per element formats). This allows +// simultaneous read+write as long as the shader does manual format // unpacking on read and packing on write. -// +// // The benefit is that later on, other views such as RenderTarget Views -// or ShaderResource Views on the same texture can be used with the -// proper format (e.g. DXGI_FORMAT_R16G16_FLOAT) so the hardware can +// or ShaderResource Views on the same texture can be used with the +// proper format (e.g. DXGI_FORMAT_R16G16_FLOAT) so the hardware can // do the usual automatic format unpack/pack and do texture filtering etc. // where there are no hardware limitations. // @@ -39,7 +39,7 @@ // // Suppose you want to make a texture than you can use a Pixel Shader // or Compute Shader to perform in-place editing, and that the format -// you want the data to be stored in happens to be a descendent +// you want the data to be stored in happens to be a descendent // of of one of these formats: // // DXGI_FORMAT_R10G10B10A2_TYPELESS @@ -48,36 +48,36 @@ // DXGI_FORMAT_B8G8R8X8_TYPELESS // DXGI_FORMAT_R16G16_TYPELESS // -// e.g. DXGI_FORMAT_R10G10B10A2_UNORM is a descendent of +// e.g. DXGI_FORMAT_R10G10B10A2_UNORM is a descendent of // DXGI_FORMAT_R10G10B10A2_TYPELESS, so it supports the // usage pattern described here. -// -// (Formats descending from DXGI_FORMAT_R32_TYPELESS, such as -// DXGI_FORMAT_R32_FLOAT, are trivially supported without +// +// (Formats descending from DXGI_FORMAT_R32_TYPELESS, such as +// DXGI_FORMAT_R32_FLOAT, are trivially supported without // needing any of the format conversion help provided here.) -// +// // Steps: -// +// // (1) Create a texture with the appropriate _TYPELESS format above -// along with the needed bind flags, such as +// along with the needed bind flags, such as // D3D11_BIND_UNORDERED_ACCESS | D3D11_BIND_SHADER_RESOURCE. -// +// // (2) For in-place image editing, create a UAV with the format // DXGI_FORMAT_R32_UINT. D3D normally doesn't allow casting -// between different format "families", but the API makes +// between different format "families", but the API makes // an exception here. -// +// // (3) In the Compute Shader or Pixel Shader, use the appropriate // format pack/unpack routines provided in this file. // For example if the DXGI_FORMAT_R32_UINT UAV really holds -// DXGI_FORMAT_R10G10B10A2_UNORM data, then, after reading a +// DXGI_FORMAT_R10G10B10A2_UNORM data, then, after reading a // uint from the UAV into the shader, unpack by calling: -// +// // XMFLOAT4 D3DX_R10G10B10A2_UNORM_to_FLOAT4(UINT packedInput) -// +// // Then to write to the UAV in the same shader, call the following // to pack shader data into a uint that can be written out: -// +// // UINT D3DX_FLOAT4_to_R10G10B10A2_UNORM(hlsl_precise XMFLOAT4 unpackedInput) // // (4) Other views, such as SRVs, can be created with the desired format; @@ -86,26 +86,26 @@ // shader, the hardware can do automatic type conversion as usual. // // Note, again, that if the shader only needs to write to a UAV, or read -// as an SRV, then none of this is needed - fully typed UAV or SRVs can -// be used. Only if simultaneous reading and writing to a UAV of a texture -// is needed are the format conversion routines provided here potentially +// as an SRV, then none of this is needed - fully typed UAV or SRVs can +// be used. Only if simultaneous reading and writing to a UAV of a texture +// is needed are the format conversion routines provided here potentially // useful. // -// The following is the list of format conversion routines included in this -// file, categorized by the DXGI_FORMAT they unpack/pack. Each of the +// The following is the list of format conversion routines included in this +// file, categorized by the DXGI_FORMAT they unpack/pack. Each of the // formats supported descends from one of the TYPELESS formats listed // above, and supports casting to DXGI_FORMAT_R32_UINT as a UAV. // // DXGI_FORMAT_R10G10B10A2_UNORM: -// +// // XMFLOAT4 D3DX_R10G10B10A2_UNORM_to_FLOAT4(UINT packedInput) // UINT D3DX_FLOAT4_to_R10G10B10A2_UNORM(hlsl_precise XMFLOAT4 unpackedInput) -// +// // DXGI_FORMAT_R10G10B10A2_UINT: // // XMUINT4 D3DX_R10G10B10A2_UINT_to_UINT4(UINT packedInput) // UINT D3DX_UINT4_to_R10G10B10A2_UINT(XMUINT4 unpackedInput) -// +// // DXGI_FORMAT_R8G8B8A8_UNORM: // // XMFLOAT4 D3DX_R8G8B8A8_UNORM_to_FLOAT4(UINT packedInput) @@ -116,13 +116,13 @@ // XMFLOAT4 D3DX_R8G8B8A8_UNORM_SRGB_to_FLOAT4_inexact(UINT packedInput) * // XMFLOAT4 D3DX_R8G8B8A8_UNORM_SRGB_to_FLOAT4(UINT packedInput) // UINT D3DX_FLOAT4_to_R8G8B8A8_UNORM_SRGB(hlsl_precise XMFLOAT4 unpackedInput) -// +// // * The "_inexact" function above uses shader instructions that don't // have high enough precision to give the exact answer, albeit close. // The alternative function uses a lookup table stored in the shader // to give an exact SRGB->float conversion. // -// DXGI_FORMAT_R8G8B8A8_UINT: +// DXGI_FORMAT_R8G8B8A8_UINT: // // XMUINT4 D3DX_R8G8B8A8_UINT_to_UINT4(UINT packedInput) // XMUINT D3DX_UINT4_to_R8G8B8A8_UINT(XMUINT4 unpackedInput) @@ -131,7 +131,7 @@ // // XMFLOAT4 D3DX_R8G8B8A8_SNORM_to_FLOAT4(UINT packedInput) // UINT D3DX_FLOAT4_to_R8G8B8A8_SNORM(hlsl_precise XMFLOAT4 unpackedInput) -// +// // DXGI_FORMAT_R8G8B8A8_SINT: // // XMINT4 D3DX_R8G8B8A8_SINT_to_INT4(UINT packedInput) @@ -143,7 +143,7 @@ // UINT D3DX_FLOAT4_to_B8G8R8A8_UNORM(hlsl_precise XMFLOAT4 unpackedInput) // // DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: -// +// // XMFLOAT4 D3DX_B8G8R8A8_UNORM_SRGB_to_FLOAT4_inexact(UINT packedInput) * // XMFLOAT4 D3DX_B8G8R8A8_UNORM_SRGB_to_FLOAT4(UINT packedInput) // UINT D3DX_FLOAT4_to_R8G8B8A8_UNORM_SRGB(hlsl_precise XMFLOAT4 unpackedInput) @@ -159,7 +159,7 @@ // UINT D3DX_FLOAT3_to_B8G8R8X8_UNORM(hlsl_precise XMFLOAT3 unpackedInput) // // DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: -// +// // XMFLOAT3 D3DX_B8G8R8X8_UNORM_SRGB_to_FLOAT3_inexact(UINT packedInput) * // XMFLOAT3 D3DX_B8G8R8X8_UNORM_SRGB_to_FLOAT3(UINT packedInput) // UINT D3DX_FLOAT3_to_B8G8R8X8_UNORM_SRGB(hlsl_precise XMFLOAT3 unpackedInput) @@ -175,10 +175,10 @@ // UINT D3DX_FLOAT2_to_R16G16_FLOAT(hlsl_precise XMFLOAT2 unpackedInput) // // DXGI_FORMAT_R16G16_UNORM: -// +// // XMFLOAT2 D3DX_R16G16_UNORM_to_FLOAT2(UINT packedInput) // UINT D3DX_FLOAT2_to_R16G16_UNORM(hlsl_precise FLOAT2 unpackedInput) -// +// // DXGI_FORMAT_R16G16_UINT: // // XMUINT2 D3DX_R16G16_UINT_to_UINT2(UINT packedInput) @@ -282,7 +282,7 @@ typedef struct _XMUINT4 // SRGB Helper Functions Called By Conversions Further Below. //============================================================================= // SRGB_to_FLOAT_inexact is imprecise due to precision of pow implementations. -// If exact SRGB->float conversion is needed, a table lookup is provided +// If exact SRGB->float conversion is needed, a table lookup is provided // further below. D3DX11INLINE FLOAT D3DX_SRGB_to_FLOAT_inexact(hlsl_precise FLOAT val) { @@ -293,7 +293,7 @@ D3DX11INLINE FLOAT D3DX_SRGB_to_FLOAT_inexact(hlsl_precise FLOAT val) return val; } -static const UINT D3DX_SRGBTable[] = +static const UINT D3DX_SRGBTable[] = { 0x00000000,0x399f22b4,0x3a1f22b4,0x3a6eb40e,0x3a9f22b4,0x3ac6eb61,0x3aeeb40e,0x3b0b3e5d, 0x3b1f22b4,0x3b33070b,0x3b46eb61,0x3b5b518d,0x3b70f18d,0x3b83e1c6,0x3b8fe616,0x3b9c87fd, @@ -339,7 +339,7 @@ D3DX11INLINE FLOAT D3DX_SRGB_to_FLOAT(UINT val) } D3DX11INLINE FLOAT D3DX_FLOAT_to_SRGB(hlsl_precise FLOAT val) -{ +{ if( val < 0.0031308f ) val *= 12.92f; else @@ -353,7 +353,7 @@ D3DX11INLINE FLOAT D3DX_SaturateSigned_FLOAT(FLOAT _V) { return 0; } - + return min(max(_V, -1), 1); } diff --git a/gfx/include/dxsdk/dcommon.h b/gfx/include/dxsdk/dcommon.h index 70774522d7..56bebfe5d3 100644 --- a/gfx/include/dxsdk/dcommon.h +++ b/gfx/include/dxsdk/dcommon.h @@ -123,23 +123,23 @@ DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS); /// typedef enum D2D1_ALPHA_MODE { - + /// /// Alpha mode should be determined implicitly. Some target surfaces do not supply /// or imply this information in which case alpha must be specified. /// D2D1_ALPHA_MODE_UNKNOWN = 0, - + /// /// Treat the alpha as premultipled. /// D2D1_ALPHA_MODE_PREMULTIPLIED = 1, - + /// /// Opacity is in the 'A' component only. /// D2D1_ALPHA_MODE_STRAIGHT = 2, - + /// /// Ignore any alpha channel information. /// @@ -342,7 +342,7 @@ typedef struct D2D_MATRIX_4X4_F { union { - struct + struct { FLOAT _11, _12, _13, _14; FLOAT _21, _22, _23, _24; @@ -362,7 +362,7 @@ typedef struct D2D_MATRIX_5X4_F { union { - struct + struct { FLOAT _11, _12, _13, _14; FLOAT _21, _22, _23, _24; diff --git a/gfx/include/dxsdk/dsetup.h b/gfx/include/dxsdk/dsetup.h index 8cd464e811..d4c36673b7 100644 --- a/gfx/include/dxsdk/dsetup.h +++ b/gfx/include/dxsdk/dsetup.h @@ -81,7 +81,6 @@ typedef struct _DSETUP_CB_PROGRESS DWORD dwOverallProgress; } DSETUP_CB_PROGRESS; - enum _DSETUP_CB_PROGRESS_PHASE { DSETUP_INITIALIZING, diff --git a/gfx/include/dxsdk/dwrite.h b/gfx/include/dxsdk/dwrite.h index ea887fdbf3..35eea6babd 100644 --- a/gfx/include/dxsdk/dwrite.h +++ b/gfx/include/dxsdk/dwrite.h @@ -416,7 +416,7 @@ enum DWRITE_INFORMATIONAL_STRING_ID DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_FAMILY_NAMES, /// - /// Typographic subfamily name preferred by the designer. This name is typically only present if it differs from the GDI-compatible subfamily name. + /// Typographic subfamily name preferred by the designer. This name is typically only present if it differs from the GDI-compatible subfamily name. /// DWRITE_INFORMATIONAL_STRING_TYPOGRAPHIC_SUBFAMILY_NAMES, @@ -494,8 +494,8 @@ struct DWRITE_FONT_METRICS /// /// Line gap in font design units. - /// Recommended additional white space to add between lines to improve legibility. The recommended line spacing - /// (baseline-to-baseline distance) is thus the sum of ascent, descent, and lineGap. The line gap is usually + /// Recommended additional white space to add between lines to improve legibility. The recommended line spacing + /// (baseline-to-baseline distance) is thus the sum of ascent, descent, and lineGap. The line gap is usually /// positive or zero but can be negative, in which case the recommended line spacing is less than the height /// of the character alignment box. /// @@ -881,13 +881,13 @@ enum DWRITE_PIXEL_GEOMETRY DWRITE_PIXEL_GEOMETRY_FLAT, /// - /// Each pixel comprises three vertical stripes, with red on the left, green in the center, and + /// Each pixel comprises three vertical stripes, with red on the left, green in the center, and /// blue on the right. This is the most common pixel geometry for LCD monitors. /// DWRITE_PIXEL_GEOMETRY_RGB, /// - /// Each pixel comprises three vertical stripes, with blue on the left, green in the center, and + /// Each pixel comprises three vertical stripes, with blue on the left, green in the center, and /// red on the right. /// DWRITE_PIXEL_GEOMETRY_BGR @@ -906,14 +906,14 @@ enum DWRITE_RENDERING_MODE DWRITE_RENDERING_MODE_DEFAULT, /// - /// Specifies that no antialiasing is performed. Each pixel is either set to the foreground + /// Specifies that no antialiasing is performed. Each pixel is either set to the foreground /// color of the text or retains the color of the background. /// DWRITE_RENDERING_MODE_ALIASED, /// /// Specifies that antialiasing is performed in the horizontal direction and the appearance - /// of glyphs is layout-compatible with GDI using CLEARTYPE_QUALITY. Use DWRITE_MEASURING_MODE_GDI_CLASSIC + /// of glyphs is layout-compatible with GDI using CLEARTYPE_QUALITY. Use DWRITE_MEASURING_MODE_GDI_CLASSIC /// to get glyph advances. The antialiasing may be either ClearType or grayscale depending on /// the text antialiasing mode. /// @@ -945,13 +945,13 @@ enum DWRITE_RENDERING_MODE DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /// - /// Specifies that rendering should bypass the rasterizer and use the outlines directly. + /// Specifies that rendering should bypass the rasterizer and use the outlines directly. /// This is typically used at very large sizes. /// DWRITE_RENDERING_MODE_OUTLINE, // The following names are obsolete, but are kept as aliases to avoid breaking existing code. - // Each of these rendering modes may result in either ClearType or grayscale antialiasing + // Each of these rendering modes may result in either ClearType or grayscale antialiasing // depending on the DWRITE_TEXT_ANTIALIASING_MODE. DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC = DWRITE_RENDERING_MODE_GDI_CLASSIC, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL = DWRITE_RENDERING_MODE_GDI_NATURAL, @@ -1014,7 +1014,7 @@ interface DWRITE_DECLARE_INTERFACE("2f0da53a-2add-47cd-82ee-d9ec34688e75") IDWri STDMETHOD_(FLOAT, GetEnhancedContrast)() PURE; /// - /// Gets the ClearType level. Valid values range from 0.0f (no ClearType) + /// Gets the ClearType level. Valid values range from 0.0f (no ClearType) /// to 1.0f (full ClearType). /// STDMETHOD_(FLOAT, GetClearTypeLevel)() PURE; @@ -1133,7 +1133,7 @@ interface DWRITE_DECLARE_INTERFACE("5f49804d-7024-4d43-bfa9-d25984f53849") IDWri UINT32 codePointCount, _Out_writes_(codePointCount) UINT16* glyphIndices ) PURE; - + /// /// Finds the specified OpenType font table if it exists and returns a pointer to it. /// The function accesses the underlying font data via the IDWriteFontFileStream interface @@ -1216,7 +1216,7 @@ interface DWRITE_DECLARE_INTERFACE("5f49804d-7024-4d43-bfa9-d25984f53849") IDWri /// Determines the recommended rendering mode for the font given the specified size and rendering parameters. /// /// Logical size of the font in DIP units. A DIP ("device-independent pixel") equals 1/96 inch. - /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this + /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this /// value is 1.0f. If the DPI is 120, this value is 120.0f/96. /// Specifies measuring mode that will be used for glyphs in the font. /// Renderer implementations may choose different rendering modes for given measuring modes, but @@ -1225,7 +1225,7 @@ interface DWRITE_DECLARE_INTERFACE("5f49804d-7024-4d43-bfa9-d25984f53849") IDWri /// DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC for DWRITE_MEASURING_MODE_GDI_CLASSIC /// DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL for DWRITE_MEASURING_MODE_GDI_NATURAL /// - /// Rendering parameters object. This parameter is necessary in case the rendering parameters + /// Rendering parameters object. This parameter is necessary in case the rendering parameters /// object overrides the rendering mode. /// Receives the recommended rendering mode to use. /// @@ -1244,7 +1244,7 @@ interface DWRITE_DECLARE_INTERFACE("5f49804d-7024-4d43-bfa9-d25984f53849") IDWri /// These metrics are applicable to all the glyphs within a fontface and are used by applications for layout calculations. /// /// Logical size of the font in DIP units. A DIP ("device-independent pixel") equals 1/96 inch. - /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this + /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this /// value is 1.0f. If the DPI is 120, this value is 120.0f/96. /// Optional transform applied to the glyphs and their positions. This transform is applied after the /// scaling specified by the font size and pixelsPerDip. @@ -1262,7 +1262,7 @@ interface DWRITE_DECLARE_INTERFACE("5f49804d-7024-4d43-bfa9-d25984f53849") IDWri /// Glyphs metrics are used for positioning of individual glyphs. /// /// Logical size of the font in DIP units. A DIP ("device-independent pixel") equals 1/96 inch. - /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this + /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this /// value is 1.0f. If the DPI is 120, this value is 120.0f/96. /// Optional transform applied to the glyphs and their positions. This transform is applied after the /// scaling specified by the font size and pixelsPerDip. @@ -1376,7 +1376,7 @@ interface DWRITE_DECLARE_INTERFACE("08256209-099a-4b34-b86d-c22b110e7771") IDWri /// Receives the zero-based index of the locale name/string pair. /// Receives TRUE if the locale name exists or FALSE if not. /// - /// Standard HRESULT error code. If the specified locale name does not exist, the return value is S_OK, + /// Standard HRESULT error code. If the specified locale name does not exist, the return value is S_OK, /// but *index is UINT_MAX and *exists is FALSE. /// STDMETHOD(FindLocaleName)( @@ -1486,7 +1486,7 @@ interface DWRITE_DECLARE_INTERFACE("a84cee02-3eea-4eee-a827-87c1a02a0fcc") IDWri ) PURE; /// - /// Gets the font object that corresponds to the same physical font as the specified font face object. The specified physical font must belong + /// Gets the font object that corresponds to the same physical font as the specified font face object. The specified physical font must belong /// to the font collection. /// /// Font face object that specifies the physical font. @@ -1530,7 +1530,7 @@ interface DWRITE_DECLARE_INTERFACE("1a0d8438-1d97-4ec1-aef9-a2fb86ed6acb") IDWri /// Standard HRESULT error code. /// STDMETHOD(GetFont)( - UINT32 index, + UINT32 index, _COM_Outptr_ IDWriteFont** font ) PURE; }; @@ -1641,7 +1641,7 @@ interface DWRITE_DECLARE_INTERFACE("acd16696-8c14-4f5d-877e-fe3fc1d32737") IDWri /// Receives a pointer to the newly created localized strings object. /// Receives the value TRUE if the font contains the specified string ID or FALSE if not. /// - /// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but + /// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but /// informationalStrings receives a NULL pointer and exists receives the value FALSE. /// STDMETHOD(GetInformationalStrings)( @@ -1741,7 +1741,7 @@ enum DWRITE_FLOW_DIRECTION }; /// -/// Alignment of paragraph text along the reading direction axis relative to +/// Alignment of paragraph text along the reading direction axis relative to /// the leading and trailing edge of the layout box. /// enum DWRITE_TEXT_ALIGNMENT @@ -1801,7 +1801,7 @@ enum DWRITE_WORD_WRAPPING /// /// Words are kept within the same line even when it overflows the layout box. - /// This option is often used with scrolling to reveal overflow text. + /// This option is often used with scrolling to reveal overflow text. /// DWRITE_WORD_WRAPPING_NO_WRAP = 1, @@ -1859,11 +1859,11 @@ enum DWRITE_TRIMMING_GRANULARITY /// Trimming occurs at character cluster boundary. /// DWRITE_TRIMMING_GRANULARITY_CHARACTER, - + /// /// Trimming occurs at word boundary. /// - DWRITE_TRIMMING_GRANULARITY_WORD + DWRITE_TRIMMING_GRANULARITY_WORD }; /// @@ -1988,7 +1988,7 @@ struct DWRITE_FONT_FEATURE /// /// /// The parameter should be non-zero to enable the feature. Once enabled, a feature can't be disabled again within - /// the same range. Features requiring a selector use this value to indicate the selector index. + /// the same range. Features requiring a selector use this value to indicate the selector index. /// UINT32 parameter; }; @@ -2435,13 +2435,13 @@ enum DWRITE_NUMBER_SUBSTITUTION_METHOD DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, /// - /// Specifies that code points 0x30-0x39 are always rendered as nominal numeral + /// Specifies that code points 0x30-0x39 are always rendered as nominal numeral /// shapes (ones of the European number), i.e., no substitution is performed. /// DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, /// - /// Specifies that number are rendered using the national number shape + /// Specifies that number are rendered using the national number shape /// as specified by the LOCALE_SNATIVEDIGITS value of the specified text culture. /// DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, @@ -2631,7 +2631,7 @@ interface DWRITE_DECLARE_INTERFACE("688e1a58-5094-47c8-adc8-fbcea60ae92b") IDWri /// The interface implemented by the text analyzer's client to receive the /// output of a given text analysis. The Text analyzer disregards any current /// state of the analysis sink, therefore a Set method call on a range -/// overwrites the previously set analysis result of the same range. +/// overwrites the previously set analysis result of the same range. /// interface DWRITE_DECLARE_INTERFACE("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") IDWriteTextAnalysisSink : public IUnknown { @@ -2718,7 +2718,7 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri { /// /// Analyzes a text range for script boundaries, reading text attributes - /// from the source and reporting the Unicode script ID to the sink + /// from the source and reporting the Unicode script ID to the sink /// callback SetScript. /// /// Source object to analyze. @@ -2812,7 +2812,7 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri /// /// Special cases include the first, last, and surrogate characters. Any /// text span is treated as if adjacent to inline objects on either side. - /// So the rules with contingent-break opportunities are used, where the + /// So the rules with contingent-break opportunities are used, where the /// edge between text and inline objects is always treated as a potential /// break opportunity, dependent on any overriding rules of the adjacent /// objects to prohibit or force the break (see Unicode TR #14). @@ -2844,14 +2844,14 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri /// depending on the results obtained from AnalyzeNumberSubstitution. Passing /// null indicates that no substitution is needed and that the digits should /// receive nominal glyphs. - /// An array of pointers to the sets of typographic + /// An array of pointers to the sets of typographic /// features to use in each feature range. - /// The length of each feature range, in characters. + /// The length of each feature range, in characters. /// The sum of all lengths should be equal to textLength. /// The number of feature ranges. /// The maximum number of glyphs that can be /// returned. - /// The mapping from character ranges to glyph + /// The mapping from character ranges to glyph /// ranges. /// Per-character output properties. /// Output glyph indices. @@ -2892,13 +2892,13 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri ) PURE; /// - /// Place glyphs output from the GetGlyphs method according to the font + /// Place glyphs output from the GetGlyphs method according to the font /// and the writing system's rendering rules. /// /// The original string the glyphs came from. - /// The mapping from character ranges to glyph + /// The mapping from character ranges to glyph /// ranges. Returned by GetGlyphs. - /// Per-character properties. Returned by + /// Per-character properties. Returned by /// GetGlyphs. /// The length of textString. /// Glyph indices. See GetGlyphs @@ -2913,9 +2913,9 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri /// The locale to use when selecting glyphs. /// e.g. the same character may map to different glyphs for ja-jp vs zh-chs. /// If this is NULL then the default mapping based on the script is used. - /// An array of pointers to the sets of typographic + /// An array of pointers to the sets of typographic /// features to use in each feature range. - /// The length of each feature range, in characters. + /// The length of each feature range, in characters. /// The sum of all lengths should be equal to textLength. /// The number of feature ranges. /// The advance width of each glyph. @@ -2945,13 +2945,13 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri ) PURE; /// - /// Place glyphs output from the GetGlyphs method according to the font + /// Place glyphs output from the GetGlyphs method according to the font /// and the writing system's rendering rules. /// /// The original string the glyphs came from. - /// The mapping from character ranges to glyph + /// The mapping from character ranges to glyph /// ranges. Returned by GetGlyphs. - /// Per-character properties. Returned by + /// Per-character properties. Returned by /// GetGlyphs. /// The length of textString. /// Glyph indices. See GetGlyphs @@ -2959,7 +2959,7 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri /// The number of glyphs. /// The font face the glyphs came from. /// Logical font size in DIP's. - /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this + /// Number of physical pixels per DIP. For example, if the DPI of the rendering surface is 96 this /// value is 1.0f. If the DPI is 120, this value is 120.0f/96. /// Optional transform applied to the glyphs and their positions. This transform is applied after the /// scaling specified by the font size and pixelsPerDip. @@ -2975,9 +2975,9 @@ interface DWRITE_DECLARE_INTERFACE("b7e6163e-7f46-43b4-84b3-e4e6249c365d") IDWri /// The locale to use when selecting glyphs. /// e.g. the same character may map to different glyphs for ja-jp vs zh-chs. /// If this is NULL then the default mapping based on the script is used. - /// An array of pointers to the sets of typographic + /// An array of pointers to the sets of typographic /// features to use in each feature range. - /// The length of each feature range, in characters. + /// The length of each feature range, in characters. /// The sum of all lengths should be equal to textLength. /// The number of feature ranges. /// The advance width of each glyph. @@ -3033,7 +3033,7 @@ struct DWRITE_GLYPH_RUN /// /// The indices to render. - /// + /// _Field_size_(glyphCount) UINT16 const* glyphIndices; /// @@ -3088,7 +3088,7 @@ struct DWRITE_GLYPH_RUN_DESCRIPTION /// /// An array of indices to the glyph indices array, of the first glyphs of - /// all the glyph clusters of the glyphs to render. + /// all the glyph clusters of the glyphs to render. /// _Field_size_opt_(stringLength) UINT16 const* clusterMap; @@ -3130,15 +3130,15 @@ struct DWRITE_UNDERLINE FLOAT runHeight; /// - /// Reading direction of the text associated with the underline. This - /// value is used to interpret whether the width value runs horizontally + /// Reading direction of the text associated with the underline. This + /// value is used to interpret whether the width value runs horizontally /// or vertically. /// DWRITE_READING_DIRECTION readingDirection; /// /// Flow direction of the text associated with the underline. This value - /// is used to interpret whether the thickness value advances top to + /// is used to interpret whether the thickness value advances top to /// bottom, left to right, or right to left. /// DWRITE_FLOW_DIRECTION flowDirection; @@ -3187,13 +3187,13 @@ struct DWRITE_STRIKETHROUGH /// /// Reading direction of the text associated with the strikethrough. This - /// value is used to interpret whether the width value runs horizontally + /// value is used to interpret whether the width value runs horizontally /// or vertically. /// DWRITE_READING_DIRECTION readingDirection; /// - /// Flow direction of the text associated with the strikethrough. This + /// Flow direction of the text associated with the strikethrough. This /// value is used to interpret whether the thickness value advances top to /// bottom, left to right, or right to left. /// @@ -3612,7 +3612,7 @@ interface DWRITE_DECLARE_INTERFACE("ef8a8135-5cc6-45fe-8825-c5a0724eb819") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to /// render a run of glyphs. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -3624,7 +3624,7 @@ interface DWRITE_DECLARE_INTERFACE("ef8a8135-5cc6-45fe-8825-c5a0724eb819") IDWri /// DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL for DWRITE_MEASURING_MODE_GDI_NATURAL /// /// The glyph run to draw. - /// Properties of the characters + /// Properties of the characters /// associated with this run. /// The drawing effect set in /// IDWriteTextLayout::SetDrawingEffect. @@ -3645,7 +3645,7 @@ interface DWRITE_DECLARE_INTERFACE("ef8a8135-5cc6-45fe-8825-c5a0724eb819") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to draw /// an underline. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -3680,7 +3680,7 @@ interface DWRITE_DECLARE_INTERFACE("ef8a8135-5cc6-45fe-8825-c5a0724eb819") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to draw /// a strikethrough. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -4187,7 +4187,7 @@ interface DWRITE_DECLARE_INTERFACE("53737037-6d14-410b-9bfe-0b182bb70961") IDWri /// Standard HRESULT error code. /// /// - /// If maxLineCount is not large enough E_NOT_SUFFICIENT_BUFFER, + /// If maxLineCount is not large enough E_NOT_SUFFICIENT_BUFFER, /// which is equivalent to HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), /// is returned and *actualLineCount is set to the number of lines /// needed. @@ -4242,8 +4242,8 @@ interface DWRITE_DECLARE_INTERFACE("53737037-6d14-410b-9bfe-0b182bb70961") IDWri /// Standard HRESULT error code. /// /// - /// If maxClusterCount is not large enough E_NOT_SUFFICIENT_BUFFER, - /// which is equivalent to HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), + /// If maxClusterCount is not large enough E_NOT_SUFFICIENT_BUFFER, + /// which is equivalent to HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), /// is returned and *actualClusterCount is set to the number of clusters /// needed. /// @@ -4333,7 +4333,7 @@ interface DWRITE_DECLARE_INTERFACE("53737037-6d14-410b-9bfe-0b182bb70961") IDWri /// corresponding to a range of text positions. The main usage for this /// is to draw highlighted selection of the text string. /// - /// The function returns E_NOT_SUFFICIENT_BUFFER, which is equivalent to + /// The function returns E_NOT_SUFFICIENT_BUFFER, which is equivalent to /// HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), when the buffer size of /// hitTestMetrics is too small to hold all the regions calculated by the /// function. In such situation, the function sets the output value @@ -4408,7 +4408,7 @@ interface DWRITE_DECLARE_INTERFACE("5e5a32a3-8dff-4773-9ff6-0696eab77267") IDWri /// Structure containing the properties of the glyph run. /// Object that controls rendering behavior. /// Specifies the foreground color of the text. - /// Optional rectangle that receives the bounding box (in pixels not DIPs) of all the pixels affected by + /// Optional rectangle that receives the bounding box (in pixels not DIPs) of all the pixels affected by /// drawing the glyph run. The black box rectangle may extend beyond the dimensions of the bitmap. /// /// Standard HRESULT error code. @@ -4432,7 +4432,7 @@ interface DWRITE_DECLARE_INTERFACE("5e5a32a3-8dff-4773-9ff6-0696eab77267") IDWri /// /// An application can use the device context to draw using GDI functions. An application can obtain the bitmap handle /// (HBITMAP) by calling GetCurrentObject. An application that wants information about the underlying bitmap, including - /// a pointer to the pixel data, can call GetObject to fill in a DIBSECTION structure. The bitmap is always a 32-bit + /// a pointer to the pixel data, can call GetObject to fill in a DIBSECTION structure. The bitmap is always a 32-bit /// top-down DIB. /// STDMETHOD_(HDC, GetMemoryDC)() PURE; @@ -4459,7 +4459,7 @@ interface DWRITE_DECLARE_INTERFACE("5e5a32a3-8dff-4773-9ff6-0696eab77267") IDWri ) PURE; /// - /// Gets the transform that maps abstract coordinate to DIPs. By default this is the identity + /// Gets the transform that maps abstract coordinate to DIPs. By default this is the identity /// transform. Note that this is unrelated to the world transform of the underlying device /// context. /// @@ -4561,7 +4561,7 @@ interface DWRITE_DECLARE_INTERFACE("1edd9491-9853-4299-898f-6432983b6f3a") IDWri /// Creates a font face object that corresponds to the currently selected HFONT. /// /// Handle to a device context into which a font has been selected. It is assumed that the client - /// has already performed font mapping and that the font selected into the DC is the actual font that would be used + /// has already performed font mapping and that the font selected into the DC is the actual font that would be used /// for rendering glyphs. /// Contains the newly created font face object, or NULL in case of failure. /// @@ -4600,7 +4600,7 @@ enum DWRITE_TEXTURE_TYPE DWRITE_TEXTURE_ALIASED_1x1, /// - /// Specifies an alpha texture for ClearType text rendering, with three bytes per pixel in the horizontal dimension and + /// Specifies an alpha texture for ClearType text rendering, with three bytes per pixel in the horizontal dimension and /// one byte per pixel in the vertical dimension. /// DWRITE_TEXTURE_CLEARTYPE_3x1 @@ -4680,7 +4680,7 @@ interface DWRITE_DECLARE_INTERFACE("b859ee5a-d838-4b5b-a2e8-1adc7d93db48") IDWri /// Receives a pointer to the system font collection object, or NULL in case of failure. /// If this parameter is nonzero, the function performs an immediate check for changes to the set of /// installed fonts. If this parameter is FALSE, the function will still detect changes if the font cache service is running, but - /// there may be some latency. For example, an application might specify TRUE if it has itself just installed a font and wants to + /// there may be some latency. For example, an application might specify TRUE if it has itself just installed a font and wants to /// be sure the font collection contains that font. /// /// Standard HRESULT error code. diff --git a/gfx/include/dxsdk/dwrite_1.h b/gfx/include/dxsdk/dwrite_1.h index c7bc62e6d0..a94c8150ea 100644 --- a/gfx/include/dxsdk/dwrite_1.h +++ b/gfx/include/dxsdk/dwrite_1.h @@ -504,7 +504,7 @@ enum DWRITE_PANOSE_SYMBOL_ASPECT_RATIO }; /// -/// Specifies the policy used by GetRecommendedRenderingMode to determine whether to +/// Specifies the policy used by GetRecommendedRenderingMode to determine whether to /// render glyphs in outline mode. Glyphs are rendered in outline mode by default at /// large sizes for performance reasons, but how large (i.e., the outline threshold) /// depends on the quality of outline rendering. If the graphics system renders anti- @@ -706,7 +706,7 @@ struct DWRITE_FONT_METRICS1 : public DWRITE_FONT_METRICS INT16 superscriptSizeY; /// - /// Indicates that the ascent, descent, and lineGap are based on newer + /// Indicates that the ascent, descent, and lineGap are based on newer /// 'typographic' values in the font, rather than legacy values. /// BOOL hasTypographicMetrics; @@ -909,7 +909,7 @@ struct DWRITE_SCRIPT_PROPERTIES /// between characters. Note that cursively linked scripts like Arabic /// are also connected (but not all connected scripts are /// cursive). - /// + /// /// Examples: Devanagari, Arabic, Syriac, Bengali, Gurmukhi, Ogham /// Excludes: Latin, Chinese, Thaana /// @@ -921,7 +921,7 @@ struct DWRITE_SCRIPT_PROPERTIES /// spacing. Note that although other scripts like Latin and Japanese may /// actually support handwritten cursive forms, they are not considered /// cursive scripts. - /// + /// /// Examples: Arabic, Syriac, Mongolian /// Excludes: Thaana, Devanagari, Latin, Chinese /// @@ -1271,11 +1271,11 @@ interface DWRITE_DECLARE_INTERFACE("a71efdb4-9fdb-4838-ad90-cfc3be8c3daf") IDWri /// Specifies the quality of the graphics system's outline rendering, /// affects the size threshold above which outline rendering is used. /// Specifies the method used to measure during text layout. For proper - /// glyph spacing, the function returns a rendering mode that is compatible with the specified + /// glyph spacing, the function returns a rendering mode that is compatible with the specified /// measuring mode. /// Receives the recommended rendering mode. /// - /// This method should be used to determine the actual rendering mode in cases where the rendering + /// This method should be used to determine the actual rendering mode in cases where the rendering /// mode of the rendering params object is DWRITE_RENDERING_MODE_DEFAULT. /// /// @@ -1872,7 +1872,7 @@ enum DWRITE_TEXT_ANTIALIAS_MODE /// /// Grayscale antialiasing computes one coverage value for each pixel. Because the alpha - /// value of each pixel is well-defined, text can be rendered onto a transparent bitmap, + /// value of each pixel is well-defined, text can be rendered onto a transparent bitmap, /// which can then be composited with other content. Note that grayscale rendering with /// IDWriteBitmapRenderTarget1 uses premultiplied alpha. /// @@ -1899,7 +1899,7 @@ interface DWRITE_DECLARE_INTERFACE("791e8298-3ef3-4230-9880-c9bdecc42064") IDWri /// Returns S_OK if successful, or E_INVALIDARG if the argument is not valid. /// /// - /// The antialiasing mode of a newly-created bitmap render target defaults to + /// The antialiasing mode of a newly-created bitmap render target defaults to /// DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE. An application can change the antialiasing /// mode by calling SetTextAntialiasMode. For example, an application might specify /// grayscale antialiasing when rendering text onto a transparent bitmap. diff --git a/gfx/include/dxsdk/dwrite_2.h b/gfx/include/dxsdk/dwrite_2.h index ffa8dd2d69..2858075f0c 100644 --- a/gfx/include/dxsdk/dwrite_2.h +++ b/gfx/include/dxsdk/dwrite_2.h @@ -81,7 +81,7 @@ interface DWRITE_DECLARE_INTERFACE("D3E0E934-22A0-427E-AAE4-7D9574B59DB1") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to /// render a run of glyphs. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -95,7 +95,7 @@ interface DWRITE_DECLARE_INTERFACE("D3E0E934-22A0-427E-AAE4-7D9574B59DB1") IDWri /// DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL for DWRITE_MEASURING_MODE_GDI_NATURAL /// /// The glyph run to draw. - /// Properties of the characters + /// Properties of the characters /// associated with this run. /// The drawing effect set in /// IDWriteTextLayout::SetDrawingEffect. @@ -124,7 +124,7 @@ interface DWRITE_DECLARE_INTERFACE("D3E0E934-22A0-427E-AAE4-7D9574B59DB1") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to draw /// an underline. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -162,7 +162,7 @@ interface DWRITE_DECLARE_INTERFACE("D3E0E934-22A0-427E-AAE4-7D9574B59DB1") IDWri /// IDWriteTextLayout::Draw calls this function to instruct the client to draw /// a strikethrough. /// - /// The context passed to + /// The context passed to /// IDWriteTextLayout::Draw. /// X-coordinate of the baseline. /// Y-coordinate of the baseline. @@ -679,7 +679,7 @@ interface DWRITE_DECLARE_INTERFACE("d8b768ff-64bc-4e66-982b-ec8e87f693f7") IDWri /// /// Returns the number of entries in each color palette. All color palettes - /// in a font have the same number of palette entries. The return value is + /// in a font have the same number of palette entries. The return value is /// zero if the font has no color information. /// STDMETHOD_(UINT32, GetPaletteEntryCount)() PURE; @@ -688,7 +688,7 @@ interface DWRITE_DECLARE_INTERFACE("d8b768ff-64bc-4e66-982b-ec8e87f693f7") IDWri /// Reads color values from the font's color palette. /// /// Zero-based index of the color palette. If the - /// font does not have a palette with the specified index, the method returns + /// font does not have a palette with the specified index, the method returns /// DWRITE_E_NOCOLOR. /// Zero-based index of the first palette entry /// to read. @@ -719,14 +719,14 @@ interface DWRITE_DECLARE_INTERFACE("d8b768ff-64bc-4e66-982b-ec8e87f693f7") IDWri /// Specifies the quality of the graphics system's outline rendering, /// affects the size threshold above which outline rendering is used. /// Specifies the method used to measure during text layout. For proper - /// glyph spacing, the function returns a rendering mode that is compatible with the specified + /// glyph spacing, the function returns a rendering mode that is compatible with the specified /// measuring mode. - /// Rendering parameters object. This parameter is necessary in case the rendering parameters + /// Rendering parameters object. This parameter is necessary in case the rendering parameters /// object overrides the rendering mode. /// Receives the recommended rendering mode. /// Receives the recommended grid-fit mode. /// - /// This method should be used to determine the actual rendering mode in cases where the rendering + /// This method should be used to determine the actual rendering mode in cases where the rendering /// mode of the rendering params object is DWRITE_RENDERING_MODE_DEFAULT, and the actual grid-fit /// mode when the rendering params object is DWRITE_GRID_FIT_MODE_DEFAULT. /// @@ -785,7 +785,7 @@ struct DWRITE_COLOR_GLYPH_RUN /// /// Zero-based index of this layer's color entry in the current color - /// palette, or 0xFFFF if this layer is to be rendered using + /// palette, or 0xFFFF if this layer is to be rendered using /// the current foreground brush. /// UINT16 paletteIndex; @@ -888,7 +888,7 @@ interface DWRITE_DECLARE_INTERFACE("0439fc60-ca44-4994-8dee-3a9af7b732ec") IDWri /// /// Returns DWRITE_E_NOCOLOR if the font has no color information, the base /// glyph run does not contain any color glyphs, or the specified color palette - /// index is out of range. In this case, the client should render the base glyph + /// index is out of range. In this case, the client should render the base glyph /// run. Otherwise, returns a standard HRESULT error code. /// STDMETHOD(TranslateColorGlyphRun)( diff --git a/gfx/include/dxsdk/dwrite_3.h b/gfx/include/dxsdk/dwrite_3.h index a1bfa6761e..f91b085f99 100644 --- a/gfx/include/dxsdk/dwrite_3.h +++ b/gfx/include/dxsdk/dwrite_3.h @@ -113,34 +113,34 @@ enum DWRITE_FONT_PROPERTY_ID /// /// As another example, a font designed for Chinese may be capable of displaying /// Japanese text, but would likely look incorrect to Japanese users. - /// + /// /// The valid values for this property are "ScriptLangTag" values. These are adapted /// from the IETF BCP 47 specification, "Tags for Identifying Languages" (see /// http://tools.ietf.org/html/bcp47). In a BCP 47 language tag, a language subtag /// element is mandatory and other subtags are optional. In a ScriptLangTag, a /// script subtag is mandatory and other subtags are option. The following /// augmented BNF syntax, adapted from BCP 47, is used: - /// + /// /// ScriptLangTag = [language "-"] /// script /// ["-" region] /// *("-" variant) /// *("-" extension) /// ["-" privateuse] - /// + /// /// The expansion of the elements and the intended semantics associated with each /// are as defined in BCP 47. Script subtags are taken from ISO 15924. At present, /// no extensions are defined, and any extension should be ignored. Private use /// subtags are defined by private agreement between the source and recipient and /// may be ignored. - /// + /// /// Subtags must be valid for use in BCP 47 and contained in the Language Subtag /// Registry maintained by IANA. (See /// http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry /// and section 3 of BCP 47 for details. - /// + /// /// Any ScriptLangTag value not conforming to these specifications is ignored. - /// + /// /// Examples: /// "Latn" denotes Latin script (and any language or writing system using Latin) /// "Cyrl" denotes Cyrillic script @@ -234,7 +234,7 @@ struct DWRITE_FONT_PROPERTY _Field_z_ WCHAR const* propertyValue; /// - /// Specifies the language / locale to use, such as "en-US". + /// Specifies the language / locale to use, such as "en-US". /// /// /// When passing property information to AddFontFaceReference, localeName indicates @@ -283,14 +283,14 @@ enum DWRITE_RENDERING_MODE1 DWRITE_RENDERING_MODE1_DEFAULT = DWRITE_RENDERING_MODE_DEFAULT, /// - /// Specifies that no antialiasing is performed. Each pixel is either set to the foreground + /// Specifies that no antialiasing is performed. Each pixel is either set to the foreground /// color of the text or retains the color of the background. /// DWRITE_RENDERING_MODE1_ALIASED = DWRITE_RENDERING_MODE_ALIASED, /// /// Specifies that antialiasing is performed in the horizontal direction and the appearance - /// of glyphs is layout-compatible with GDI using CLEARTYPE_QUALITY. Use DWRITE_MEASURING_MODE_GDI_CLASSIC + /// of glyphs is layout-compatible with GDI using CLEARTYPE_QUALITY. Use DWRITE_MEASURING_MODE_GDI_CLASSIC /// to get glyph advances. The antialiasing may be either ClearType or grayscale depending on /// the text antialiasing mode. /// @@ -322,7 +322,7 @@ enum DWRITE_RENDERING_MODE1 DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC = DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /// - /// Specifies that rendering should bypass the rasterizer and use the outlines directly. + /// Specifies that rendering should bypass the rasterizer and use the outlines directly. /// This is typically used at very large sizes. /// DWRITE_RENDERING_MODE1_OUTLINE = DWRITE_RENDERING_MODE_OUTLINE, @@ -496,7 +496,7 @@ interface DWRITE_DECLARE_INTERFACE("9A1B41C3-D3BB-466A-87FC-FE67556A3B65") IDWri /// Include cloud fonts or only locally installed ones. /// Receives a pointer to the newly created font collection object, or nullptr in /// case of failure. - /// If this parameter is nonzero, the function performs an immediate check for changes + /// If this parameter is nonzero, the function performs an immediate check for changes /// to the set of system fonts. If this parameter is FALSE, the function will still detect changes if the font /// cache service is running, but there may be some latency. For example, an application might specify TRUE if /// it has itself just installed a font and wants to be sure the font collection contains that font. @@ -840,7 +840,7 @@ interface DWRITE_DECLARE_INTERFACE("DA20D8EF-812A-4C43-9802-62EC4ABD7ADF") IDWri /// Standard HRESULT error code. /// STDMETHOD(GetFont)( - UINT32 listIndex, + UINT32 listIndex, _COM_Outptr_ IDWriteFont3** font ) PURE; @@ -891,7 +891,7 @@ interface DWRITE_DECLARE_INTERFACE("DA20D8EF-812A-4C43-9802-62EC4ABD7ADE") IDWri /// Standard HRESULT error code. The function returns DWRITE_E_REMOTEFONT if it could not construct a remote font. /// STDMETHOD(GetFont)( - UINT32 listIndex, + UINT32 listIndex, _COM_Outptr_ IDWriteFont3** font ) PURE; @@ -977,13 +977,13 @@ interface DWRITE_DECLARE_INTERFACE("5E7FA7CA-DDE3-424C-89F0-9FCD6FED58CD") IDWri /// /// Get the local size of the font face in bytes. /// - /// + /// /// The value returned by GetLocalFileSize will always be less than or - /// equal to the value returned by GetFullSize. If the locality is remote, - /// the GetLocalFileSize value is zero. If the locality is local, this - /// value will equal the value returned by GetFileSize. If the locality is - /// partial, this value will equal the size of the portions of the font - /// data that have been downloaded, which will be greater than zero and + /// equal to the value returned by GetFullSize. If the locality is remote, + /// the GetLocalFileSize value is zero. If the locality is local, this + /// value will equal the value returned by GetFileSize. If the locality is + /// partial, this value will equal the size of the portions of the font + /// data that have been downloaded, which will be greater than zero and /// less than or equal to the GetFileSize value. /// STDMETHOD_(UINT64, GetLocalFileSize)() PURE; @@ -1208,7 +1208,7 @@ interface DWRITE_DECLARE_INTERFACE("D37D7598-09BE-4222-A236-2081341CC1F2") IDWri /// Receives a pointer to the newly created localized strings object. /// Receives the value TRUE if the font contains the specified string ID or FALSE if not. /// - /// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but + /// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but /// informationalStrings receives a NULL pointer and exists receives the value FALSE. /// STDMETHOD(GetInformationalStrings)( @@ -1239,14 +1239,14 @@ interface DWRITE_DECLARE_INTERFACE("D37D7598-09BE-4222-A236-2081341CC1F2") IDWri /// Specifies the quality of the graphics system's outline rendering, /// affects the size threshold above which outline rendering is used. /// Specifies the method used to measure during text layout. For proper - /// glyph spacing, the function returns a rendering mode that is compatible with the specified + /// glyph spacing, the function returns a rendering mode that is compatible with the specified /// measuring mode. - /// Rendering parameters object. This parameter is necessary in case the rendering parameters + /// Rendering parameters object. This parameter is necessary in case the rendering parameters /// object overrides the rendering mode. /// Receives the recommended rendering mode. /// Receives the recommended grid-fit mode. /// - /// This method should be used to determine the actual rendering mode in cases where the rendering + /// This method should be used to determine the actual rendering mode in cases where the rendering /// mode of the rendering params object is DWRITE_RENDERING_MODE_DEFAULT, and the actual grid-fit /// mode when the rendering params object is DWRITE_GRID_FIT_MODE_DEFAULT. /// @@ -1406,7 +1406,7 @@ interface DWRITE_DECLARE_INTERFACE("CFEE3140-1157-47CA-8B85-31BFCF3F2D0E") IDWri }; /// -/// Application-defined callback interface that receives notifications from the font +/// Application-defined callback interface that receives notifications from the font /// download queue (IDWriteFontDownloadQueue interface). Callbacks will occur on the /// downloading thread, and objects must be prepared to handle calls on their methods /// from other threads at any time. @@ -1485,12 +1485,12 @@ interface DWRITE_DECLARE_INTERFACE("B71E6052-5AEA-4FA3-832E-F60D431F7E91") IDWri /// Begins an asynchronous download operation. The download operation executes /// in the background until it completes or is cancelled by a CancelDownload call. /// - /// Optional context object that is passed back to the + /// Optional context object that is passed back to the /// download notification handler's DownloadCompleted method. If the context object /// implements IDWriteFontDownloadListener, its DownloadCompleted will be called /// when done. /// - /// Returns S_OK if a download was successfully begun, S_FALSE if the queue was + /// Returns S_OK if a download was successfully begun, S_FALSE if the queue was /// empty, or a standard HRESULT error code. /// /// @@ -1620,7 +1620,7 @@ struct DWRITE_LINE_METRICS1 : DWRITE_LINE_METRICS }; /// -/// Specify whether DWRITE_FONT_METRICS::lineGap value should be part of the line metrics. +/// Specify whether DWRITE_FONT_METRICS::lineGap value should be part of the line metrics. /// enum DWRITE_FONT_LINE_GAP_USAGE { @@ -1655,17 +1655,17 @@ struct DWRITE_LINE_SPACING /// The interpretation of this parameter depends upon the line spacing method, as follows: /// - default line spacing: ignored /// - uniform line spacing: explicit distance in DIPs between lines - /// - proportional line spacing: a scaling factor to be applied to the computed line height; + /// - proportional line spacing: a scaling factor to be applied to the computed line height; /// for each line, the height of the line is computed as for default line spacing, and the scaling factor is applied to that value. /// FLOAT height; /// - /// Distance from top of line to baseline. + /// Distance from top of line to baseline. /// The interpretation of this parameter depends upon the line spacing method, as follows: /// - default line spacing: ignored /// - uniform line spacing: explicit distance in DIPs from the top of the line to the baseline - /// - proportional line spacing: a scaling factor applied to the computed baseline; for each line, + /// - proportional line spacing: a scaling factor applied to the computed baseline; for each line, /// the baseline distance is computed as for default line spacing, and the scaling factor is applied to that value. /// FLOAT baseline; @@ -1750,7 +1750,7 @@ interface DWRITE_DECLARE_INTERFACE("07DDCD52-020E-4DE8-AC33-6C953D83F92D") IDWri /// Standard HRESULT error code. /// /// - /// If maxLineCount is not large enough E_NOT_SUFFICIENT_BUFFER, + /// If maxLineCount is not large enough E_NOT_SUFFICIENT_BUFFER, /// which is equivalent to HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), /// is returned and *actualLineCount is set to the number of lines /// needed. @@ -1915,7 +1915,7 @@ interface DWRITE_DECLARE_INTERFACE("27F2A904-4EB8-441D-9678-0563F53E3E2F") IDWri /// The function only returns SVG or raster data - requesting TrueType/CFF/COLR data returns /// DWRITE_E_INVALIDARG. Those must be drawn via DrawGlyphRun or queried using GetGlyphOutline instead. /// Exactly one format may be requested or else the function returns DWRITE_E_INVALIDARG. - /// If the glyph does not have that format, the call is not an error, but the function returns empty data. + /// If the glyph does not have that format, the call is not an error, but the function returns empty data. /// STDMETHOD(GetGlyphImageData)( _In_ UINT16 glyphId, @@ -1961,7 +1961,7 @@ interface DWRITE_DECLARE_INTERFACE("4B0B5BD3-0797-4549-8AC5-FE915CC53856") IDWri /// /// Returns DWRITE_E_NOCOLOR if the font has no color information, the glyph run /// does not contain any color glyphs, or the specified color palette index - /// is out of range. In this case, the client should render the original glyph + /// is out of range. In this case, the client should render the original glyph /// run. Otherwise, returns a standard HRESULT error code. /// /// @@ -2040,7 +2040,7 @@ interface DWRITE_DECLARE_INTERFACE("3FF7715F-3CDC-4DC6-9B72-EC5621DCCAFD") IDWri interface DWRITE_DECLARE_INTERFACE("CE25F8FD-863B-4D13-9651-C1F88DC73FE2") IDWriteAsyncResult : public IUnknown { /// - /// The GetWaitHandleMethod method returns a handle that can be used to wait + /// The GetWaitHandleMethod method returns a handle that can be used to wait /// for the asynchronous operation to complete. The handle remains valid /// until the interface is released. /// @@ -2070,9 +2070,9 @@ struct DWRITE_FILE_FRAGMENT }; /// -/// IDWriteRemoteFontFileStream represents a font file stream parts of which may be -/// non-local. Non-local data must be downloaded before it can be accessed using -/// ReadFragment. The interface exposes methods to download font data and query the +/// IDWriteRemoteFontFileStream represents a font file stream parts of which may be +/// non-local. Non-local data must be downloaded before it can be accessed using +/// ReadFragment. The interface exposes methods to download font data and query the /// locality of font data. /// /// @@ -2130,7 +2130,7 @@ interface DWRITE_DECLARE_INTERFACE("4DB3757A-2C72-4ED9-B2B6-1ABABE1AFF9C") IDWri /// Number of elements in the fileFragments array. /// This can be zero to just download file information, such as the size. /// Receives an object that can be used to wait for - /// the asynchronous download to complete and to get the download result upon + /// the asynchronous download to complete and to get the download result upon /// completion. The result may be NULL if the download completes synchronously. /// For example, this can happen if method determines that the requested data /// is already local. @@ -2158,14 +2158,14 @@ enum DWRITE_CONTAINER_TYPE }; /// -/// The IDWriteRemoteFontFileLoader interface represents a font file loader that can access +/// The IDWriteRemoteFontFileLoader interface represents a font file loader that can access /// remote (i.e., downloadable) fonts. The IDWriteFactory5::CreateHttpFontFileLoader method /// returns an instance of this interface, or a client can create its own implementation. /// /// /// Calls to a remote file loader or stream should never block waiting for network operations. /// Any call that cannot succeeded immediately using local (e.g., cached) must should return -/// DWRITE_E_REMOTEFONT. This error signifies to DWrite that it should add requests to the +/// DWRITE_E_REMOTEFONT. This error signifies to DWrite that it should add requests to the /// font download queue. /// interface DWRITE_DECLARE_INTERFACE("68648C83-6EDE-46C0-AB46-20083A887FDE") IDWriteRemoteFontFileLoader : public IDWriteFontFileLoader @@ -2182,9 +2182,9 @@ interface DWRITE_DECLARE_INTERFACE("68648C83-6EDE-46C0-AB46-20083A887FDE") IDWri /// Standard HRESULT error code. /// /// - /// Unlike CreateStreamFromKey, this method can be used to create a stream for a remote file. If the file is - /// remote, the returned stream's BeginDownload method can be used to download all or part of the font file. - /// However, the stream cannot be used to get the file size or access font data unless the file is at least + /// Unlike CreateStreamFromKey, this method can be used to create a stream for a remote file. If the file is + /// remote, the returned stream's BeginDownload method can be used to download all or part of the font file. + /// However, the stream cannot be used to get the file size or access font data unless the file is at least /// partially local. /// STDMETHOD(CreateRemoteStreamFromKey)( @@ -2231,10 +2231,10 @@ interface DWRITE_DECLARE_INTERFACE("68648C83-6EDE-46C0-AB46-20083A887FDE") IDWri /// /// The IDWriteInMemoryFontFileLoader interface enables clients to reference -/// in-memory fonts without having to implement a custom loader. The +/// in-memory fonts without having to implement a custom loader. The /// IDWriteFactory5::CreateInMemoryFontFileLoader method returns an instance /// of this interface, which the client is responsible for registering and -/// unregistering using IDWriteFactory::RegisterFontFileLoader and +/// unregistering using IDWriteFactory::RegisterFontFileLoader and /// IDWriteFactory::UnregisterFontFileLoader. /// interface DWRITE_DECLARE_INTERFACE("DC102F47-A12D-4B1C-822D-9E117E33043F") IDWriteInMemoryFontFileLoader : public IDWriteFontFileLoader @@ -2295,7 +2295,7 @@ interface DWRITE_DECLARE_INTERFACE("958DB99A-BE2A-4F09-AF7D-65189803D1D3") IDWri /// /// The CreateInMemoryFontFileLoader method creates a loader object that can - /// be used to create font file references to in-memory fonts. The caller is + /// be used to create font file references to in-memory fonts. The caller is /// responsible for registering and unregistering the loader. /// /// Receives a pointer to the newly-created loader object. @@ -2307,14 +2307,14 @@ interface DWRITE_DECLARE_INTERFACE("958DB99A-BE2A-4F09-AF7D-65189803D1D3") IDWri ) PURE; /// - /// The CreateHttpFontFileLoader function creates a remote font file loader + /// The CreateHttpFontFileLoader function creates a remote font file loader /// that can create font file references from HTTP or HTTPS URLs. The caller /// is responsible for registering and unregistering the loader. /// /// Optional referrer URL for HTTP requests. - /// Optional additional header fields to include + /// Optional additional header fields to include /// in HTTP requests. Each header field consists of a name followed by a colon - /// (":") and the field value, as specified by RFC 2616. Multiple header fields + /// (":") and the field value, as specified by RFC 2616. Multiple header fields /// may be separated by newlines. /// Receives a pointer to the newly-created loader object. /// diff --git a/gfx/include/dxsdk/dxdiag.h b/gfx/include/dxsdk/dxdiag.h index aacd411f95..4b00377319 100644 --- a/gfx/include/dxsdk/dxdiag.h +++ b/gfx/include/dxsdk/dxdiag.h @@ -76,13 +76,13 @@ typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; typedef struct _DXDIAG_INIT_PARAMS { - DWORD dwSize; // Size of this structure. - DWORD dwDxDiagHeaderVersion; // Pass in DXDIAG_DX9_SDK_VERSION. This verifies + DWORD dwSize; // Size of this structure. + DWORD dwDxDiagHeaderVersion; // Pass in DXDIAG_DX9_SDK_VERSION. This verifies // the header and dll are correctly matched. - BOOL bAllowWHQLChecks; // If true, allow dxdiag to check if drivers are - // digital signed as logo'd by WHQL which may + BOOL bAllowWHQLChecks; // If true, allow dxdiag to check if drivers are + // digital signed as logo'd by WHQL which may // connect via internet to update WHQL certificates. - VOID* pReserved; // Reserved. Must be NULL. + VOID* pReserved; // Reserved. Must be NULL. } DXDIAG_INIT_PARAMS; /**************************************************************************** @@ -102,9 +102,9 @@ DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; - + /*** IDxDiagProvider methods ***/ - STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; + STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; }; @@ -119,11 +119,11 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown) STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD_(ULONG,AddRef) (THIS) PURE; STDMETHOD_(ULONG,Release) (THIS) PURE; - + /*** IDxDiagContainer methods ***/ STDMETHOD(GetNumberOfChildContainers) (THIS_ DWORD *pdwCount) PURE; STDMETHOD(EnumChildContainerNames) (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE; - STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE; + STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE; STDMETHOD(GetNumberOfProps) (THIS_ DWORD *pdwCount) PURE; STDMETHOD(EnumPropNames) (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE; STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE; diff --git a/gfx/include/dxsdk/dxerr.h b/gfx/include/dxsdk/dxerr.h index 3bafb2fca9..02c6eef6bc 100644 --- a/gfx/include/dxsdk/dxerr.h +++ b/gfx/include/dxsdk/dxerr.h @@ -15,13 +15,13 @@ extern "C" { // // DXGetErrorString -// -// Desc: Converts a DirectX HRESULT to a string +// +// Desc: Converts a DirectX HRESULT to a string // // Args: HRESULT hr Can be any error code from // XACT XAUDIO2 XAPO XINPUT DXGI D3D10 D3DX10 D3D9 D3DX9 DDRAW DSOUND DINPUT DSHOW // -// Return: Converted string +// Return: Converted string // const char* WINAPI DXGetErrorStringA(__in HRESULT hr); const WCHAR* WINAPI DXGetErrorStringW(__in HRESULT hr); @@ -30,11 +30,11 @@ const WCHAR* WINAPI DXGetErrorStringW(__in HRESULT hr); #define DXGetErrorString DXGetErrorStringW #else #define DXGetErrorString DXGetErrorStringA -#endif +#endif // // DXGetErrorDescription -// +// // Desc: Returns a string description of a DirectX HRESULT // // Args: HRESULT hr Can be any error code from @@ -49,22 +49,22 @@ const WCHAR* WINAPI DXGetErrorDescriptionW(__in HRESULT hr); #define DXGetErrorDescription DXGetErrorDescriptionW #else #define DXGetErrorDescription DXGetErrorDescriptionA -#endif +#endif // // DXTrace // // Desc: Outputs a formatted error message to the debug stream // -// Args: CHAR* strFile The current file, typically passed in using the +// Args: CHAR* strFile The current file, typically passed in using the // __FILE__ macro. -// DWORD dwLine The current line number, typically passed in using the +// DWORD dwLine The current line number, typically passed in using the // __LINE__ macro. // HRESULT hr An HRESULT that will be traced to the debug stream. // CHAR* strMsg A string that will be traced to the debug stream (may be NULL) // BOOL bPopMsgBox If TRUE, then a message box will popup also containing the passed info. // -// Return: The hr that was passed in. +// Return: The hr that was passed in. // HRESULT WINAPI DXTraceA( __in_z const char* strFile, __in DWORD dwLine, __in HRESULT hr, __in_z_opt const char* strMsg, __in BOOL bPopMsgBox ); HRESULT WINAPI DXTraceW( __in_z const char* strFile, __in DWORD dwLine, __in HRESULT hr, __in_z_opt const WCHAR* strMsg, __in BOOL bPopMsgBox ); @@ -73,7 +73,7 @@ HRESULT WINAPI DXTraceW( __in_z const char* strFile, __in DWORD dwLine, __in HRE #define DXTrace DXTraceW #else #define DXTrace DXTraceA -#endif +#endif // // Helper macros diff --git a/gfx/include/dxsdk/dxgi.h b/gfx/include/dxsdk/dxgi.h index f3ce03f46d..3cc54e8f77 100644 --- a/gfx/include/dxsdk/dxgi.h +++ b/gfx/include/dxsdk/dxgi.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIObject_FWD_DEFINED__ #define __IDXGIObject_FWD_DEFINED__ @@ -127,10 +127,10 @@ typedef interface IDXGIDevice1 IDXGIDevice1; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ #define DXGI_CPU_ACCESS_NONE ( 0 ) @@ -220,7 +220,7 @@ typedef struct DXGI_SHARED_RESOURCE #define DXGI_RESOURCE_PRIORITY_MAXIMUM ( 0xc8000000 ) -typedef +typedef enum DXGI_RESIDENCY { DXGI_RESIDENCY_FULLY_RESIDENT = 1, @@ -236,7 +236,7 @@ typedef struct DXGI_SURFACE_DESC DXGI_SAMPLE_DESC SampleDesc; } DXGI_SURFACE_DESC; -typedef +typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, @@ -245,7 +245,7 @@ enum DXGI_SWAP_EFFECT DXGI_SWAP_EFFECT_FLIP_DISCARD = 4 } DXGI_SWAP_EFFECT; -typedef +typedef enum DXGI_SWAP_CHAIN_FLAG { DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1, @@ -282,95 +282,94 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0000_v0_0_s_ifspec; #define __IDXGIObject_INTERFACE_DEFINED__ /* interface IDXGIObject */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIObject; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("aec22fb8-76f3-4639-9be0-28eb43a67a2e") IDXGIObject : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetPrivateData( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE SetPrivateData( + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetPrivateDataInterface( + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPrivateData( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetPrivateData( + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetParent( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetParent( + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIObjectVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIObject * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIObject * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIObject * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - + END_INTERFACE } IDXGIObjectVtbl; @@ -379,30 +378,28 @@ EXTERN_C const IID IID_IDXGIObject; CONST_VTBL struct IDXGIObjectVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIObject_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIObject_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIObject_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIObject_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIObject_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIObject_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIObject_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #endif /* COBJMACROS */ @@ -414,81 +411,80 @@ EXTERN_C const IID IID_IDXGIObject; #define __IDXGIDeviceSubObject_INTERFACE_DEFINED__ /* interface IDXGIDeviceSubObject */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDeviceSubObject; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3d3e0379-f9de-4d58-bb6c-18d62992f1a6") IDXGIDeviceSubObject : public IDXGIObject { public: - virtual HRESULT STDMETHODCALLTYPE GetDevice( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE GetDevice( + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDeviceSubObjectVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDeviceSubObject * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDeviceSubObject * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDeviceSubObject * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDeviceSubObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDeviceSubObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDeviceSubObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDeviceSubObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGIDeviceSubObject * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - + END_INTERFACE } IDXGIDeviceSubObjectVtbl; @@ -497,33 +493,31 @@ EXTERN_C const IID IID_IDXGIDeviceSubObject; CONST_VTBL struct IDXGIDeviceSubObjectVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDeviceSubObject_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDeviceSubObject_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDeviceSubObject_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDeviceSubObject_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDeviceSubObject_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDeviceSubObject_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDeviceSubObject_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDeviceSubObject_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #endif /* COBJMACROS */ @@ -535,107 +529,106 @@ EXTERN_C const IID IID_IDXGIDeviceSubObject; #define __IDXGIResource_INTERFACE_DEFINED__ /* interface IDXGIResource */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIResource; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("035f3ab4-482e-4e50-b41f-8a7f8bd8960b") IDXGIResource : public IDXGIDeviceSubObject { public: - virtual HRESULT STDMETHODCALLTYPE GetSharedHandle( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetSharedHandle( + /* [annotation][out] */ _Out_ HANDLE *pSharedHandle) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetUsage( + + virtual HRESULT STDMETHODCALLTYPE GetUsage( /* [out] */ DXGI_USAGE *pUsage) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetEvictionPriority( + + virtual HRESULT STDMETHODCALLTYPE SetEvictionPriority( /* [in] */ UINT EvictionPriority) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetEvictionPriority( - /* [annotation][retval][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetEvictionPriority( + /* [annotation][retval][out] */ _Out_ UINT *pEvictionPriority) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIResourceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIResource * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIResource * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIResource * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIResource * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIResource * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIResource * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIResource * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGIResource * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )( IDXGIResource * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pSharedHandle); - - HRESULT ( STDMETHODCALLTYPE *GetUsage )( + + HRESULT ( STDMETHODCALLTYPE *GetUsage )( IDXGIResource * This, /* [out] */ DXGI_USAGE *pUsage); - - HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )( IDXGIResource * This, /* [in] */ UINT EvictionPriority); - - HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )( IDXGIResource * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ UINT *pEvictionPriority); - + END_INTERFACE } IDXGIResourceVtbl; @@ -644,45 +637,43 @@ EXTERN_C const IID IID_IDXGIResource; CONST_VTBL struct IDXGIResourceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIResource_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIResource_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIResource_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIResource_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIResource_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIResource_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIResource_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIResource_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGIResource_GetSharedHandle(This,pSharedHandle) \ - ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) ) + ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) ) #define IDXGIResource_GetUsage(This,pUsage) \ - ( (This)->lpVtbl -> GetUsage(This,pUsage) ) + ( (This)->lpVtbl -> GetUsage(This,pUsage) ) #define IDXGIResource_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define IDXGIResource_GetEvictionPriority(This,pEvictionPriority) \ - ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) ) + ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) ) #endif /* COBJMACROS */ @@ -694,91 +685,90 @@ EXTERN_C const IID IID_IDXGIResource; #define __IDXGIKeyedMutex_INTERFACE_DEFINED__ /* interface IDXGIKeyedMutex */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIKeyedMutex; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("9d8e1289-d7b3-465f-8126-250e349af85d") IDXGIKeyedMutex : public IDXGIDeviceSubObject { public: - virtual HRESULT STDMETHODCALLTYPE AcquireSync( + virtual HRESULT STDMETHODCALLTYPE AcquireSync( /* [in] */ UINT64 Key, /* [in] */ DWORD dwMilliseconds) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReleaseSync( + + virtual HRESULT STDMETHODCALLTYPE ReleaseSync( /* [in] */ UINT64 Key) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIKeyedMutexVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIKeyedMutex * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIKeyedMutex * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIKeyedMutex * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIKeyedMutex * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIKeyedMutex * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIKeyedMutex * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIKeyedMutex * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGIKeyedMutex * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *AcquireSync )( + + HRESULT ( STDMETHODCALLTYPE *AcquireSync )( IDXGIKeyedMutex * This, /* [in] */ UINT64 Key, /* [in] */ DWORD dwMilliseconds); - - HRESULT ( STDMETHODCALLTYPE *ReleaseSync )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseSync )( IDXGIKeyedMutex * This, /* [in] */ UINT64 Key); - + END_INTERFACE } IDXGIKeyedMutexVtbl; @@ -787,39 +777,37 @@ EXTERN_C const IID IID_IDXGIKeyedMutex; CONST_VTBL struct IDXGIKeyedMutexVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIKeyedMutex_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIKeyedMutex_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIKeyedMutex_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIKeyedMutex_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIKeyedMutex_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIKeyedMutex_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIKeyedMutex_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIKeyedMutex_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGIKeyedMutex_AcquireSync(This,Key,dwMilliseconds) \ - ( (This)->lpVtbl -> AcquireSync(This,Key,dwMilliseconds) ) + ( (This)->lpVtbl -> AcquireSync(This,Key,dwMilliseconds) ) #define IDXGIKeyedMutex_ReleaseSync(This,Key) \ - ( (This)->lpVtbl -> ReleaseSync(This,Key) ) + ( (This)->lpVtbl -> ReleaseSync(This,Key) ) #endif /* COBJMACROS */ @@ -828,7 +816,7 @@ EXTERN_C const IID IID_IDXGIKeyedMutex; #endif /* __IDXGIKeyedMutex_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0004 */ -/* [local] */ +/* [local] */ #define DXGI_MAP_READ ( 1UL ) @@ -843,100 +831,99 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0004_v0_0_s_ifspec; #define __IDXGISurface_INTERFACE_DEFINED__ /* interface IDXGISurface */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISurface; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("cafcb56c-6ac3-4889-bf47-9e23bbd260ec") IDXGISurface : public IDXGIDeviceSubObject { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc( + /* [annotation][out] */ _Out_ DXGI_SURFACE_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE Map( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE Map( + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect, /* [in] */ UINT MapFlags) = 0; - + virtual HRESULT STDMETHODCALLTYPE Unmap( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISurfaceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISurface * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISurface * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISurface * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISurface * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISurface * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISurface * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISurface * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISurface * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISurface * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SURFACE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( IDXGISurface * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect, /* [in] */ UINT MapFlags); - - HRESULT ( STDMETHODCALLTYPE *Unmap )( + + HRESULT ( STDMETHODCALLTYPE *Unmap )( IDXGISurface * This); - + END_INTERFACE } IDXGISurfaceVtbl; @@ -945,42 +932,40 @@ EXTERN_C const IID IID_IDXGISurface; CONST_VTBL struct IDXGISurfaceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISurface_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISurface_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISurface_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISurface_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISurface_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISurface_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISurface_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISurface_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISurface_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISurface_Map(This,pLockedRect,MapFlags) \ - ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) + ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) #define IDXGISurface_Unmap(This) \ - ( (This)->lpVtbl -> Unmap(This) ) + ( (This)->lpVtbl -> Unmap(This) ) #endif /* COBJMACROS */ @@ -992,109 +977,108 @@ EXTERN_C const IID IID_IDXGISurface; #define __IDXGISurface1_INTERFACE_DEFINED__ /* interface IDXGISurface1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISurface1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("4AE63092-6327-4c1b-80AE-BFE12EA32B86") IDXGISurface1 : public IDXGISurface { public: - virtual HRESULT STDMETHODCALLTYPE GetDC( + virtual HRESULT STDMETHODCALLTYPE GetDC( /* [in] */ BOOL Discard, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HDC *phdc) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReleaseDC( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE ReleaseDC( + /* [annotation][in] */ _In_opt_ RECT *pDirtyRect) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISurface1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISurface1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISurface1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISurface1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISurface1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SURFACE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( IDXGISurface1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect, /* [in] */ UINT MapFlags); - - HRESULT ( STDMETHODCALLTYPE *Unmap )( + + HRESULT ( STDMETHODCALLTYPE *Unmap )( IDXGISurface1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDC )( + + HRESULT ( STDMETHODCALLTYPE *GetDC )( IDXGISurface1 * This, /* [in] */ BOOL Discard, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HDC *phdc); - - HRESULT ( STDMETHODCALLTYPE *ReleaseDC )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseDC )( IDXGISurface1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ RECT *pDirtyRect); - + END_INTERFACE } IDXGISurface1Vtbl; @@ -1103,48 +1087,46 @@ EXTERN_C const IID IID_IDXGISurface1; CONST_VTBL struct IDXGISurface1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISurface1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISurface1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISurface1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISurface1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISurface1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISurface1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISurface1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISurface1_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISurface1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISurface1_Map(This,pLockedRect,MapFlags) \ - ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) + ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) #define IDXGISurface1_Unmap(This) \ - ( (This)->lpVtbl -> Unmap(This) ) + ( (This)->lpVtbl -> Unmap(This) ) #define IDXGISurface1_GetDC(This,Discard,phdc) \ - ( (This)->lpVtbl -> GetDC(This,Discard,phdc) ) + ( (This)->lpVtbl -> GetDC(This,Discard,phdc) ) #define IDXGISurface1_ReleaseDC(This,pDirtyRect) \ - ( (This)->lpVtbl -> ReleaseDC(This,pDirtyRect) ) + ( (This)->lpVtbl -> ReleaseDC(This,pDirtyRect) ) #endif /* COBJMACROS */ @@ -1153,7 +1135,7 @@ EXTERN_C const IID IID_IDXGISurface1; #endif /* __IDXGISurface1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0006 */ -/* [local] */ +/* [local] */ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0006_v0_0_c_ifspec; extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0006_v0_0_s_ifspec; @@ -1162,101 +1144,100 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0006_v0_0_s_ifspec; #define __IDXGIAdapter_INTERFACE_DEFINED__ /* interface IDXGIAdapter */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIAdapter; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("2411e7e1-12ac-4ccf-bd14-9798e8534dc0") IDXGIAdapter : public IDXGIObject { public: - virtual HRESULT STDMETHODCALLTYPE EnumOutputs( + virtual HRESULT STDMETHODCALLTYPE EnumOutputs( /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDesc( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetDesc( + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CheckInterfaceSupport( + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIAdapterVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIAdapter * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIAdapter * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIAdapter * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIAdapter * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIAdapter * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIAdapter * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIAdapter * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( + + HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( IDXGIAdapter * This, /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIAdapter * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( IDXGIAdapter * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion); - + END_INTERFACE } IDXGIAdapterVtbl; @@ -1265,39 +1246,37 @@ EXTERN_C const IID IID_IDXGIAdapter; CONST_VTBL struct IDXGIAdapterVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIAdapter_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIAdapter_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIAdapter_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIAdapter_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIAdapter_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIAdapter_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIAdapter_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIAdapter_EnumOutputs(This,Output,ppOutput) \ - ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) + ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) #define IDXGIAdapter_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIAdapter_CheckInterfaceSupport(This,InterfaceName,pUMDVersion) \ - ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) + ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) #endif /* COBJMACROS */ @@ -1306,7 +1285,7 @@ EXTERN_C const IID IID_IDXGIAdapter; #endif /* __IDXGIAdapter_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0007 */ -/* [local] */ +/* [local] */ #define DXGI_ENUM_MODES_INTERLACED ( 1UL ) @@ -1319,186 +1298,185 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0007_v0_0_s_ifspec; #define __IDXGIOutput_INTERFACE_DEFINED__ /* interface IDXGIOutput */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("ae02eedb-c735-4690-8d52-5a8dc20213aa") IDXGIOutput : public IDXGIObject { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc( + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList( + + virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList( /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode( + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice) = 0; - + virtual HRESULT STDMETHODCALLTYPE WaitForVBlank( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE TakeOwnership( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE TakeOwnership( + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive) = 0; - + virtual void STDMETHODCALLTYPE ReleaseOwnership( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities( + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetGammaControl( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetGammaControl( + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetGammaControl( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetGammaControl( + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetDisplaySurface( + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData( + /* [annotation][in] */ _In_ IDXGISurface *pDestination) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutputVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - + END_INTERFACE } IDXGIOutputVtbl; @@ -1507,66 +1485,64 @@ EXTERN_C const IID IID_IDXGIOutput; CONST_VTBL struct IDXGIOutputVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #endif /* COBJMACROS */ @@ -1575,7 +1551,7 @@ EXTERN_C const IID IID_IDXGIOutput; #endif /* __IDXGIOutput_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0008 */ -/* [local] */ +/* [local] */ #define DXGI_MAX_SWAP_CHAIN_BUFFERS ( 16 ) #define DXGI_PRESENT_TEST 0x00000001UL @@ -1595,183 +1571,182 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0008_v0_0_s_ifspec; #define __IDXGISwapChain_INTERFACE_DEFINED__ /* interface IDXGISwapChain */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChain; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("310d36a0-d2e7-4c0a-aa04-6a9d23b8886a") IDXGISwapChain : public IDXGIDeviceSubObject { public: - virtual HRESULT STDMETHODCALLTYPE Present( + virtual HRESULT STDMETHODCALLTYPE Present( /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetBuffer( + + virtual HRESULT STDMETHODCALLTYPE GetBuffer( /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFullscreenState( + + virtual HRESULT STDMETHODCALLTYPE SetFullscreenState( /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFullscreenState( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetFullscreenState( + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDesc( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetDesc( + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE ResizeBuffers( + + virtual HRESULT STDMETHODCALLTYPE ResizeBuffers( /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE ResizeTarget( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE ResizeTarget( + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetContainingOutput( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetContainingOutput( + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetFrameStatistics( + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetLastPresentCount( + /* [annotation][out] */ _Out_ UINT *pLastPresentCount) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChainVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChain * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChain * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChain * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *Present )( + + HRESULT ( STDMETHODCALLTYPE *Present )( IDXGISwapChain * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetBuffer )( IDXGISwapChain * This, /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( IDXGISwapChain * This, /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( IDXGISwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( IDXGISwapChain * This, /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( IDXGISwapChain * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters); - - HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( IDXGISwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGISwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( + + HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( IDXGISwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pLastPresentCount); - + END_INTERFACE } IDXGISwapChainVtbl; @@ -1780,63 +1755,61 @@ EXTERN_C const IID IID_IDXGISwapChain; CONST_VTBL struct IDXGISwapChainVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChain_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChain_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChain_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChain_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISwapChain_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISwapChain_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISwapChain_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISwapChain_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISwapChain_Present(This,SyncInterval,Flags) \ - ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) + ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) #define IDXGISwapChain_GetBuffer(This,Buffer,riid,ppSurface) \ - ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) + ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) #define IDXGISwapChain_SetFullscreenState(This,Fullscreen,pTarget) \ - ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) + ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) #define IDXGISwapChain_GetFullscreenState(This,pFullscreen,ppTarget) \ - ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) + ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) #define IDXGISwapChain_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISwapChain_ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) \ - ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) + ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) #define IDXGISwapChain_ResizeTarget(This,pNewTargetParameters) \ - ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) + ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) #define IDXGISwapChain_GetContainingOutput(This,ppOutput) \ - ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) + ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) #define IDXGISwapChain_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGISwapChain_GetLastPresentCount(This,pLastPresentCount) \ - ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) + ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) #endif /* COBJMACROS */ @@ -1845,7 +1818,7 @@ EXTERN_C const IID IID_IDXGISwapChain; #endif /* __IDXGISwapChain_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0009 */ -/* [local] */ +/* [local] */ #define DXGI_MWA_NO_WINDOW_CHANGES ( 1 << 0 ) #define DXGI_MWA_NO_ALT_ENTER ( 1 << 1 ) @@ -1859,125 +1832,124 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0009_v0_0_s_ifspec; #define __IDXGIFactory_INTERFACE_DEFINED__ /* interface IDXGIFactory */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7b7166ec-21c7-44ae-b21a-c9ae321ae369") IDXGIFactory : public IDXGIObject { public: - virtual HRESULT STDMETHODCALLTYPE EnumAdapters( + virtual HRESULT STDMETHODCALLTYPE EnumAdapters( /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter) = 0; - - virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation( + + virtual HRESULT STDMETHODCALLTYPE MakeWindowAssociation( HWND WindowHandle, UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetWindowAssociation( + /* [annotation][out] */ _Out_ HWND *pWindowHandle) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSwapChain( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSwapChain( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter( + + virtual HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter( /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactoryVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - + END_INTERFACE } IDXGIFactoryVtbl; @@ -1986,45 +1958,43 @@ EXTERN_C const IID IID_IDXGIFactory; CONST_VTBL struct IDXGIFactoryVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #endif /* COBJMACROS */ @@ -2033,7 +2003,7 @@ EXTERN_C const IID IID_IDXGIFactory; #endif /* __IDXGIFactory_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0010 */ -/* [local] */ +/* [local] */ /*#pragma region Desktop Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)*/ @@ -2049,129 +2019,128 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0010_v0_0_s_ifspec; #define __IDXGIDevice_INTERFACE_DEFINED__ /* interface IDXGIDevice */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDevice; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("54ec77fa-1377-44e6-8c32-88fd5f44c84c") IDXGIDevice : public IDXGIObject { public: - virtual HRESULT STDMETHODCALLTYPE GetAdapter( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetAdapter( + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSurface( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSurface( + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface) = 0; - - virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency( - /* [annotation][size_is][in] */ + + virtual HRESULT STDMETHODCALLTYPE QueryResourceResidency( + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority( + + virtual HRESULT STDMETHODCALLTYPE SetGPUThreadPriority( /* [in] */ INT Priority) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority( - /* [annotation][retval][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetGPUThreadPriority( + /* [annotation][retval][out] */ _Out_ INT *pPriority) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDeviceVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDevice * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDevice * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDevice * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDevice * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDevice * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDevice * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDevice * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetAdapter )( + + HRESULT ( STDMETHODCALLTYPE *GetAdapter )( IDXGIDevice * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter); - - HRESULT ( STDMETHODCALLTYPE *CreateSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSurface )( IDXGIDevice * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( + + HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( IDXGIDevice * This, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources); - - HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( IDXGIDevice * This, /* [in] */ INT Priority); - - HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( IDXGIDevice * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ INT *pPriority); - + END_INTERFACE } IDXGIDeviceVtbl; @@ -2180,45 +2149,43 @@ EXTERN_C const IID IID_IDXGIDevice; CONST_VTBL struct IDXGIDeviceVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDevice_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDevice_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDevice_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDevice_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDevice_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDevice_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDevice_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDevice_GetAdapter(This,pAdapter) \ - ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) + ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) #define IDXGIDevice_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) \ - ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) + ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) #define IDXGIDevice_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) \ - ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) + ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) #define IDXGIDevice_SetGPUThreadPriority(This,Priority) \ - ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) + ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) #define IDXGIDevice_GetGPUThreadPriority(This,pPriority) \ - ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) + ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) #endif /* COBJMACROS */ @@ -2227,9 +2194,9 @@ EXTERN_C const IID IID_IDXGIDevice; #endif /* __IDXGIDevice_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0011 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_ADAPTER_FLAG { DXGI_ADAPTER_FLAG_NONE = 0, @@ -2265,115 +2232,114 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi_0000_0011_v0_0_s_ifspec; #define __IDXGIFactory1_INTERFACE_DEFINED__ /* interface IDXGIFactory1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("770aae78-f26f-4dba-a829-253c83d1b387") IDXGIFactory1 : public IDXGIFactory { public: - virtual HRESULT STDMETHODCALLTYPE EnumAdapters1( + virtual HRESULT STDMETHODCALLTYPE EnumAdapters1( /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter) = 0; - + virtual BOOL STDMETHODCALLTYPE IsCurrent( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactory1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory1 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory1 * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory1 * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( IDXGIFactory1 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter); - - BOOL ( STDMETHODCALLTYPE *IsCurrent )( + + BOOL ( STDMETHODCALLTYPE *IsCurrent )( IDXGIFactory1 * This); - + END_INTERFACE } IDXGIFactory1Vtbl; @@ -2382,51 +2348,49 @@ EXTERN_C const IID IID_IDXGIFactory1; CONST_VTBL struct IDXGIFactory1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory1_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory1_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory1_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory1_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory1_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #define IDXGIFactory1_EnumAdapters1(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) #define IDXGIFactory1_IsCurrent(This) \ - ( (This)->lpVtbl -> IsCurrent(This) ) + ( (This)->lpVtbl -> IsCurrent(This) ) #endif /* COBJMACROS */ @@ -2438,95 +2402,94 @@ EXTERN_C const IID IID_IDXGIFactory1; #define __IDXGIAdapter1_INTERFACE_DEFINED__ /* interface IDXGIAdapter1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIAdapter1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("29038f61-3839-4626-91fd-086879011a05") IDXGIAdapter1 : public IDXGIAdapter { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc1( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc1( + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC1 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIAdapter1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIAdapter1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIAdapter1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIAdapter1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIAdapter1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIAdapter1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIAdapter1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIAdapter1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( + + HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( IDXGIAdapter1 * This, /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIAdapter1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( IDXGIAdapter1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGIAdapter1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC1 *pDesc); - + END_INTERFACE } IDXGIAdapter1Vtbl; @@ -2535,42 +2498,40 @@ EXTERN_C const IID IID_IDXGIAdapter1; CONST_VTBL struct IDXGIAdapter1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIAdapter1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIAdapter1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIAdapter1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIAdapter1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIAdapter1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIAdapter1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIAdapter1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIAdapter1_EnumOutputs(This,Output,ppOutput) \ - ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) + ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) #define IDXGIAdapter1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIAdapter1_CheckInterfaceSupport(This,InterfaceName,pUMDVersion) \ - ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) + ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) #define IDXGIAdapter1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #endif /* COBJMACROS */ @@ -2582,117 +2543,116 @@ EXTERN_C const IID IID_IDXGIAdapter1; #define __IDXGIDevice1_INTERFACE_DEFINED__ /* interface IDXGIDevice1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDevice1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("77db970f-6276-48ba-ba28-070143b4392c") IDXGIDevice1 : public IDXGIDevice { public: - virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency( + virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency( /* [in] */ UINT MaxLatency) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency( + /* [annotation][out] */ _Out_ UINT *pMaxLatency) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDevice1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDevice1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDevice1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDevice1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDevice1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDevice1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDevice1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDevice1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetAdapter )( + + HRESULT ( STDMETHODCALLTYPE *GetAdapter )( IDXGIDevice1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter); - - HRESULT ( STDMETHODCALLTYPE *CreateSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSurface )( IDXGIDevice1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( + + HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( IDXGIDevice1 * This, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources); - - HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( IDXGIDevice1 * This, /* [in] */ INT Priority); - - HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( IDXGIDevice1 * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ INT *pPriority); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGIDevice1 * This, /* [in] */ UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGIDevice1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - + END_INTERFACE } IDXGIDevice1Vtbl; @@ -2701,51 +2661,49 @@ EXTERN_C const IID IID_IDXGIDevice1; CONST_VTBL struct IDXGIDevice1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDevice1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDevice1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDevice1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDevice1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDevice1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDevice1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDevice1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDevice1_GetAdapter(This,pAdapter) \ - ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) + ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) #define IDXGIDevice1_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) \ - ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) + ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) #define IDXGIDevice1_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) \ - ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) + ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) #define IDXGIDevice1_SetGPUThreadPriority(This,Priority) \ - ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) + ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) #define IDXGIDevice1_GetGPUThreadPriority(This,pPriority) \ - ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) + ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) #define IDXGIDevice1_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGIDevice1_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #endif /* COBJMACROS */ @@ -2754,7 +2712,7 @@ EXTERN_C const IID IID_IDXGIDevice1; #endif /* __IDXGIDevice1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi_0000_0014 */ -/* [local] */ +/* [local] */ #ifdef __cplusplus #endif /*__cplusplus*/ diff --git a/gfx/include/dxsdk/dxgi1_2.h b/gfx/include/dxsdk/dxgi1_2.h index bc39bccad1..21fd0d1d22 100644 --- a/gfx/include/dxsdk/dxgi1_2.h +++ b/gfx/include/dxsdk/dxgi1_2.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIDisplayControl_FWD_DEFINED__ #define __IDXGIDisplayControl_FWD_DEFINED__ @@ -94,10 +94,10 @@ typedef interface IDXGIOutput1 IDXGIOutput1; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi1_2_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region Desktop Family*/ @@ -110,49 +110,48 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0000_v0_0_s_ifspec; #define __IDXGIDisplayControl_INTERFACE_DEFINED__ /* interface IDXGIDisplayControl */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDisplayControl; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("ea9dbf1a-c88e-4486-854a-98aa0138f30c") IDXGIDisplayControl : public IUnknown { public: virtual BOOL STDMETHODCALLTYPE IsStereoEnabled( void) = 0; - - virtual void STDMETHODCALLTYPE SetStereoEnabled( + + virtual void STDMETHODCALLTYPE SetStereoEnabled( BOOL enabled) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDisplayControlVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDisplayControl * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDisplayControl * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDisplayControl * This); - - BOOL ( STDMETHODCALLTYPE *IsStereoEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsStereoEnabled )( IDXGIDisplayControl * This); - - void ( STDMETHODCALLTYPE *SetStereoEnabled )( + + void ( STDMETHODCALLTYPE *SetStereoEnabled )( IDXGIDisplayControl * This, BOOL enabled); - + END_INTERFACE } IDXGIDisplayControlVtbl; @@ -161,24 +160,22 @@ EXTERN_C const IID IID_IDXGIDisplayControl; CONST_VTBL struct IDXGIDisplayControlVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDisplayControl_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDisplayControl_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDisplayControl_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDisplayControl_IsStereoEnabled(This) \ - ( (This)->lpVtbl -> IsStereoEnabled(This) ) + ( (This)->lpVtbl -> IsStereoEnabled(This) ) #define IDXGIDisplayControl_SetStereoEnabled(This,enabled) \ - ( (This)->lpVtbl -> SetStereoEnabled(This,enabled) ) + ( (This)->lpVtbl -> SetStereoEnabled(This,enabled) ) #endif /* COBJMACROS */ @@ -187,7 +184,7 @@ EXTERN_C const IID IID_IDXGIDisplayControl; #endif /* __IDXGIDisplayControl_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct DXGI_OUTDUPL_MOVE_RECT { @@ -208,7 +205,7 @@ typedef struct DXGI_OUTDUPL_POINTER_POSITION BOOL Visible; } DXGI_OUTDUPL_POINTER_POSITION; -typedef +typedef enum DXGI_OUTDUPL_POINTER_SHAPE_TYPE { DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME = 0x1, @@ -244,168 +241,167 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0001_v0_0_s_ifspec; #define __IDXGIOutputDuplication_INTERFACE_DEFINED__ /* interface IDXGIOutputDuplication */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutputDuplication; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("191cfac3-a341-470d-b26e-a864f428319c") IDXGIOutputDuplication : public IDXGIObject { public: - virtual void STDMETHODCALLTYPE GetDesc( - /* [annotation][out] */ + virtual void STDMETHODCALLTYPE GetDesc( + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE AcquireNextFrame( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE AcquireNextFrame( + /* [annotation][in] */ _In_ UINT TimeoutInMilliseconds, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_FRAME_INFO *pFrameInfo, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIResource **ppDesktopResource) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFrameDirtyRects( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetFrameDirtyRects( + /* [annotation][in] */ _In_ UINT DirtyRectsBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(DirtyRectsBufferSize, *pDirtyRectsBufferSizeRequired) RECT *pDirtyRectsBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pDirtyRectsBufferSizeRequired) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFrameMoveRects( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetFrameMoveRects( + /* [annotation][in] */ _In_ UINT MoveRectsBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(MoveRectsBufferSize, *pMoveRectsBufferSizeRequired) DXGI_OUTDUPL_MOVE_RECT *pMoveRectBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMoveRectsBufferSizeRequired) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFramePointerShape( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetFramePointerShape( + /* [annotation][in] */ _In_ UINT PointerShapeBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(PointerShapeBufferSize, *pPointerShapeBufferSizeRequired) void *pPointerShapeBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pPointerShapeBufferSizeRequired, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_POINTER_SHAPE_INFO *pPointerShapeInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE MapDesktopSurface( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE MapDesktopSurface( + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect) = 0; - + virtual HRESULT STDMETHODCALLTYPE UnMapDesktopSurface( void) = 0; - + virtual HRESULT STDMETHODCALLTYPE ReleaseFrame( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutputDuplicationVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutputDuplication * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutputDuplication * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutputDuplication * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - void ( STDMETHODCALLTYPE *GetDesc )( + + void ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutputDuplication * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *AcquireNextFrame )( + + HRESULT ( STDMETHODCALLTYPE *AcquireNextFrame )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT TimeoutInMilliseconds, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_FRAME_INFO *pFrameInfo, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIResource **ppDesktopResource); - - HRESULT ( STDMETHODCALLTYPE *GetFrameDirtyRects )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameDirtyRects )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT DirtyRectsBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(DirtyRectsBufferSize, *pDirtyRectsBufferSizeRequired) RECT *pDirtyRectsBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pDirtyRectsBufferSizeRequired); - - HRESULT ( STDMETHODCALLTYPE *GetFrameMoveRects )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameMoveRects )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT MoveRectsBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(MoveRectsBufferSize, *pMoveRectsBufferSizeRequired) DXGI_OUTDUPL_MOVE_RECT *pMoveRectBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMoveRectsBufferSizeRequired); - - HRESULT ( STDMETHODCALLTYPE *GetFramePointerShape )( + + HRESULT ( STDMETHODCALLTYPE *GetFramePointerShape )( IDXGIOutputDuplication * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT PointerShapeBufferSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_to_(PointerShapeBufferSize, *pPointerShapeBufferSizeRequired) void *pPointerShapeBuffer, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pPointerShapeBufferSizeRequired, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTDUPL_POINTER_SHAPE_INFO *pPointerShapeInfo); - - HRESULT ( STDMETHODCALLTYPE *MapDesktopSurface )( + + HRESULT ( STDMETHODCALLTYPE *MapDesktopSurface )( IDXGIOutputDuplication * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect); - - HRESULT ( STDMETHODCALLTYPE *UnMapDesktopSurface )( + + HRESULT ( STDMETHODCALLTYPE *UnMapDesktopSurface )( IDXGIOutputDuplication * This); - - HRESULT ( STDMETHODCALLTYPE *ReleaseFrame )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseFrame )( IDXGIOutputDuplication * This); - + END_INTERFACE } IDXGIOutputDuplicationVtbl; @@ -414,54 +410,52 @@ EXTERN_C const IID IID_IDXGIOutputDuplication; CONST_VTBL struct IDXGIOutputDuplicationVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutputDuplication_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutputDuplication_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutputDuplication_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutputDuplication_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutputDuplication_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutputDuplication_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutputDuplication_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutputDuplication_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutputDuplication_AcquireNextFrame(This,TimeoutInMilliseconds,pFrameInfo,ppDesktopResource) \ - ( (This)->lpVtbl -> AcquireNextFrame(This,TimeoutInMilliseconds,pFrameInfo,ppDesktopResource) ) + ( (This)->lpVtbl -> AcquireNextFrame(This,TimeoutInMilliseconds,pFrameInfo,ppDesktopResource) ) #define IDXGIOutputDuplication_GetFrameDirtyRects(This,DirtyRectsBufferSize,pDirtyRectsBuffer,pDirtyRectsBufferSizeRequired) \ - ( (This)->lpVtbl -> GetFrameDirtyRects(This,DirtyRectsBufferSize,pDirtyRectsBuffer,pDirtyRectsBufferSizeRequired) ) + ( (This)->lpVtbl -> GetFrameDirtyRects(This,DirtyRectsBufferSize,pDirtyRectsBuffer,pDirtyRectsBufferSizeRequired) ) #define IDXGIOutputDuplication_GetFrameMoveRects(This,MoveRectsBufferSize,pMoveRectBuffer,pMoveRectsBufferSizeRequired) \ - ( (This)->lpVtbl -> GetFrameMoveRects(This,MoveRectsBufferSize,pMoveRectBuffer,pMoveRectsBufferSizeRequired) ) + ( (This)->lpVtbl -> GetFrameMoveRects(This,MoveRectsBufferSize,pMoveRectBuffer,pMoveRectsBufferSizeRequired) ) #define IDXGIOutputDuplication_GetFramePointerShape(This,PointerShapeBufferSize,pPointerShapeBuffer,pPointerShapeBufferSizeRequired,pPointerShapeInfo) \ - ( (This)->lpVtbl -> GetFramePointerShape(This,PointerShapeBufferSize,pPointerShapeBuffer,pPointerShapeBufferSizeRequired,pPointerShapeInfo) ) + ( (This)->lpVtbl -> GetFramePointerShape(This,PointerShapeBufferSize,pPointerShapeBuffer,pPointerShapeBufferSizeRequired,pPointerShapeInfo) ) #define IDXGIOutputDuplication_MapDesktopSurface(This,pLockedRect) \ - ( (This)->lpVtbl -> MapDesktopSurface(This,pLockedRect) ) + ( (This)->lpVtbl -> MapDesktopSurface(This,pLockedRect) ) #define IDXGIOutputDuplication_UnMapDesktopSurface(This) \ - ( (This)->lpVtbl -> UnMapDesktopSurface(This) ) + ( (This)->lpVtbl -> UnMapDesktopSurface(This) ) #define IDXGIOutputDuplication_ReleaseFrame(This) \ - ( (This)->lpVtbl -> ReleaseFrame(This) ) + ( (This)->lpVtbl -> ReleaseFrame(This) ) #endif /* COBJMACROS */ @@ -470,13 +464,13 @@ EXTERN_C const IID IID_IDXGIOutputDuplication; #endif /* __IDXGIOutputDuplication_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0002 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ /*#pragma endregion*/ /*#pragma region App Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ -typedef +typedef enum DXGI_ALPHA_MODE { DXGI_ALPHA_MODE_UNSPECIFIED = 0, @@ -493,117 +487,116 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0002_v0_0_s_ifspec; #define __IDXGISurface2_INTERFACE_DEFINED__ /* interface IDXGISurface2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISurface2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("aba496dd-b617-4cb8-a866-bc44d7eb1fa2") IDXGISurface2 : public IDXGISurface1 { public: - virtual HRESULT STDMETHODCALLTYPE GetResource( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE GetResource( + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppParentResource, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pSubresourceIndex) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISurface2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISurface2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISurface2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISurface2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISurface2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SURFACE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *Map )( + + HRESULT ( STDMETHODCALLTYPE *Map )( IDXGISurface2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MAPPED_RECT *pLockedRect, /* [in] */ UINT MapFlags); - - HRESULT ( STDMETHODCALLTYPE *Unmap )( + + HRESULT ( STDMETHODCALLTYPE *Unmap )( IDXGISurface2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetDC )( + + HRESULT ( STDMETHODCALLTYPE *GetDC )( IDXGISurface2 * This, /* [in] */ BOOL Discard, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HDC *phdc); - - HRESULT ( STDMETHODCALLTYPE *ReleaseDC )( + + HRESULT ( STDMETHODCALLTYPE *ReleaseDC )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ RECT *pDirtyRect); - - HRESULT ( STDMETHODCALLTYPE *GetResource )( + + HRESULT ( STDMETHODCALLTYPE *GetResource )( IDXGISurface2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppParentResource, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pSubresourceIndex); - + END_INTERFACE } IDXGISurface2Vtbl; @@ -612,51 +605,49 @@ EXTERN_C const IID IID_IDXGISurface2; CONST_VTBL struct IDXGISurface2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISurface2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISurface2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISurface2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISurface2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISurface2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISurface2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISurface2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISurface2_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISurface2_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISurface2_Map(This,pLockedRect,MapFlags) \ - ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) + ( (This)->lpVtbl -> Map(This,pLockedRect,MapFlags) ) #define IDXGISurface2_Unmap(This) \ - ( (This)->lpVtbl -> Unmap(This) ) + ( (This)->lpVtbl -> Unmap(This) ) #define IDXGISurface2_GetDC(This,Discard,phdc) \ - ( (This)->lpVtbl -> GetDC(This,Discard,phdc) ) + ( (This)->lpVtbl -> GetDC(This,Discard,phdc) ) #define IDXGISurface2_ReleaseDC(This,pDirtyRect) \ - ( (This)->lpVtbl -> ReleaseDC(This,pDirtyRect) ) + ( (This)->lpVtbl -> ReleaseDC(This,pDirtyRect) ) #define IDXGISurface2_GetResource(This,riid,ppParentResource,pSubresourceIndex) \ - ( (This)->lpVtbl -> GetResource(This,riid,ppParentResource,pSubresourceIndex) ) + ( (This)->lpVtbl -> GetResource(This,riid,ppParentResource,pSubresourceIndex) ) #endif /* COBJMACROS */ @@ -668,125 +659,124 @@ EXTERN_C const IID IID_IDXGISurface2; #define __IDXGIResource1_INTERFACE_DEFINED__ /* interface IDXGIResource1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIResource1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("30961379-4609-4a41-998e-54fe567ee0c1") IDXGIResource1 : public IDXGIResource { public: - virtual HRESULT STDMETHODCALLTYPE CreateSubresourceSurface( + virtual HRESULT STDMETHODCALLTYPE CreateSubresourceSurface( UINT index, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface2 **ppSurface) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSharedHandle( + /* [annotation][in] */ _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwAccess, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ LPCWSTR lpName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pHandle) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIResource1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIResource1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIResource1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIResource1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedHandle )( IDXGIResource1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pSharedHandle); - - HRESULT ( STDMETHODCALLTYPE *GetUsage )( + + HRESULT ( STDMETHODCALLTYPE *GetUsage )( IDXGIResource1 * This, /* [out] */ DXGI_USAGE *pUsage); - - HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetEvictionPriority )( IDXGIResource1 * This, /* [in] */ UINT EvictionPriority); - - HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetEvictionPriority )( IDXGIResource1 * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ UINT *pEvictionPriority); - - HRESULT ( STDMETHODCALLTYPE *CreateSubresourceSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSubresourceSurface )( IDXGIResource1 * This, UINT index, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface2 **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSharedHandle )( IDXGIResource1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const SECURITY_ATTRIBUTES *pAttributes, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwAccess, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ LPCWSTR lpName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HANDLE *pHandle); - + END_INTERFACE } IDXGIResource1Vtbl; @@ -795,51 +785,49 @@ EXTERN_C const IID IID_IDXGIResource1; CONST_VTBL struct IDXGIResource1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIResource1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIResource1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIResource1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIResource1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIResource1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIResource1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIResource1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIResource1_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGIResource1_GetSharedHandle(This,pSharedHandle) \ - ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) ) + ( (This)->lpVtbl -> GetSharedHandle(This,pSharedHandle) ) #define IDXGIResource1_GetUsage(This,pUsage) \ - ( (This)->lpVtbl -> GetUsage(This,pUsage) ) + ( (This)->lpVtbl -> GetUsage(This,pUsage) ) #define IDXGIResource1_SetEvictionPriority(This,EvictionPriority) \ - ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) + ( (This)->lpVtbl -> SetEvictionPriority(This,EvictionPriority) ) #define IDXGIResource1_GetEvictionPriority(This,pEvictionPriority) \ - ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) ) + ( (This)->lpVtbl -> GetEvictionPriority(This,pEvictionPriority) ) #define IDXGIResource1_CreateSubresourceSurface(This,index,ppSurface) \ - ( (This)->lpVtbl -> CreateSubresourceSurface(This,index,ppSurface) ) + ( (This)->lpVtbl -> CreateSubresourceSurface(This,index,ppSurface) ) #define IDXGIResource1_CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) \ - ( (This)->lpVtbl -> CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) ) + ( (This)->lpVtbl -> CreateSharedHandle(This,pAttributes,dwAccess,lpName,pHandle) ) #endif /* COBJMACROS */ @@ -848,14 +836,14 @@ EXTERN_C const IID IID_IDXGIResource1; #endif /* __IDXGIResource1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0004 */ -/* [local] */ +/* [local] */ -typedef +typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1, DXGI_OFFER_RESOURCE_PRIORITY_NORMAL = ( DXGI_OFFER_RESOURCE_PRIORITY_LOW + 1 ) , - DXGI_OFFER_RESOURCE_PRIORITY_HIGH = ( DXGI_OFFER_RESOURCE_PRIORITY_NORMAL + 1 ) + DXGI_OFFER_RESOURCE_PRIORITY_HIGH = ( DXGI_OFFER_RESOURCE_PRIORITY_NORMAL + 1 ) } DXGI_OFFER_RESOURCE_PRIORITY; extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0004_v0_0_c_ifspec; @@ -865,153 +853,152 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0004_v0_0_s_ifspec; #define __IDXGIDevice2_INTERFACE_DEFINED__ /* interface IDXGIDevice2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDevice2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("05008617-fbfd-4051-a790-144884b4f6a9") IDXGIDevice2 : public IDXGIDevice1 { public: - virtual HRESULT STDMETHODCALLTYPE OfferResources( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE OfferResources( + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReclaimResources( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE ReclaimResources( + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_opt_(NumResources) BOOL *pDiscarded) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnqueueSetEvent( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE EnqueueSetEvent( + /* [annotation][in] */ _In_ HANDLE hEvent) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDevice2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDevice2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDevice2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDevice2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetAdapter )( + + HRESULT ( STDMETHODCALLTYPE *GetAdapter )( IDXGIDevice2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter); - - HRESULT ( STDMETHODCALLTYPE *CreateSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSurface )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( + + HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( IDXGIDevice2 * This, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources); - - HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( IDXGIDevice2 * This, /* [in] */ INT Priority); - - HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( IDXGIDevice2 * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ INT *pPriority); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGIDevice2 * This, /* [in] */ UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGIDevice2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HRESULT ( STDMETHODCALLTYPE *OfferResources )( + + HRESULT ( STDMETHODCALLTYPE *OfferResources )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority); - - HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( + + HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_opt_(NumResources) BOOL *pDiscarded); - - HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( + + HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( IDXGIDevice2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent); - + END_INTERFACE } IDXGIDevice2Vtbl; @@ -1020,60 +1007,58 @@ EXTERN_C const IID IID_IDXGIDevice2; CONST_VTBL struct IDXGIDevice2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDevice2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDevice2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDevice2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDevice2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDevice2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDevice2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDevice2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDevice2_GetAdapter(This,pAdapter) \ - ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) + ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) #define IDXGIDevice2_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) \ - ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) + ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) #define IDXGIDevice2_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) \ - ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) + ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) #define IDXGIDevice2_SetGPUThreadPriority(This,Priority) \ - ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) + ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) #define IDXGIDevice2_GetGPUThreadPriority(This,pPriority) \ - ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) + ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) #define IDXGIDevice2_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGIDevice2_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGIDevice2_OfferResources(This,NumResources,ppResources,Priority) \ - ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) + ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) #define IDXGIDevice2_ReclaimResources(This,NumResources,ppResources,pDiscarded) \ - ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) + ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) #define IDXGIDevice2_EnqueueSetEvent(This,hEvent) \ - ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) + ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) #endif /* COBJMACROS */ @@ -1082,7 +1067,7 @@ EXTERN_C const IID IID_IDXGIDevice2; #endif /* __IDXGIDevice2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0005 */ -/* [local] */ +/* [local] */ #define DXGI_ENUM_MODES_STEREO ( 4UL ) @@ -1103,7 +1088,7 @@ typedef struct DXGI_MODE_DESC1 BOOL Stereo; } DXGI_MODE_DESC1; -typedef +typedef enum DXGI_SCALING { DXGI_SCALING_STRETCH = 0, @@ -1137,7 +1122,7 @@ typedef struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC typedef struct DXGI_PRESENT_PARAMETERS { UINT DirtyRectsCount; - /* [annotation] */ + /* [annotation] */ _Field_size_full_opt_(DirtyRectsCount) RECT *pDirtyRects; RECT *pScrollRect; POINT *pScrollOffset; @@ -1150,237 +1135,236 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0005_v0_0_s_ifspec; #define __IDXGISwapChain1_INTERFACE_DEFINED__ /* interface IDXGISwapChain1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChain1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("790a45f7-0d42-4876-983a-0a55cfe6f4aa") IDXGISwapChain1 : public IDXGISwapChain { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc1( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc1( + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC1 *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFullscreenDesc( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetFullscreenDesc( + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetHwnd( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetHwnd( + /* [annotation][out] */ _Out_ HWND *pHwnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCoreWindow( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetCoreWindow( + /* [annotation][in] */ _In_ REFIID refiid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppUnk) = 0; - - virtual HRESULT STDMETHODCALLTYPE Present1( + + virtual HRESULT STDMETHODCALLTYPE Present1( /* [in] */ UINT SyncInterval, /* [in] */ UINT PresentFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_PRESENT_PARAMETERS *pPresentParameters) = 0; - + virtual BOOL STDMETHODCALLTYPE IsTemporaryMonoSupported( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRestrictToOutput( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetRestrictToOutput( + /* [annotation][out] */ _Out_ IDXGIOutput **ppRestrictToOutput) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBackgroundColor( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetBackgroundColor( + /* [annotation][in] */ _In_ const DXGI_RGBA *pColor) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetBackgroundColor( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetBackgroundColor( + /* [annotation][out] */ _Out_ DXGI_RGBA *pColor) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetRotation( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetRotation( + /* [annotation][in] */ _In_ DXGI_MODE_ROTATION Rotation) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRotation( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetRotation( + /* [annotation][out] */ _Out_ DXGI_MODE_ROTATION *pRotation) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChain1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChain1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChain1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChain1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *Present )( + + HRESULT ( STDMETHODCALLTYPE *Present )( IDXGISwapChain1 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetBuffer )( IDXGISwapChain1 * This, /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( IDXGISwapChain1 * This, /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( IDXGISwapChain1 * This, /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters); - - HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( + + HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pLastPresentCount); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetHwnd )( + + HRESULT ( STDMETHODCALLTYPE *GetHwnd )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pHwnd); - - HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID refiid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppUnk); - - HRESULT ( STDMETHODCALLTYPE *Present1 )( + + HRESULT ( STDMETHODCALLTYPE *Present1 )( IDXGISwapChain1 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT PresentFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_PRESENT_PARAMETERS *pPresentParameters); - - BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( + + BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( IDXGISwapChain1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ IDXGIOutput **ppRestrictToOutput); - - HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *SetRotation )( + + HRESULT ( STDMETHODCALLTYPE *SetRotation )( IDXGISwapChain1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MODE_ROTATION Rotation); - - HRESULT ( STDMETHODCALLTYPE *GetRotation )( + + HRESULT ( STDMETHODCALLTYPE *GetRotation )( IDXGISwapChain1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_ROTATION *pRotation); - + END_INTERFACE } IDXGISwapChain1Vtbl; @@ -1389,96 +1373,94 @@ EXTERN_C const IID IID_IDXGISwapChain1; CONST_VTBL struct IDXGISwapChain1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChain1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChain1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChain1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChain1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISwapChain1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISwapChain1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISwapChain1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISwapChain1_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISwapChain1_Present(This,SyncInterval,Flags) \ - ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) + ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) #define IDXGISwapChain1_GetBuffer(This,Buffer,riid,ppSurface) \ - ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) + ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) #define IDXGISwapChain1_SetFullscreenState(This,Fullscreen,pTarget) \ - ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) + ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) #define IDXGISwapChain1_GetFullscreenState(This,pFullscreen,ppTarget) \ - ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) + ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) #define IDXGISwapChain1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISwapChain1_ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) \ - ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) + ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) #define IDXGISwapChain1_ResizeTarget(This,pNewTargetParameters) \ - ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) + ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) #define IDXGISwapChain1_GetContainingOutput(This,ppOutput) \ - ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) + ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) #define IDXGISwapChain1_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGISwapChain1_GetLastPresentCount(This,pLastPresentCount) \ - ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) + ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) #define IDXGISwapChain1_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGISwapChain1_GetFullscreenDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) #define IDXGISwapChain1_GetHwnd(This,pHwnd) \ - ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) + ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) #define IDXGISwapChain1_GetCoreWindow(This,refiid,ppUnk) \ - ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) + ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) #define IDXGISwapChain1_Present1(This,SyncInterval,PresentFlags,pPresentParameters) \ - ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) + ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) #define IDXGISwapChain1_IsTemporaryMonoSupported(This) \ - ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) + ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) #define IDXGISwapChain1_GetRestrictToOutput(This,ppRestrictToOutput) \ - ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) + ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) #define IDXGISwapChain1_SetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) #define IDXGISwapChain1_GetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) #define IDXGISwapChain1_SetRotation(This,Rotation) \ - ( (This)->lpVtbl -> SetRotation(This,Rotation) ) + ( (This)->lpVtbl -> SetRotation(This,Rotation) ) #define IDXGISwapChain1_GetRotation(This,pRotation) \ - ( (This)->lpVtbl -> GetRotation(This,pRotation) ) + ( (This)->lpVtbl -> GetRotation(This,pRotation) ) #endif /* COBJMACROS */ @@ -1490,279 +1472,278 @@ EXTERN_C const IID IID_IDXGISwapChain1; #define __IDXGIFactory2_INTERFACE_DEFINED__ /* interface IDXGIFactory2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("50c83a1c-e072-4c48-87b0-3630fa36a6d0") IDXGIFactory2 : public IDXGIFactory1 { public: virtual BOOL STDMETHODCALLTYPE IsWindowedStereoEnabled( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForHwnd( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForHwnd( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND hWnd, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForCoreWindow( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForCoreWindow( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pWindow, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSharedResourceAdapterLuid( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetSharedResourceAdapterLuid( + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _Out_ LUID *pLuid) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterStereoStatusWindow( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE RegisterStereoStatusWindow( + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterStereoStatusEvent( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE RegisterStereoStatusEvent( + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual void STDMETHODCALLTYPE UnregisterStereoStatus( - /* [annotation][in] */ + + virtual void STDMETHODCALLTYPE UnregisterStereoStatus( + /* [annotation][in] */ _In_ DWORD dwCookie) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterOcclusionStatusWindow( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE RegisterOcclusionStatusWindow( + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterOcclusionStatusEvent( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE RegisterOcclusionStatusEvent( + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual void STDMETHODCALLTYPE UnregisterOcclusionStatus( - /* [annotation][in] */ + + virtual void STDMETHODCALLTYPE UnregisterOcclusionStatus( + /* [annotation][in] */ _In_ DWORD dwCookie) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForComposition( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForComposition( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactory2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory2 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory2 * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory2 * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( IDXGIFactory2 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter); - - BOOL ( STDMETHODCALLTYPE *IsCurrent )( + + BOOL ( STDMETHODCALLTYPE *IsCurrent )( IDXGIFactory2 * This); - - BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( IDXGIFactory2 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND hWnd, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pWindow, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( IDXGIFactory2 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _Out_ LUID *pLuid); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( + + void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( + + void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( IDXGIFactory2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - + END_INTERFACE } IDXGIFactory2Vtbl; @@ -1771,84 +1752,82 @@ EXTERN_C const IID IID_IDXGIFactory2; CONST_VTBL struct IDXGIFactory2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory2_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory2_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory2_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory2_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory2_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #define IDXGIFactory2_EnumAdapters1(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) #define IDXGIFactory2_IsCurrent(This) \ - ( (This)->lpVtbl -> IsCurrent(This) ) + ( (This)->lpVtbl -> IsCurrent(This) ) #define IDXGIFactory2_IsWindowedStereoEnabled(This) \ - ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) + ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) #define IDXGIFactory2_CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory2_CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory2_GetSharedResourceAdapterLuid(This,hResource,pLuid) \ - ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) + ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) #define IDXGIFactory2_RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory2_RegisterStereoStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory2_UnregisterStereoStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) #define IDXGIFactory2_RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory2_RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory2_UnregisterOcclusionStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) #define IDXGIFactory2_CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) #endif /* COBJMACROS */ @@ -1857,9 +1836,9 @@ EXTERN_C const IID IID_IDXGIFactory2; #endif /* __IDXGIFactory2_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0007 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY { DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY = 0, @@ -1869,7 +1848,7 @@ enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY DXGI_GRAPHICS_PREEMPTION_INSTRUCTION_BOUNDARY = 4 } DXGI_GRAPHICS_PREEMPTION_GRANULARITY; -typedef +typedef enum DXGI_COMPUTE_PREEMPTION_GRANULARITY { DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY = 0, @@ -1902,100 +1881,99 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_2_0000_0007_v0_0_s_ifspec; #define __IDXGIAdapter2_INTERFACE_DEFINED__ /* interface IDXGIAdapter2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIAdapter2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("0AA1AE0A-FA0E-4B84-8644-E05FF8E5ACB5") IDXGIAdapter2 : public IDXGIAdapter1 { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc2( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc2( + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC2 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIAdapter2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIAdapter2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIAdapter2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIAdapter2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIAdapter2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIAdapter2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIAdapter2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIAdapter2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( + + HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( IDXGIAdapter2 * This, /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIAdapter2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( IDXGIAdapter2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGIAdapter2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( IDXGIAdapter2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC2 *pDesc); - + END_INTERFACE } IDXGIAdapter2Vtbl; @@ -2004,45 +1982,43 @@ EXTERN_C const IID IID_IDXGIAdapter2; CONST_VTBL struct IDXGIAdapter2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIAdapter2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIAdapter2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIAdapter2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIAdapter2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIAdapter2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIAdapter2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIAdapter2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIAdapter2_EnumOutputs(This,Output,ppOutput) \ - ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) + ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) #define IDXGIAdapter2_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIAdapter2_CheckInterfaceSupport(This,InterfaceName,pUMDVersion) \ - ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) + ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) #define IDXGIAdapter2_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGIAdapter2_GetDesc2(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) #endif /* COBJMACROS */ @@ -2054,189 +2030,188 @@ EXTERN_C const IID IID_IDXGIAdapter2; #define __IDXGIOutput1_INTERFACE_DEFINED__ /* interface IDXGIOutput1 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("00cddea8-939b-4b83-a340-a685226666cc") IDXGIOutput1 : public IDXGIOutput { public: - virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList1( + virtual HRESULT STDMETHODCALLTYPE GetDisplayModeList1( /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode1( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE FindClosestMatchingMode1( + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData1( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData1( + /* [annotation][in] */ _In_ IDXGIResource *pDestination) = 0; - - virtual HRESULT STDMETHODCALLTYPE DuplicateOutput( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE DuplicateOutput( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput1 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput1 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput1 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput1 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput1 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput1 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput1 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - + END_INTERFACE } IDXGIOutput1Vtbl; @@ -2245,78 +2220,76 @@ EXTERN_C const IID IID_IDXGIOutput1; CONST_VTBL struct IDXGIOutput1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput1_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput1_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput1_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput1_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput1_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput1_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput1_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput1_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput1_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput1_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput1_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput1_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput1_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput1_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput1_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput1_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput1_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput1_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput1_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput1_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #endif /* COBJMACROS */ @@ -2325,7 +2298,7 @@ EXTERN_C const IID IID_IDXGIOutput1; #endif /* __IDXGIOutput1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_2_0000_0009 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxgi1_3.h b/gfx/include/dxsdk/dxgi1_3.h index 3b0470e2e8..e98b3419ce 100644 --- a/gfx/include/dxsdk/dxgi1_3.h +++ b/gfx/include/dxsdk/dxgi1_3.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIDevice3_FWD_DEFINED__ #define __IDXGIDevice3_FWD_DEFINED__ @@ -88,10 +88,10 @@ typedef interface IDXGIOutput3 IDXGIOutput3; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi1_3_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ @@ -107,138 +107,137 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_3_0000_0000_v0_0_s_ifspec; #define __IDXGIDevice3_INTERFACE_DEFINED__ /* interface IDXGIDevice3 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDevice3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("6007896c-3244-4afd-bf18-a6d3beda5023") IDXGIDevice3 : public IDXGIDevice2 { public: virtual void STDMETHODCALLTYPE Trim( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDevice3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDevice3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDevice3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDevice3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetAdapter )( + + HRESULT ( STDMETHODCALLTYPE *GetAdapter )( IDXGIDevice3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter); - - HRESULT ( STDMETHODCALLTYPE *CreateSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSurface )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( + + HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( IDXGIDevice3 * This, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources); - - HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( IDXGIDevice3 * This, /* [in] */ INT Priority); - - HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( IDXGIDevice3 * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ INT *pPriority); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGIDevice3 * This, /* [in] */ UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGIDevice3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HRESULT ( STDMETHODCALLTYPE *OfferResources )( + + HRESULT ( STDMETHODCALLTYPE *OfferResources )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority); - - HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( + + HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_opt_(NumResources) BOOL *pDiscarded); - - HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( + + HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( IDXGIDevice3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent); - - void ( STDMETHODCALLTYPE *Trim )( + + void ( STDMETHODCALLTYPE *Trim )( IDXGIDevice3 * This); - + END_INTERFACE } IDXGIDevice3Vtbl; @@ -247,63 +246,61 @@ EXTERN_C const IID IID_IDXGIDevice3; CONST_VTBL struct IDXGIDevice3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDevice3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDevice3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDevice3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDevice3_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDevice3_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDevice3_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDevice3_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDevice3_GetAdapter(This,pAdapter) \ - ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) + ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) #define IDXGIDevice3_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) \ - ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) + ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) #define IDXGIDevice3_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) \ - ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) + ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) #define IDXGIDevice3_SetGPUThreadPriority(This,Priority) \ - ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) + ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) #define IDXGIDevice3_GetGPUThreadPriority(This,pPriority) \ - ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) + ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) #define IDXGIDevice3_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGIDevice3_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGIDevice3_OfferResources(This,NumResources,ppResources,Priority) \ - ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) + ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) #define IDXGIDevice3_ReclaimResources(This,NumResources,ppResources,pDiscarded) \ - ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) + ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) #define IDXGIDevice3_EnqueueSetEvent(This,hEvent) \ - ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) + ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) #define IDXGIDevice3_Trim(This) \ - ( (This)->lpVtbl -> Trim(This) ) + ( (This)->lpVtbl -> Trim(This) ) #endif /* COBJMACROS */ @@ -312,7 +309,7 @@ EXTERN_C const IID IID_IDXGIDevice3; #endif /* __IDXGIDevice3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_3_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct DXGI_MATRIX_3X2_F { @@ -331,250 +328,249 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_3_0000_0001_v0_0_s_ifspec; #define __IDXGISwapChain2_INTERFACE_DEFINED__ /* interface IDXGISwapChain2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChain2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("a8be2ac4-199f-4946-b331-79599fb98de7") IDXGISwapChain2 : public IDXGISwapChain1 { public: - virtual HRESULT STDMETHODCALLTYPE SetSourceSize( + virtual HRESULT STDMETHODCALLTYPE SetSourceSize( UINT Width, UINT Height) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSourceSize( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetSourceSize( + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency( + + virtual HRESULT STDMETHODCALLTYPE SetMaximumFrameLatency( UINT MaxLatency) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetMaximumFrameLatency( + /* [annotation][out] */ _Out_ UINT *pMaxLatency) = 0; - + virtual HANDLE STDMETHODCALLTYPE GetFrameLatencyWaitableObject( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMatrixTransform( + + virtual HRESULT STDMETHODCALLTYPE SetMatrixTransform( const DXGI_MATRIX_3X2_F *pMatrix) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMatrixTransform( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetMatrixTransform( + /* [annotation][out] */ _Out_ DXGI_MATRIX_3X2_F *pMatrix) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChain2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChain2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChain2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChain2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *Present )( + + HRESULT ( STDMETHODCALLTYPE *Present )( IDXGISwapChain2 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetBuffer )( IDXGISwapChain2 * This, /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( IDXGISwapChain2 * This, /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( IDXGISwapChain2 * This, /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters); - - HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( + + HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pLastPresentCount); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetHwnd )( + + HRESULT ( STDMETHODCALLTYPE *GetHwnd )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pHwnd); - - HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID refiid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppUnk); - - HRESULT ( STDMETHODCALLTYPE *Present1 )( + + HRESULT ( STDMETHODCALLTYPE *Present1 )( IDXGISwapChain2 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT PresentFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_PRESENT_PARAMETERS *pPresentParameters); - - BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( + + BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( IDXGISwapChain2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ IDXGIOutput **ppRestrictToOutput); - - HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *SetRotation )( + + HRESULT ( STDMETHODCALLTYPE *SetRotation )( IDXGISwapChain2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MODE_ROTATION Rotation); - - HRESULT ( STDMETHODCALLTYPE *GetRotation )( + + HRESULT ( STDMETHODCALLTYPE *GetRotation )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_ROTATION *pRotation); - - HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( IDXGISwapChain2 * This, UINT Width, UINT Height); - - HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGISwapChain2 * This, UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( + + HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( IDXGISwapChain2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( IDXGISwapChain2 * This, const DXGI_MATRIX_3X2_F *pMatrix); - - HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( IDXGISwapChain2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MATRIX_3X2_F *pMatrix); - + END_INTERFACE } IDXGISwapChain2Vtbl; @@ -583,117 +579,115 @@ EXTERN_C const IID IID_IDXGISwapChain2; CONST_VTBL struct IDXGISwapChain2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChain2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChain2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChain2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChain2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISwapChain2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISwapChain2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISwapChain2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISwapChain2_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISwapChain2_Present(This,SyncInterval,Flags) \ - ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) + ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) #define IDXGISwapChain2_GetBuffer(This,Buffer,riid,ppSurface) \ - ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) + ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) #define IDXGISwapChain2_SetFullscreenState(This,Fullscreen,pTarget) \ - ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) + ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) #define IDXGISwapChain2_GetFullscreenState(This,pFullscreen,ppTarget) \ - ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) + ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) #define IDXGISwapChain2_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISwapChain2_ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) \ - ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) + ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) #define IDXGISwapChain2_ResizeTarget(This,pNewTargetParameters) \ - ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) + ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) #define IDXGISwapChain2_GetContainingOutput(This,ppOutput) \ - ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) + ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) #define IDXGISwapChain2_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGISwapChain2_GetLastPresentCount(This,pLastPresentCount) \ - ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) + ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) #define IDXGISwapChain2_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGISwapChain2_GetFullscreenDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) #define IDXGISwapChain2_GetHwnd(This,pHwnd) \ - ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) + ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) #define IDXGISwapChain2_GetCoreWindow(This,refiid,ppUnk) \ - ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) + ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) #define IDXGISwapChain2_Present1(This,SyncInterval,PresentFlags,pPresentParameters) \ - ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) + ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) #define IDXGISwapChain2_IsTemporaryMonoSupported(This) \ - ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) + ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) #define IDXGISwapChain2_GetRestrictToOutput(This,ppRestrictToOutput) \ - ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) + ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) #define IDXGISwapChain2_SetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) #define IDXGISwapChain2_GetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) #define IDXGISwapChain2_SetRotation(This,Rotation) \ - ( (This)->lpVtbl -> SetRotation(This,Rotation) ) + ( (This)->lpVtbl -> SetRotation(This,Rotation) ) #define IDXGISwapChain2_GetRotation(This,pRotation) \ - ( (This)->lpVtbl -> GetRotation(This,pRotation) ) + ( (This)->lpVtbl -> GetRotation(This,pRotation) ) #define IDXGISwapChain2_SetSourceSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) #define IDXGISwapChain2_GetSourceSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) #define IDXGISwapChain2_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGISwapChain2_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGISwapChain2_GetFrameLatencyWaitableObject(This) \ - ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) + ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) #define IDXGISwapChain2_SetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) #define IDXGISwapChain2_GetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) #endif /* COBJMACROS */ @@ -705,168 +699,167 @@ EXTERN_C const IID IID_IDXGISwapChain2; #define __IDXGIOutput2_INTERFACE_DEFINED__ /* interface IDXGIOutput2 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("595e39d1-2724-4663-99b1-da969de28364") IDXGIOutput2 : public IDXGIOutput1 { public: virtual BOOL STDMETHODCALLTYPE SupportsOverlays( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput2 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput2 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput2 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput2 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput2 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput2 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput2 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput2 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( + + BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( IDXGIOutput2 * This); - + END_INTERFACE } IDXGIOutput2Vtbl; @@ -875,81 +868,79 @@ EXTERN_C const IID IID_IDXGIOutput2; CONST_VTBL struct IDXGIOutput2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput2_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput2_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput2_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput2_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput2_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput2_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput2_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput2_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput2_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput2_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput2_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput2_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput2_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput2_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput2_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput2_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput2_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput2_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput2_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput2_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #define IDXGIOutput2_SupportsOverlays(This) \ - ( (This)->lpVtbl -> SupportsOverlays(This) ) + ( (This)->lpVtbl -> SupportsOverlays(This) ) #endif /* COBJMACROS */ @@ -961,204 +952,203 @@ EXTERN_C const IID IID_IDXGIOutput2; #define __IDXGIFactory3_INTERFACE_DEFINED__ /* interface IDXGIFactory3 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("25483823-cd46-4c7d-86ca-47aa95b837bd") IDXGIFactory3 : public IDXGIFactory2 { public: virtual UINT STDMETHODCALLTYPE GetCreationFlags( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactory3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory3 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory3 * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory3 * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( IDXGIFactory3 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter); - - BOOL ( STDMETHODCALLTYPE *IsCurrent )( + + BOOL ( STDMETHODCALLTYPE *IsCurrent )( IDXGIFactory3 * This); - - BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( IDXGIFactory3 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND hWnd, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pWindow, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( IDXGIFactory3 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _Out_ LUID *pLuid); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( + + void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( + + void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( IDXGIFactory3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( IDXGIFactory3 * This); - + END_INTERFACE } IDXGIFactory3Vtbl; @@ -1167,87 +1157,85 @@ EXTERN_C const IID IID_IDXGIFactory3; CONST_VTBL struct IDXGIFactory3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory3_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory3_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory3_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory3_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory3_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory3_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory3_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory3_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory3_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #define IDXGIFactory3_EnumAdapters1(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) #define IDXGIFactory3_IsCurrent(This) \ - ( (This)->lpVtbl -> IsCurrent(This) ) + ( (This)->lpVtbl -> IsCurrent(This) ) #define IDXGIFactory3_IsWindowedStereoEnabled(This) \ - ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) + ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) #define IDXGIFactory3_CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory3_CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory3_GetSharedResourceAdapterLuid(This,hResource,pLuid) \ - ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) + ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) #define IDXGIFactory3_RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory3_RegisterStereoStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory3_UnregisterStereoStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) #define IDXGIFactory3_RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory3_RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory3_UnregisterOcclusionStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) #define IDXGIFactory3_CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory3_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #endif /* COBJMACROS */ @@ -1256,7 +1244,7 @@ EXTERN_C const IID IID_IDXGIFactory3; #endif /* __IDXGIFactory3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_3_0000_0004 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ @@ -1267,7 +1255,7 @@ typedef struct DXGI_DECODE_SWAP_CHAIN_DESC UINT Flags; } DXGI_DECODE_SWAP_CHAIN_DESC; -typedef +typedef enum DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS { DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_NOMINAL_RANGE = 0x1, @@ -1282,114 +1270,113 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_3_0000_0004_v0_0_s_ifspec; #define __IDXGIDecodeSwapChain_INTERFACE_DEFINED__ /* interface IDXGIDecodeSwapChain */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDecodeSwapChain; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("2633066b-4514-4c7a-8fd8-12ea98059d18") IDXGIDecodeSwapChain : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE PresentBuffer( + virtual HRESULT STDMETHODCALLTYPE PresentBuffer( UINT BufferToPresent, UINT SyncInterval, UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSourceRect( + + virtual HRESULT STDMETHODCALLTYPE SetSourceRect( const RECT *pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetTargetRect( + + virtual HRESULT STDMETHODCALLTYPE SetTargetRect( const RECT *pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDestSize( + + virtual HRESULT STDMETHODCALLTYPE SetDestSize( UINT Width, UINT Height) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSourceRect( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetSourceRect( + /* [annotation][out] */ _Out_ RECT *pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTargetRect( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetTargetRect( + /* [annotation][out] */ _Out_ RECT *pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetDestSize( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE GetDestSize( + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetColorSpace( + + virtual HRESULT STDMETHODCALLTYPE SetColorSpace( DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS ColorSpace) = 0; - + virtual DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS STDMETHODCALLTYPE GetColorSpace( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDecodeSwapChainVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDecodeSwapChain * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDecodeSwapChain * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDecodeSwapChain * This); - - HRESULT ( STDMETHODCALLTYPE *PresentBuffer )( + + HRESULT ( STDMETHODCALLTYPE *PresentBuffer )( IDXGIDecodeSwapChain * This, UINT BufferToPresent, UINT SyncInterval, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *SetSourceRect )( + + HRESULT ( STDMETHODCALLTYPE *SetSourceRect )( IDXGIDecodeSwapChain * This, const RECT *pRect); - - HRESULT ( STDMETHODCALLTYPE *SetTargetRect )( + + HRESULT ( STDMETHODCALLTYPE *SetTargetRect )( IDXGIDecodeSwapChain * This, const RECT *pRect); - - HRESULT ( STDMETHODCALLTYPE *SetDestSize )( + + HRESULT ( STDMETHODCALLTYPE *SetDestSize )( IDXGIDecodeSwapChain * This, UINT Width, UINT Height); - - HRESULT ( STDMETHODCALLTYPE *GetSourceRect )( + + HRESULT ( STDMETHODCALLTYPE *GetSourceRect )( IDXGIDecodeSwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ RECT *pRect); - - HRESULT ( STDMETHODCALLTYPE *GetTargetRect )( + + HRESULT ( STDMETHODCALLTYPE *GetTargetRect )( IDXGIDecodeSwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ RECT *pRect); - - HRESULT ( STDMETHODCALLTYPE *GetDestSize )( + + HRESULT ( STDMETHODCALLTYPE *GetDestSize )( IDXGIDecodeSwapChain * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight); - - HRESULT ( STDMETHODCALLTYPE *SetColorSpace )( + + HRESULT ( STDMETHODCALLTYPE *SetColorSpace )( IDXGIDecodeSwapChain * This, DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS ColorSpace); - - DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS ( STDMETHODCALLTYPE *GetColorSpace )( + + DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS ( STDMETHODCALLTYPE *GetColorSpace )( IDXGIDecodeSwapChain * This); - + END_INTERFACE } IDXGIDecodeSwapChainVtbl; @@ -1398,45 +1385,43 @@ EXTERN_C const IID IID_IDXGIDecodeSwapChain; CONST_VTBL struct IDXGIDecodeSwapChainVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDecodeSwapChain_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDecodeSwapChain_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDecodeSwapChain_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDecodeSwapChain_PresentBuffer(This,BufferToPresent,SyncInterval,Flags) \ - ( (This)->lpVtbl -> PresentBuffer(This,BufferToPresent,SyncInterval,Flags) ) + ( (This)->lpVtbl -> PresentBuffer(This,BufferToPresent,SyncInterval,Flags) ) #define IDXGIDecodeSwapChain_SetSourceRect(This,pRect) \ - ( (This)->lpVtbl -> SetSourceRect(This,pRect) ) + ( (This)->lpVtbl -> SetSourceRect(This,pRect) ) #define IDXGIDecodeSwapChain_SetTargetRect(This,pRect) \ - ( (This)->lpVtbl -> SetTargetRect(This,pRect) ) + ( (This)->lpVtbl -> SetTargetRect(This,pRect) ) #define IDXGIDecodeSwapChain_SetDestSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetDestSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetDestSize(This,Width,Height) ) #define IDXGIDecodeSwapChain_GetSourceRect(This,pRect) \ - ( (This)->lpVtbl -> GetSourceRect(This,pRect) ) + ( (This)->lpVtbl -> GetSourceRect(This,pRect) ) #define IDXGIDecodeSwapChain_GetTargetRect(This,pRect) \ - ( (This)->lpVtbl -> GetTargetRect(This,pRect) ) + ( (This)->lpVtbl -> GetTargetRect(This,pRect) ) #define IDXGIDecodeSwapChain_GetDestSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetDestSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetDestSize(This,pWidth,pHeight) ) #define IDXGIDecodeSwapChain_SetColorSpace(This,ColorSpace) \ - ( (This)->lpVtbl -> SetColorSpace(This,ColorSpace) ) + ( (This)->lpVtbl -> SetColorSpace(This,ColorSpace) ) #define IDXGIDecodeSwapChain_GetColorSpace(This) \ - ( (This)->lpVtbl -> GetColorSpace(This) ) + ( (This)->lpVtbl -> GetColorSpace(This) ) #endif /* COBJMACROS */ @@ -1448,91 +1433,90 @@ EXTERN_C const IID IID_IDXGIDecodeSwapChain; #define __IDXGIFactoryMedia_INTERFACE_DEFINED__ /* interface IDXGIFactoryMedia */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactoryMedia; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("41e7d1f2-a591-4f7b-a2e5-fa9c843e1c12") IDXGIFactoryMedia : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForCompositionSurfaceHandle( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE CreateSwapChainForCompositionSurfaceHandle( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ HANDLE hSurface, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateDecodeSwapChainForCompositionSurfaceHandle( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CreateDecodeSwapChainForCompositionSurfaceHandle( + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ HANDLE hSurface, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_DECODE_SWAP_CHAIN_DESC *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pYuvDecodeBuffers, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIDecodeSwapChain **ppSwapChain) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactoryMediaVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactoryMedia * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactoryMedia * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactoryMedia * This); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCompositionSurfaceHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCompositionSurfaceHandle )( IDXGIFactoryMedia * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ HANDLE hSurface, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateDecodeSwapChainForCompositionSurfaceHandle )( + + HRESULT ( STDMETHODCALLTYPE *CreateDecodeSwapChainForCompositionSurfaceHandle )( IDXGIFactoryMedia * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ HANDLE hSurface, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_DECODE_SWAP_CHAIN_DESC *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pYuvDecodeBuffers, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIDecodeSwapChain **ppSwapChain); - + END_INTERFACE } IDXGIFactoryMediaVtbl; @@ -1541,24 +1525,22 @@ EXTERN_C const IID IID_IDXGIFactoryMedia; CONST_VTBL struct IDXGIFactoryMediaVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactoryMedia_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactoryMedia_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactoryMedia_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactoryMedia_CreateSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactoryMedia_CreateDecodeSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pYuvDecodeBuffers,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateDecodeSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pYuvDecodeBuffers,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateDecodeSwapChainForCompositionSurfaceHandle(This,pDevice,hSurface,pDesc,pYuvDecodeBuffers,pRestrictToOutput,ppSwapChain) ) #endif /* COBJMACROS */ @@ -1567,9 +1549,9 @@ EXTERN_C const IID IID_IDXGIFactoryMedia; #endif /* __IDXGIFactoryMedia_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_3_0000_0006 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_FRAME_PRESENTATION_MODE { DXGI_FRAME_PRESENTATION_MODE_COMPOSED = 0, @@ -1596,68 +1578,67 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_3_0000_0006_v0_0_s_ifspec; #define __IDXGISwapChainMedia_INTERFACE_DEFINED__ /* interface IDXGISwapChainMedia */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChainMedia; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("dd95b90b-f05f-4f6a-bd65-25bfb264bd84") IDXGISwapChainMedia : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE GetFrameStatisticsMedia( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetFrameStatisticsMedia( + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS_MEDIA *pStats) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPresentDuration( + + virtual HRESULT STDMETHODCALLTYPE SetPresentDuration( UINT Duration) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckPresentDurationSupport( + + virtual HRESULT STDMETHODCALLTYPE CheckPresentDurationSupport( UINT DesiredPresentDuration, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pClosestSmallerPresentDuration, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pClosestLargerPresentDuration) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChainMediaVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChainMedia * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChainMedia * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChainMedia * This); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatisticsMedia )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatisticsMedia )( IDXGISwapChainMedia * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS_MEDIA *pStats); - - HRESULT ( STDMETHODCALLTYPE *SetPresentDuration )( + + HRESULT ( STDMETHODCALLTYPE *SetPresentDuration )( IDXGISwapChainMedia * This, UINT Duration); - - HRESULT ( STDMETHODCALLTYPE *CheckPresentDurationSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckPresentDurationSupport )( IDXGISwapChainMedia * This, UINT DesiredPresentDuration, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pClosestSmallerPresentDuration, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pClosestLargerPresentDuration); - + END_INTERFACE } IDXGISwapChainMediaVtbl; @@ -1666,27 +1647,25 @@ EXTERN_C const IID IID_IDXGISwapChainMedia; CONST_VTBL struct IDXGISwapChainMediaVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChainMedia_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChainMedia_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChainMedia_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChainMedia_GetFrameStatisticsMedia(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatisticsMedia(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatisticsMedia(This,pStats) ) #define IDXGISwapChainMedia_SetPresentDuration(This,Duration) \ - ( (This)->lpVtbl -> SetPresentDuration(This,Duration) ) + ( (This)->lpVtbl -> SetPresentDuration(This,Duration) ) #define IDXGISwapChainMedia_CheckPresentDurationSupport(This,DesiredPresentDuration,pClosestSmallerPresentDuration,pClosestLargerPresentDuration) \ - ( (This)->lpVtbl -> CheckPresentDurationSupport(This,DesiredPresentDuration,pClosestSmallerPresentDuration,pClosestLargerPresentDuration) ) + ( (This)->lpVtbl -> CheckPresentDurationSupport(This,DesiredPresentDuration,pClosestSmallerPresentDuration,pClosestLargerPresentDuration) ) #endif /* COBJMACROS */ @@ -1695,9 +1674,9 @@ EXTERN_C const IID IID_IDXGISwapChainMedia; #endif /* __IDXGISwapChainMedia_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_3_0000_0007 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_OVERLAY_SUPPORT_FLAG { DXGI_OVERLAY_SUPPORT_FLAG_DIRECT = 0x1, @@ -1716,183 +1695,182 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_3_0000_0007_v0_0_s_ifspec; #define __IDXGIOutput3_INTERFACE_DEFINED__ /* interface IDXGIOutput3 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("8a6bb301-7e7e-41F4-a8e0-5b32f7f99b18") IDXGIOutput3 : public IDXGIOutput2 { public: - virtual HRESULT STDMETHODCALLTYPE CheckOverlaySupport( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE CheckOverlaySupport( + /* [annotation][in] */ _In_ DXGI_FORMAT EnumFormat, - /* [annotation][out] */ + /* [annotation][out] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput3 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput3 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput3 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput3 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( + + BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( IDXGIOutput3 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( IDXGIOutput3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT EnumFormat, - /* [annotation][out] */ + /* [annotation][out] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - + END_INTERFACE } IDXGIOutput3Vtbl; @@ -1901,84 +1879,82 @@ EXTERN_C const IID IID_IDXGIOutput3; CONST_VTBL struct IDXGIOutput3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput3_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput3_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput3_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput3_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput3_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput3_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput3_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput3_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput3_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput3_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput3_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput3_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput3_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput3_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput3_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput3_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput3_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput3_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput3_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput3_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #define IDXGIOutput3_SupportsOverlays(This) \ - ( (This)->lpVtbl -> SupportsOverlays(This) ) + ( (This)->lpVtbl -> SupportsOverlays(This) ) #define IDXGIOutput3_CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) #endif /* COBJMACROS */ @@ -1987,7 +1963,7 @@ EXTERN_C const IID IID_IDXGIOutput3; #endif /* __IDXGIOutput3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_3_0000_0008 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxgi1_4.h b/gfx/include/dxsdk/dxgi1_4.h index 93b0430716..4e268bc94d 100644 --- a/gfx/include/dxsdk/dxgi1_4.h +++ b/gfx/include/dxsdk/dxgi1_4.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGISwapChain3_FWD_DEFINED__ #define __IDXGISwapChain3_FWD_DEFINED__ @@ -64,15 +64,15 @@ typedef interface IDXGIAdapter3 IDXGIAdapter3; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi1_4_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ -typedef +typedef enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG { DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1, @@ -86,284 +86,283 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_4_0000_0000_v0_0_s_ifspec; #define __IDXGISwapChain3_INTERFACE_DEFINED__ /* interface IDXGISwapChain3 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChain3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("94d99bdb-f1f8-4ab0-b236-7da0170edab1") IDXGISwapChain3 : public IDXGISwapChain2 { public: virtual UINT STDMETHODCALLTYPE GetCurrentBackBufferIndex( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckColorSpaceSupport( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE CheckColorSpaceSupport( + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pColorSpaceSupport) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetColorSpace1( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetColorSpace1( + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace) = 0; - - virtual HRESULT STDMETHODCALLTYPE ResizeBuffers1( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE ResizeBuffers1( + /* [annotation][in] */ _In_ UINT BufferCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Width, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Height, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SwapChainFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) const UINT *pCreationNodeMask, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) IUnknown *const *ppPresentQueue) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChain3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChain3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChain3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChain3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *Present )( + + HRESULT ( STDMETHODCALLTYPE *Present )( IDXGISwapChain3 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetBuffer )( IDXGISwapChain3 * This, /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( IDXGISwapChain3 * This, /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( IDXGISwapChain3 * This, /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters); - - HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( + + HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pLastPresentCount); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetHwnd )( + + HRESULT ( STDMETHODCALLTYPE *GetHwnd )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pHwnd); - - HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID refiid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppUnk); - - HRESULT ( STDMETHODCALLTYPE *Present1 )( + + HRESULT ( STDMETHODCALLTYPE *Present1 )( IDXGISwapChain3 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT PresentFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_PRESENT_PARAMETERS *pPresentParameters); - - BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( + + BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( IDXGISwapChain3 * This); - - HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ IDXGIOutput **ppRestrictToOutput); - - HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *SetRotation )( + + HRESULT ( STDMETHODCALLTYPE *SetRotation )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MODE_ROTATION Rotation); - - HRESULT ( STDMETHODCALLTYPE *GetRotation )( + + HRESULT ( STDMETHODCALLTYPE *GetRotation )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_ROTATION *pRotation); - - HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( IDXGISwapChain3 * This, UINT Width, UINT Height); - - HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGISwapChain3 * This, UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( + + HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( IDXGISwapChain3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( IDXGISwapChain3 * This, const DXGI_MATRIX_3X2_F *pMatrix); - - HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( IDXGISwapChain3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MATRIX_3X2_F *pMatrix); - - UINT ( STDMETHODCALLTYPE *GetCurrentBackBufferIndex )( + + UINT ( STDMETHODCALLTYPE *GetCurrentBackBufferIndex )( IDXGISwapChain3 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckColorSpaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckColorSpaceSupport )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pColorSpaceSupport); - - HRESULT ( STDMETHODCALLTYPE *SetColorSpace1 )( + + HRESULT ( STDMETHODCALLTYPE *SetColorSpace1 )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers1 )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers1 )( IDXGISwapChain3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT BufferCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Width, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Height, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SwapChainFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) const UINT *pCreationNodeMask, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) IUnknown *const *ppPresentQueue); - + END_INTERFACE } IDXGISwapChain3Vtbl; @@ -372,129 +371,127 @@ EXTERN_C const IID IID_IDXGISwapChain3; CONST_VTBL struct IDXGISwapChain3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChain3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChain3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChain3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChain3_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISwapChain3_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISwapChain3_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISwapChain3_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISwapChain3_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISwapChain3_Present(This,SyncInterval,Flags) \ - ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) + ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) #define IDXGISwapChain3_GetBuffer(This,Buffer,riid,ppSurface) \ - ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) + ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) #define IDXGISwapChain3_SetFullscreenState(This,Fullscreen,pTarget) \ - ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) + ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) #define IDXGISwapChain3_GetFullscreenState(This,pFullscreen,ppTarget) \ - ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) + ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) #define IDXGISwapChain3_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISwapChain3_ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) \ - ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) + ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) #define IDXGISwapChain3_ResizeTarget(This,pNewTargetParameters) \ - ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) + ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) #define IDXGISwapChain3_GetContainingOutput(This,ppOutput) \ - ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) + ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) #define IDXGISwapChain3_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGISwapChain3_GetLastPresentCount(This,pLastPresentCount) \ - ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) + ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) #define IDXGISwapChain3_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGISwapChain3_GetFullscreenDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) #define IDXGISwapChain3_GetHwnd(This,pHwnd) \ - ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) + ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) #define IDXGISwapChain3_GetCoreWindow(This,refiid,ppUnk) \ - ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) + ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) #define IDXGISwapChain3_Present1(This,SyncInterval,PresentFlags,pPresentParameters) \ - ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) + ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) #define IDXGISwapChain3_IsTemporaryMonoSupported(This) \ - ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) + ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) #define IDXGISwapChain3_GetRestrictToOutput(This,ppRestrictToOutput) \ - ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) + ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) #define IDXGISwapChain3_SetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) #define IDXGISwapChain3_GetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) #define IDXGISwapChain3_SetRotation(This,Rotation) \ - ( (This)->lpVtbl -> SetRotation(This,Rotation) ) + ( (This)->lpVtbl -> SetRotation(This,Rotation) ) #define IDXGISwapChain3_GetRotation(This,pRotation) \ - ( (This)->lpVtbl -> GetRotation(This,pRotation) ) + ( (This)->lpVtbl -> GetRotation(This,pRotation) ) #define IDXGISwapChain3_SetSourceSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) #define IDXGISwapChain3_GetSourceSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) #define IDXGISwapChain3_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGISwapChain3_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGISwapChain3_GetFrameLatencyWaitableObject(This) \ - ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) + ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) #define IDXGISwapChain3_SetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) #define IDXGISwapChain3_GetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) #define IDXGISwapChain3_GetCurrentBackBufferIndex(This) \ - ( (This)->lpVtbl -> GetCurrentBackBufferIndex(This) ) + ( (This)->lpVtbl -> GetCurrentBackBufferIndex(This) ) #define IDXGISwapChain3_CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) \ - ( (This)->lpVtbl -> CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) ) + ( (This)->lpVtbl -> CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) ) #define IDXGISwapChain3_SetColorSpace1(This,ColorSpace) \ - ( (This)->lpVtbl -> SetColorSpace1(This,ColorSpace) ) + ( (This)->lpVtbl -> SetColorSpace1(This,ColorSpace) ) #define IDXGISwapChain3_ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) \ - ( (This)->lpVtbl -> ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) ) + ( (This)->lpVtbl -> ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) ) #endif /* COBJMACROS */ @@ -503,9 +500,9 @@ EXTERN_C const IID IID_IDXGISwapChain3; #endif /* __IDXGISwapChain3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_4_0000_0001 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG { DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1 @@ -518,196 +515,195 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_4_0000_0001_v0_0_s_ifspec; #define __IDXGIOutput4_INTERFACE_DEFINED__ /* interface IDXGIOutput4 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("dc7dca35-2196-414d-9F53-617884032a60") IDXGIOutput4 : public IDXGIOutput3 { public: - virtual HRESULT STDMETHODCALLTYPE CheckOverlayColorSpaceSupport( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE CheckOverlayColorSpaceSupport( + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput4 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput4 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput4 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput4 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( + + BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( IDXGIOutput4 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT EnumFormat, - /* [annotation][out] */ + /* [annotation][out] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( IDXGIOutput4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - + END_INTERFACE } IDXGIOutput4Vtbl; @@ -716,87 +712,85 @@ EXTERN_C const IID IID_IDXGIOutput4; CONST_VTBL struct IDXGIOutput4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput4_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput4_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput4_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput4_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput4_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput4_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput4_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput4_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput4_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput4_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput4_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput4_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput4_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput4_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput4_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput4_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput4_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput4_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput4_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput4_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #define IDXGIOutput4_SupportsOverlays(This) \ - ( (This)->lpVtbl -> SupportsOverlays(This) ) + ( (This)->lpVtbl -> SupportsOverlays(This) ) #define IDXGIOutput4_CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) #define IDXGIOutput4_CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) #endif /* COBJMACROS */ @@ -808,232 +802,231 @@ EXTERN_C const IID IID_IDXGIOutput4; #define __IDXGIFactory4_INTERFACE_DEFINED__ /* interface IDXGIFactory4 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("1bc6ea02-ef36-464f-bf0c-21ca39e5168a") IDXGIFactory4 : public IDXGIFactory3 { public: - virtual HRESULT STDMETHODCALLTYPE EnumAdapterByLuid( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE EnumAdapterByLuid( + /* [annotation] */ _In_ LUID AdapterLuid, - /* [annotation] */ + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumWarpAdapter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE EnumWarpAdapter( + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactory4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory4 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory4 * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory4 * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( IDXGIFactory4 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter); - - BOOL ( STDMETHODCALLTYPE *IsCurrent )( + + BOOL ( STDMETHODCALLTYPE *IsCurrent )( IDXGIFactory4 * This); - - BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( IDXGIFactory4 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND hWnd, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pWindow, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( IDXGIFactory4 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _Out_ LUID *pLuid); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( + + void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( + + void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( IDXGIFactory4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( IDXGIFactory4 * This); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapterByLuid )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapterByLuid )( IDXGIFactory4 * This, - /* [annotation] */ + /* [annotation] */ _In_ LUID AdapterLuid, - /* [annotation] */ + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumWarpAdapter )( + + HRESULT ( STDMETHODCALLTYPE *EnumWarpAdapter )( IDXGIFactory4 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter); - + END_INTERFACE } IDXGIFactory4Vtbl; @@ -1042,93 +1035,91 @@ EXTERN_C const IID IID_IDXGIFactory4; CONST_VTBL struct IDXGIFactory4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory4_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory4_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory4_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory4_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory4_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory4_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory4_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory4_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory4_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #define IDXGIFactory4_EnumAdapters1(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) #define IDXGIFactory4_IsCurrent(This) \ - ( (This)->lpVtbl -> IsCurrent(This) ) + ( (This)->lpVtbl -> IsCurrent(This) ) #define IDXGIFactory4_IsWindowedStereoEnabled(This) \ - ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) + ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) #define IDXGIFactory4_CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory4_CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory4_GetSharedResourceAdapterLuid(This,hResource,pLuid) \ - ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) + ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) #define IDXGIFactory4_RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory4_RegisterStereoStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory4_UnregisterStereoStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) #define IDXGIFactory4_RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory4_RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory4_UnregisterOcclusionStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) #define IDXGIFactory4_CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory4_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define IDXGIFactory4_EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) \ - ( (This)->lpVtbl -> EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) ) + ( (This)->lpVtbl -> EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) ) #define IDXGIFactory4_EnumWarpAdapter(This,riid,ppvAdapter) \ - ( (This)->lpVtbl -> EnumWarpAdapter(This,riid,ppvAdapter) ) + ( (This)->lpVtbl -> EnumWarpAdapter(This,riid,ppvAdapter) ) #endif /* COBJMACROS */ @@ -1137,9 +1128,9 @@ EXTERN_C const IID IID_IDXGIFactory4; #endif /* __IDXGIFactory4_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_4_0000_0003 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_MEMORY_SEGMENT_GROUP { DXGI_MEMORY_SEGMENT_GROUP_LOCAL = 0, @@ -1161,174 +1152,173 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_4_0000_0003_v0_0_s_ifspec; #define __IDXGIAdapter3_INTERFACE_DEFINED__ /* interface IDXGIAdapter3 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIAdapter3; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("645967A4-1392-4310-A798-8053CE3E93FD") IDXGIAdapter3 : public IDXGIAdapter2 { public: - virtual HRESULT STDMETHODCALLTYPE RegisterHardwareContentProtectionTeardownStatusEvent( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE RegisterHardwareContentProtectionTeardownStatusEvent( + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual void STDMETHODCALLTYPE UnregisterHardwareContentProtectionTeardownStatus( - /* [annotation][in] */ + + virtual void STDMETHODCALLTYPE UnregisterHardwareContentProtectionTeardownStatus( + /* [annotation][in] */ _In_ DWORD dwCookie) = 0; - - virtual HRESULT STDMETHODCALLTYPE QueryVideoMemoryInfo( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE QueryVideoMemoryInfo( + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_QUERY_VIDEO_MEMORY_INFO *pVideoMemoryInfo) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetVideoMemoryReservation( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE SetVideoMemoryReservation( + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT64 Reservation) = 0; - - virtual HRESULT STDMETHODCALLTYPE RegisterVideoMemoryBudgetChangeNotificationEvent( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE RegisterVideoMemoryBudgetChangeNotificationEvent( + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie) = 0; - - virtual void STDMETHODCALLTYPE UnregisterVideoMemoryBudgetChangeNotification( - /* [annotation][in] */ + + virtual void STDMETHODCALLTYPE UnregisterVideoMemoryBudgetChangeNotification( + /* [annotation][in] */ _In_ DWORD dwCookie) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIAdapter3Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIAdapter3 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIAdapter3 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIAdapter3 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( + + HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( IDXGIAdapter3 * This, /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIAdapter3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGIAdapter3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( IDXGIAdapter3 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC2 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *RegisterHardwareContentProtectionTeardownStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterHardwareContentProtectionTeardownStatusEvent )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterHardwareContentProtectionTeardownStatus )( + + void ( STDMETHODCALLTYPE *UnregisterHardwareContentProtectionTeardownStatus )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *QueryVideoMemoryInfo )( + + HRESULT ( STDMETHODCALLTYPE *QueryVideoMemoryInfo )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_QUERY_VIDEO_MEMORY_INFO *pVideoMemoryInfo); - - HRESULT ( STDMETHODCALLTYPE *SetVideoMemoryReservation )( + + HRESULT ( STDMETHODCALLTYPE *SetVideoMemoryReservation )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT64 Reservation); - - HRESULT ( STDMETHODCALLTYPE *RegisterVideoMemoryBudgetChangeNotificationEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterVideoMemoryBudgetChangeNotificationEvent )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterVideoMemoryBudgetChangeNotification )( + + void ( STDMETHODCALLTYPE *UnregisterVideoMemoryBudgetChangeNotification )( IDXGIAdapter3 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - + END_INTERFACE } IDXGIAdapter3Vtbl; @@ -1337,63 +1327,61 @@ EXTERN_C const IID IID_IDXGIAdapter3; CONST_VTBL struct IDXGIAdapter3Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIAdapter3_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIAdapter3_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIAdapter3_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIAdapter3_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIAdapter3_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIAdapter3_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIAdapter3_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIAdapter3_EnumOutputs(This,Output,ppOutput) \ - ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) + ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) #define IDXGIAdapter3_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIAdapter3_CheckInterfaceSupport(This,InterfaceName,pUMDVersion) \ - ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) + ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) #define IDXGIAdapter3_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGIAdapter3_GetDesc2(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) #define IDXGIAdapter3_RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIAdapter3_UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) ) #define IDXGIAdapter3_QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) \ - ( (This)->lpVtbl -> QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) ) + ( (This)->lpVtbl -> QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) ) #define IDXGIAdapter3_SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) \ - ( (This)->lpVtbl -> SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) ) + ( (This)->lpVtbl -> SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) ) #define IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) ) #define IDXGIAdapter3_UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) ) #endif /* COBJMACROS */ @@ -1402,7 +1390,7 @@ EXTERN_C const IID IID_IDXGIAdapter3; #endif /* __IDXGIAdapter3_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_4_0000_0004 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxgi1_5.h b/gfx/include/dxsdk/dxgi1_5.h index 2a1de48307..88446c89e6 100644 --- a/gfx/include/dxsdk/dxgi1_5.h +++ b/gfx/include/dxsdk/dxgi1_5.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIOutput5_FWD_DEFINED__ #define __IDXGIOutput5_FWD_DEFINED__ @@ -64,15 +64,15 @@ typedef interface IDXGIFactory5 IDXGIFactory5; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi1_5_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region App Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ -typedef +typedef enum DXGI_OUTDUPL_FLAG { DXGI_OUTDUPL_COMPOSITED_UI_CAPTURE_ONLY = 1 @@ -85,209 +85,208 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_5_0000_0000_v0_0_s_ifspec; #define __IDXGIOutput5_INTERFACE_DEFINED__ /* interface IDXGIOutput5 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput5; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("80A07424-AB52-42EB-833C-0C42FD282D98") IDXGIOutput5 : public IDXGIOutput4 { public: - virtual HRESULT STDMETHODCALLTYPE DuplicateOutput1( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE DuplicateOutput1( + /* [annotation][in] */ _In_ IUnknown *pDevice, /* [in] */ UINT Flags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SupportedFormatsCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(SupportedFormatsCount) const DXGI_FORMAT *pSupportedFormats, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput5Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput5 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput5 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput5 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput5 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput5 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput5 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput5 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput5 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput5 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput5 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput5 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( + + BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( IDXGIOutput5 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT EnumFormat, - /* [annotation][out] */ + /* [annotation][out] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput1 )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput1 )( IDXGIOutput5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, /* [in] */ UINT Flags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SupportedFormatsCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(SupportedFormatsCount) const DXGI_FORMAT *pSupportedFormats, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - + END_INTERFACE } IDXGIOutput5Vtbl; @@ -296,90 +295,88 @@ EXTERN_C const IID IID_IDXGIOutput5; CONST_VTBL struct IDXGIOutput5Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput5_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput5_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput5_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput5_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput5_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput5_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput5_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput5_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput5_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput5_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput5_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput5_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput5_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput5_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput5_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput5_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput5_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput5_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput5_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput5_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput5_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput5_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput5_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #define IDXGIOutput5_SupportsOverlays(This) \ - ( (This)->lpVtbl -> SupportsOverlays(This) ) + ( (This)->lpVtbl -> SupportsOverlays(This) ) #define IDXGIOutput5_CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) #define IDXGIOutput5_CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) #define IDXGIOutput5_DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) ) #endif /* COBJMACROS */ @@ -388,9 +385,9 @@ EXTERN_C const IID IID_IDXGIOutput5; #endif /* __IDXGIOutput5_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_5_0000_0001 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_HDR_METADATA_TYPE { DXGI_HDR_METADATA_TYPE_NONE = 0, @@ -416,273 +413,272 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_5_0000_0001_v0_0_s_ifspec; #define __IDXGISwapChain4_INTERFACE_DEFINED__ /* interface IDXGISwapChain4 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGISwapChain4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3D585D5A-BD4A-489E-B1F4-3DBCB6452FFB") IDXGISwapChain4 : public IDXGISwapChain3 { public: - virtual HRESULT STDMETHODCALLTYPE SetHDRMetaData( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE SetHDRMetaData( + /* [annotation][in] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Size, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_opt_(Size) void *pMetaData) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGISwapChain4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGISwapChain4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGISwapChain4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGISwapChain4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDevice )( + + HRESULT ( STDMETHODCALLTYPE *GetDevice )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppDevice); - - HRESULT ( STDMETHODCALLTYPE *Present )( + + HRESULT ( STDMETHODCALLTYPE *Present )( IDXGISwapChain4 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetBuffer )( + + HRESULT ( STDMETHODCALLTYPE *GetBuffer )( IDXGISwapChain4 * This, /* [in] */ UINT Buffer, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ void **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *SetFullscreenState )( IDXGISwapChain4 * This, /* [in] */ BOOL Fullscreen, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pTarget); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenState )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_opt_ BOOL *pFullscreen, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_opt_result_maybenull_ IDXGIOutput **ppTarget); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers )( IDXGISwapChain4 * This, /* [in] */ UINT BufferCount, /* [in] */ UINT Width, /* [in] */ UINT Height, /* [in] */ DXGI_FORMAT NewFormat, /* [in] */ UINT SwapChainFlags); - - HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( + + HRESULT ( STDMETHODCALLTYPE *ResizeTarget )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pNewTargetParameters); - - HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetContainingOutput )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( + + HRESULT ( STDMETHODCALLTYPE *GetLastPresentCount )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pLastPresentCount); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetFullscreenDesc )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetHwnd )( + + HRESULT ( STDMETHODCALLTYPE *GetHwnd )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pHwnd); - - HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *GetCoreWindow )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID refiid, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ void **ppUnk); - - HRESULT ( STDMETHODCALLTYPE *Present1 )( + + HRESULT ( STDMETHODCALLTYPE *Present1 )( IDXGISwapChain4 * This, /* [in] */ UINT SyncInterval, /* [in] */ UINT PresentFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_PRESENT_PARAMETERS *pPresentParameters); - - BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( + + BOOL ( STDMETHODCALLTYPE *IsTemporaryMonoSupported )( IDXGISwapChain4 * This); - - HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( + + HRESULT ( STDMETHODCALLTYPE *GetRestrictToOutput )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ IDXGIOutput **ppRestrictToOutput); - - HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *SetBackgroundColor )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( + + HRESULT ( STDMETHODCALLTYPE *GetBackgroundColor )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_RGBA *pColor); - - HRESULT ( STDMETHODCALLTYPE *SetRotation )( + + HRESULT ( STDMETHODCALLTYPE *SetRotation )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MODE_ROTATION Rotation); - - HRESULT ( STDMETHODCALLTYPE *GetRotation )( + + HRESULT ( STDMETHODCALLTYPE *GetRotation )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_ROTATION *pRotation); - - HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *SetSourceSize )( IDXGISwapChain4 * This, UINT Width, UINT Height); - - HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( + + HRESULT ( STDMETHODCALLTYPE *GetSourceSize )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pWidth, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pHeight); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGISwapChain4 * This, UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( + + HANDLE ( STDMETHODCALLTYPE *GetFrameLatencyWaitableObject )( IDXGISwapChain4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *SetMatrixTransform )( IDXGISwapChain4 * This, const DXGI_MATRIX_3X2_F *pMatrix); - - HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( + + HRESULT ( STDMETHODCALLTYPE *GetMatrixTransform )( IDXGISwapChain4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MATRIX_3X2_F *pMatrix); - - UINT ( STDMETHODCALLTYPE *GetCurrentBackBufferIndex )( + + UINT ( STDMETHODCALLTYPE *GetCurrentBackBufferIndex )( IDXGISwapChain4 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckColorSpaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckColorSpaceSupport )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pColorSpaceSupport); - - HRESULT ( STDMETHODCALLTYPE *SetColorSpace1 )( + + HRESULT ( STDMETHODCALLTYPE *SetColorSpace1 )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace); - - HRESULT ( STDMETHODCALLTYPE *ResizeBuffers1 )( + + HRESULT ( STDMETHODCALLTYPE *ResizeBuffers1 )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT BufferCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Width, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Height, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SwapChainFlags, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) const UINT *pCreationNodeMask, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(BufferCount) IUnknown *const *ppPresentQueue); - - HRESULT ( STDMETHODCALLTYPE *SetHDRMetaData )( + + HRESULT ( STDMETHODCALLTYPE *SetHDRMetaData )( IDXGISwapChain4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_HDR_METADATA_TYPE Type, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Size, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_opt_(Size) void *pMetaData); - + END_INTERFACE } IDXGISwapChain4Vtbl; @@ -691,132 +687,130 @@ EXTERN_C const IID IID_IDXGISwapChain4; CONST_VTBL struct IDXGISwapChain4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGISwapChain4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGISwapChain4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGISwapChain4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGISwapChain4_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGISwapChain4_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGISwapChain4_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGISwapChain4_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGISwapChain4_GetDevice(This,riid,ppDevice) \ - ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) + ( (This)->lpVtbl -> GetDevice(This,riid,ppDevice) ) #define IDXGISwapChain4_Present(This,SyncInterval,Flags) \ - ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) + ( (This)->lpVtbl -> Present(This,SyncInterval,Flags) ) #define IDXGISwapChain4_GetBuffer(This,Buffer,riid,ppSurface) \ - ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) + ( (This)->lpVtbl -> GetBuffer(This,Buffer,riid,ppSurface) ) #define IDXGISwapChain4_SetFullscreenState(This,Fullscreen,pTarget) \ - ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) + ( (This)->lpVtbl -> SetFullscreenState(This,Fullscreen,pTarget) ) #define IDXGISwapChain4_GetFullscreenState(This,pFullscreen,ppTarget) \ - ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) + ( (This)->lpVtbl -> GetFullscreenState(This,pFullscreen,ppTarget) ) #define IDXGISwapChain4_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGISwapChain4_ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) \ - ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) + ( (This)->lpVtbl -> ResizeBuffers(This,BufferCount,Width,Height,NewFormat,SwapChainFlags) ) #define IDXGISwapChain4_ResizeTarget(This,pNewTargetParameters) \ - ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) + ( (This)->lpVtbl -> ResizeTarget(This,pNewTargetParameters) ) #define IDXGISwapChain4_GetContainingOutput(This,ppOutput) \ - ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) + ( (This)->lpVtbl -> GetContainingOutput(This,ppOutput) ) #define IDXGISwapChain4_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGISwapChain4_GetLastPresentCount(This,pLastPresentCount) \ - ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) + ( (This)->lpVtbl -> GetLastPresentCount(This,pLastPresentCount) ) #define IDXGISwapChain4_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGISwapChain4_GetFullscreenDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetFullscreenDesc(This,pDesc) ) #define IDXGISwapChain4_GetHwnd(This,pHwnd) \ - ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) + ( (This)->lpVtbl -> GetHwnd(This,pHwnd) ) #define IDXGISwapChain4_GetCoreWindow(This,refiid,ppUnk) \ - ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) + ( (This)->lpVtbl -> GetCoreWindow(This,refiid,ppUnk) ) #define IDXGISwapChain4_Present1(This,SyncInterval,PresentFlags,pPresentParameters) \ - ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) + ( (This)->lpVtbl -> Present1(This,SyncInterval,PresentFlags,pPresentParameters) ) #define IDXGISwapChain4_IsTemporaryMonoSupported(This) \ - ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) + ( (This)->lpVtbl -> IsTemporaryMonoSupported(This) ) #define IDXGISwapChain4_GetRestrictToOutput(This,ppRestrictToOutput) \ - ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) + ( (This)->lpVtbl -> GetRestrictToOutput(This,ppRestrictToOutput) ) #define IDXGISwapChain4_SetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> SetBackgroundColor(This,pColor) ) #define IDXGISwapChain4_GetBackgroundColor(This,pColor) \ - ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) + ( (This)->lpVtbl -> GetBackgroundColor(This,pColor) ) #define IDXGISwapChain4_SetRotation(This,Rotation) \ - ( (This)->lpVtbl -> SetRotation(This,Rotation) ) + ( (This)->lpVtbl -> SetRotation(This,Rotation) ) #define IDXGISwapChain4_GetRotation(This,pRotation) \ - ( (This)->lpVtbl -> GetRotation(This,pRotation) ) + ( (This)->lpVtbl -> GetRotation(This,pRotation) ) #define IDXGISwapChain4_SetSourceSize(This,Width,Height) \ - ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) + ( (This)->lpVtbl -> SetSourceSize(This,Width,Height) ) #define IDXGISwapChain4_GetSourceSize(This,pWidth,pHeight) \ - ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) + ( (This)->lpVtbl -> GetSourceSize(This,pWidth,pHeight) ) #define IDXGISwapChain4_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGISwapChain4_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGISwapChain4_GetFrameLatencyWaitableObject(This) \ - ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) + ( (This)->lpVtbl -> GetFrameLatencyWaitableObject(This) ) #define IDXGISwapChain4_SetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> SetMatrixTransform(This,pMatrix) ) #define IDXGISwapChain4_GetMatrixTransform(This,pMatrix) \ - ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) + ( (This)->lpVtbl -> GetMatrixTransform(This,pMatrix) ) #define IDXGISwapChain4_GetCurrentBackBufferIndex(This) \ - ( (This)->lpVtbl -> GetCurrentBackBufferIndex(This) ) + ( (This)->lpVtbl -> GetCurrentBackBufferIndex(This) ) #define IDXGISwapChain4_CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) \ - ( (This)->lpVtbl -> CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) ) + ( (This)->lpVtbl -> CheckColorSpaceSupport(This,ColorSpace,pColorSpaceSupport) ) #define IDXGISwapChain4_SetColorSpace1(This,ColorSpace) \ - ( (This)->lpVtbl -> SetColorSpace1(This,ColorSpace) ) + ( (This)->lpVtbl -> SetColorSpace1(This,ColorSpace) ) #define IDXGISwapChain4_ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) \ - ( (This)->lpVtbl -> ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) ) + ( (This)->lpVtbl -> ResizeBuffers1(This,BufferCount,Width,Height,Format,SwapChainFlags,pCreationNodeMask,ppPresentQueue) ) #define IDXGISwapChain4_SetHDRMetaData(This,Type,Size,pMetaData) \ - ( (This)->lpVtbl -> SetHDRMetaData(This,Type,Size,pMetaData) ) + ( (This)->lpVtbl -> SetHDRMetaData(This,Type,Size,pMetaData) ) #endif /* COBJMACROS */ @@ -825,15 +819,15 @@ EXTERN_C const IID IID_IDXGISwapChain4; #endif /* __IDXGISwapChain4_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_5_0000_0002 */ -/* [local] */ +/* [local] */ -typedef +typedef enum _DXGI_OFFER_RESOURCE_FLAGS { DXGI_OFFER_RESOURCE_FLAG_ALLOW_DECOMMIT = 0x1 } DXGI_OFFER_RESOURCE_FLAGS; -typedef +typedef enum _DXGI_RECLAIM_RESOURCE_RESULTS { DXGI_RECLAIM_RESOURCE_RESULT_OK = 0, @@ -848,174 +842,173 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_5_0000_0002_v0_0_s_ifspec; #define __IDXGIDevice4_INTERFACE_DEFINED__ /* interface IDXGIDevice4 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIDevice4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("95B4F95F-D8DA-4CA4-9EE6-3B76D5968A10") IDXGIDevice4 : public IDXGIDevice3 { public: - virtual HRESULT STDMETHODCALLTYPE OfferResources1( - /* [annotation][in] */ + virtual HRESULT STDMETHODCALLTYPE OfferResources1( + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Flags) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReclaimResources1( - /* [annotation][in] */ + + virtual HRESULT STDMETHODCALLTYPE ReclaimResources1( + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_(NumResources) DXGI_RECLAIM_RESOURCE_RESULTS *pResults) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDevice4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDevice4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDevice4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDevice4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetAdapter )( + + HRESULT ( STDMETHODCALLTYPE *GetAdapter )( IDXGIDevice4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **pAdapter); - - HRESULT ( STDMETHODCALLTYPE *CreateSurface )( + + HRESULT ( STDMETHODCALLTYPE *CreateSurface )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SURFACE_DESC *pDesc, /* [in] */ UINT NumSurfaces, /* [in] */ DXGI_USAGE Usage, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SHARED_RESOURCE *pSharedResource, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISurface **ppSurface); - - HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( + + HRESULT ( STDMETHODCALLTYPE *QueryResourceResidency )( IDXGIDevice4 * This, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IUnknown *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_(NumResources) DXGI_RESIDENCY *pResidencyStatus, /* [in] */ UINT NumResources); - - HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *SetGPUThreadPriority )( IDXGIDevice4 * This, /* [in] */ INT Priority); - - HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( + + HRESULT ( STDMETHODCALLTYPE *GetGPUThreadPriority )( IDXGIDevice4 * This, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _Out_ INT *pPriority); - - HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *SetMaximumFrameLatency )( IDXGIDevice4 * This, /* [in] */ UINT MaxLatency); - - HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( + + HRESULT ( STDMETHODCALLTYPE *GetMaximumFrameLatency )( IDXGIDevice4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pMaxLatency); - - HRESULT ( STDMETHODCALLTYPE *OfferResources )( + + HRESULT ( STDMETHODCALLTYPE *OfferResources )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority); - - HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( + + HRESULT ( STDMETHODCALLTYPE *ReclaimResources )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_opt_(NumResources) BOOL *pDiscarded); - - HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( + + HRESULT ( STDMETHODCALLTYPE *EnqueueSetEvent )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent); - - void ( STDMETHODCALLTYPE *Trim )( + + void ( STDMETHODCALLTYPE *Trim )( IDXGIDevice4 * This); - - HRESULT ( STDMETHODCALLTYPE *OfferResources1 )( + + HRESULT ( STDMETHODCALLTYPE *OfferResources1 )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_OFFER_RESOURCE_PRIORITY Priority, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *ReclaimResources1 )( + + HRESULT ( STDMETHODCALLTYPE *ReclaimResources1 )( IDXGIDevice4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NumResources, - /* [annotation][size_is][in] */ + /* [annotation][size_is][in] */ _In_reads_(NumResources) IDXGIResource *const *ppResources, - /* [annotation][size_is][out] */ + /* [annotation][size_is][out] */ _Out_writes_all_(NumResources) DXGI_RECLAIM_RESOURCE_RESULTS *pResults); - + END_INTERFACE } IDXGIDevice4Vtbl; @@ -1024,69 +1017,67 @@ EXTERN_C const IID IID_IDXGIDevice4; CONST_VTBL struct IDXGIDevice4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDevice4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDevice4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDevice4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDevice4_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIDevice4_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIDevice4_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIDevice4_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIDevice4_GetAdapter(This,pAdapter) \ - ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) + ( (This)->lpVtbl -> GetAdapter(This,pAdapter) ) #define IDXGIDevice4_CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) \ - ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) + ( (This)->lpVtbl -> CreateSurface(This,pDesc,NumSurfaces,Usage,pSharedResource,ppSurface) ) #define IDXGIDevice4_QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) \ - ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) + ( (This)->lpVtbl -> QueryResourceResidency(This,ppResources,pResidencyStatus,NumResources) ) #define IDXGIDevice4_SetGPUThreadPriority(This,Priority) \ - ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) + ( (This)->lpVtbl -> SetGPUThreadPriority(This,Priority) ) #define IDXGIDevice4_GetGPUThreadPriority(This,pPriority) \ - ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) + ( (This)->lpVtbl -> GetGPUThreadPriority(This,pPriority) ) #define IDXGIDevice4_SetMaximumFrameLatency(This,MaxLatency) \ - ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) + ( (This)->lpVtbl -> SetMaximumFrameLatency(This,MaxLatency) ) #define IDXGIDevice4_GetMaximumFrameLatency(This,pMaxLatency) \ - ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) + ( (This)->lpVtbl -> GetMaximumFrameLatency(This,pMaxLatency) ) #define IDXGIDevice4_OfferResources(This,NumResources,ppResources,Priority) \ - ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) + ( (This)->lpVtbl -> OfferResources(This,NumResources,ppResources,Priority) ) #define IDXGIDevice4_ReclaimResources(This,NumResources,ppResources,pDiscarded) \ - ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) + ( (This)->lpVtbl -> ReclaimResources(This,NumResources,ppResources,pDiscarded) ) #define IDXGIDevice4_EnqueueSetEvent(This,hEvent) \ - ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) + ( (This)->lpVtbl -> EnqueueSetEvent(This,hEvent) ) #define IDXGIDevice4_Trim(This) \ - ( (This)->lpVtbl -> Trim(This) ) + ( (This)->lpVtbl -> Trim(This) ) #define IDXGIDevice4_OfferResources1(This,NumResources,ppResources,Priority,Flags) \ - ( (This)->lpVtbl -> OfferResources1(This,NumResources,ppResources,Priority,Flags) ) + ( (This)->lpVtbl -> OfferResources1(This,NumResources,ppResources,Priority,Flags) ) #define IDXGIDevice4_ReclaimResources1(This,NumResources,ppResources,pResults) \ - ( (This)->lpVtbl -> ReclaimResources1(This,NumResources,ppResources,pResults) ) + ( (This)->lpVtbl -> ReclaimResources1(This,NumResources,ppResources,pResults) ) #endif /* COBJMACROS */ @@ -1095,9 +1086,9 @@ EXTERN_C const IID IID_IDXGIDevice4; #endif /* __IDXGIDevice4_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_5_0000_0003 */ -/* [local] */ +/* [local] */ -typedef +typedef enum DXGI_FEATURE { DXGI_FEATURE_PRESENT_ALLOW_TEARING = 0 @@ -1110,231 +1101,230 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_5_0000_0003_v0_0_s_ifspec; #define __IDXGIFactory5_INTERFACE_DEFINED__ /* interface IDXGIFactory5 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIFactory5; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("7632e1f5-ee65-4dca-87fd-84cd75f8838d") IDXGIFactory5 : public IDXGIFactory4 { public: - virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( + virtual HRESULT STDMETHODCALLTYPE CheckFeatureSupport( DXGI_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIFactory5Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIFactory5 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIFactory5 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIFactory5 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters )( IDXGIFactory5 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *MakeWindowAssociation )( IDXGIFactory5 * This, HWND WindowHandle, UINT Flags); - - HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( + + HRESULT ( STDMETHODCALLTYPE *GetWindowAssociation )( IDXGIFactory5 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ HWND *pWindowHandle); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChain )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_SWAP_CHAIN_DESC *pDesc, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( + + HRESULT ( STDMETHODCALLTYPE *CreateSoftwareAdapter )( IDXGIFactory5 * This, /* [in] */ HMODULE Module, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter **ppAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapters1 )( IDXGIFactory5 * This, /* [in] */ UINT Adapter, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIAdapter1 **ppAdapter); - - BOOL ( STDMETHODCALLTYPE *IsCurrent )( + + BOOL ( STDMETHODCALLTYPE *IsCurrent )( IDXGIFactory5 * This); - - BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( + + BOOL ( STDMETHODCALLTYPE *IsWindowedStereoEnabled )( IDXGIFactory5 * This); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForHwnd )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND hWnd, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pFullscreenDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForCoreWindow )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pWindow, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( + + HRESULT ( STDMETHODCALLTYPE *GetSharedResourceAdapterLuid )( IDXGIFactory5 * This, - /* [annotation] */ + /* [annotation] */ _In_ HANDLE hResource, - /* [annotation] */ + /* [annotation] */ _Out_ LUID *pLuid); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusWindow )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterStereoStatusEvent )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( + + void ( STDMETHODCALLTYPE *UnregisterStereoStatus )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusWindow )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HWND WindowHandle, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT wMsg, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterOcclusionStatusEvent )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( + + void ( STDMETHODCALLTYPE *UnregisterOcclusionStatus )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( + + HRESULT ( STDMETHODCALLTYPE *CreateSwapChainForComposition )( IDXGIFactory5 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_SWAP_CHAIN_DESC1 *pDesc, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IDXGIOutput *pRestrictToOutput, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGISwapChain1 **ppSwapChain); - - UINT ( STDMETHODCALLTYPE *GetCreationFlags )( + + UINT ( STDMETHODCALLTYPE *GetCreationFlags )( IDXGIFactory5 * This); - - HRESULT ( STDMETHODCALLTYPE *EnumAdapterByLuid )( + + HRESULT ( STDMETHODCALLTYPE *EnumAdapterByLuid )( IDXGIFactory5 * This, - /* [annotation] */ + /* [annotation] */ _In_ LUID AdapterLuid, - /* [annotation] */ + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter); - - HRESULT ( STDMETHODCALLTYPE *EnumWarpAdapter )( + + HRESULT ( STDMETHODCALLTYPE *EnumWarpAdapter )( IDXGIFactory5 * This, - /* [annotation] */ + /* [annotation] */ _In_ REFIID riid, - /* [annotation] */ + /* [annotation] */ _COM_Outptr_ void **ppvAdapter); - - HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckFeatureSupport )( IDXGIFactory5 * This, DXGI_FEATURE Feature, - /* [annotation] */ + /* [annotation] */ _Inout_updates_bytes_(FeatureSupportDataSize) void *pFeatureSupportData, UINT FeatureSupportDataSize); - + END_INTERFACE } IDXGIFactory5Vtbl; @@ -1343,96 +1333,94 @@ EXTERN_C const IID IID_IDXGIFactory5; CONST_VTBL struct IDXGIFactory5Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIFactory5_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIFactory5_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIFactory5_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIFactory5_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIFactory5_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIFactory5_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIFactory5_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIFactory5_EnumAdapters(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters(This,Adapter,ppAdapter) ) #define IDXGIFactory5_MakeWindowAssociation(This,WindowHandle,Flags) \ - ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) + ( (This)->lpVtbl -> MakeWindowAssociation(This,WindowHandle,Flags) ) #define IDXGIFactory5_GetWindowAssociation(This,pWindowHandle) \ - ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) + ( (This)->lpVtbl -> GetWindowAssociation(This,pWindowHandle) ) #define IDXGIFactory5_CreateSwapChain(This,pDevice,pDesc,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChain(This,pDevice,pDesc,ppSwapChain) ) #define IDXGIFactory5_CreateSoftwareAdapter(This,Module,ppAdapter) \ - ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) + ( (This)->lpVtbl -> CreateSoftwareAdapter(This,Module,ppAdapter) ) #define IDXGIFactory5_EnumAdapters1(This,Adapter,ppAdapter) \ - ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) + ( (This)->lpVtbl -> EnumAdapters1(This,Adapter,ppAdapter) ) #define IDXGIFactory5_IsCurrent(This) \ - ( (This)->lpVtbl -> IsCurrent(This) ) + ( (This)->lpVtbl -> IsCurrent(This) ) #define IDXGIFactory5_IsWindowedStereoEnabled(This) \ - ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) + ( (This)->lpVtbl -> IsWindowedStereoEnabled(This) ) #define IDXGIFactory5_CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForHwnd(This,pDevice,hWnd,pDesc,pFullscreenDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory5_CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForCoreWindow(This,pDevice,pWindow,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory5_GetSharedResourceAdapterLuid(This,hResource,pLuid) \ - ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) + ( (This)->lpVtbl -> GetSharedResourceAdapterLuid(This,hResource,pLuid) ) #define IDXGIFactory5_RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory5_RegisterStereoStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterStereoStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory5_UnregisterStereoStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterStereoStatus(This,dwCookie) ) #define IDXGIFactory5_RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusWindow(This,WindowHandle,wMsg,pdwCookie) ) #define IDXGIFactory5_RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterOcclusionStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIFactory5_UnregisterOcclusionStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterOcclusionStatus(This,dwCookie) ) #define IDXGIFactory5_CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) \ - ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) + ( (This)->lpVtbl -> CreateSwapChainForComposition(This,pDevice,pDesc,pRestrictToOutput,ppSwapChain) ) #define IDXGIFactory5_GetCreationFlags(This) \ - ( (This)->lpVtbl -> GetCreationFlags(This) ) + ( (This)->lpVtbl -> GetCreationFlags(This) ) #define IDXGIFactory5_EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) \ - ( (This)->lpVtbl -> EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) ) + ( (This)->lpVtbl -> EnumAdapterByLuid(This,AdapterLuid,riid,ppvAdapter) ) #define IDXGIFactory5_EnumWarpAdapter(This,riid,ppvAdapter) \ - ( (This)->lpVtbl -> EnumWarpAdapter(This,riid,ppvAdapter) ) + ( (This)->lpVtbl -> EnumWarpAdapter(This,riid,ppvAdapter) ) #define IDXGIFactory5_CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) \ - ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) + ( (This)->lpVtbl -> CheckFeatureSupport(This,Feature,pFeatureSupportData,FeatureSupportDataSize) ) #endif /* COBJMACROS */ @@ -1441,7 +1429,7 @@ EXTERN_C const IID IID_IDXGIFactory5; #endif /* __IDXGIFactory5_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_5_0000_0004 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxgi1_6.h b/gfx/include/dxsdk/dxgi1_6.h index 55544bde15..52c469fb6e 100644 --- a/gfx/include/dxsdk/dxgi1_6.h +++ b/gfx/include/dxsdk/dxgi1_6.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIAdapter4_FWD_DEFINED__ #define __IDXGIAdapter4_FWD_DEFINED__ @@ -52,16 +52,16 @@ typedef interface IDXGIOutput6 IDXGIOutput6; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgi1_6_0000_0000 */ -/* [local] */ +/* [local] */ // Copyright (c) Microsoft Corporation. All Rights Reserved /*#include */ /*#pragma region App Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ -typedef +typedef enum DXGI_ADAPTER_FLAG3 { DXGI_ADAPTER_FLAG3_NONE = 0, @@ -98,147 +98,146 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0000_v0_0_s_ifspec; #define __IDXGIAdapter4_INTERFACE_DEFINED__ /* interface IDXGIAdapter4 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIAdapter4; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3c8d99d1-4fbf-4181-a82c-af66bf7bd24e") IDXGIAdapter4 : public IDXGIAdapter3 { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc3( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc3( + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC3 *pDesc) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIAdapter4Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIAdapter4 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIAdapter4 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIAdapter4 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( + + HRESULT ( STDMETHODCALLTYPE *EnumOutputs )( IDXGIAdapter4 * This, /* [in] */ UINT Output, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _COM_Outptr_ IDXGIOutput **ppOutput); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIAdapter4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckInterfaceSupport )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID InterfaceName, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ LARGE_INTEGER *pUMDVersion); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGIAdapter4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc2 )( IDXGIAdapter4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC2 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *RegisterHardwareContentProtectionTeardownStatusEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterHardwareContentProtectionTeardownStatusEvent )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterHardwareContentProtectionTeardownStatus )( + + void ( STDMETHODCALLTYPE *UnregisterHardwareContentProtectionTeardownStatus )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *QueryVideoMemoryInfo )( + + HRESULT ( STDMETHODCALLTYPE *QueryVideoMemoryInfo )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_QUERY_VIDEO_MEMORY_INFO *pVideoMemoryInfo); - - HRESULT ( STDMETHODCALLTYPE *SetVideoMemoryReservation )( + + HRESULT ( STDMETHODCALLTYPE *SetVideoMemoryReservation )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT NodeIndex, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_MEMORY_SEGMENT_GROUP MemorySegmentGroup, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT64 Reservation); - - HRESULT ( STDMETHODCALLTYPE *RegisterVideoMemoryBudgetChangeNotificationEvent )( + + HRESULT ( STDMETHODCALLTYPE *RegisterVideoMemoryBudgetChangeNotificationEvent )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ HANDLE hEvent, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DWORD *pdwCookie); - - void ( STDMETHODCALLTYPE *UnregisterVideoMemoryBudgetChangeNotification )( + + void ( STDMETHODCALLTYPE *UnregisterVideoMemoryBudgetChangeNotification )( IDXGIAdapter4 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DWORD dwCookie); - - HRESULT ( STDMETHODCALLTYPE *GetDesc3 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc3 )( IDXGIAdapter4 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_ADAPTER_DESC3 *pDesc); - + END_INTERFACE } IDXGIAdapter4Vtbl; @@ -247,66 +246,64 @@ EXTERN_C const IID IID_IDXGIAdapter4; CONST_VTBL struct IDXGIAdapter4Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIAdapter4_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIAdapter4_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIAdapter4_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIAdapter4_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIAdapter4_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIAdapter4_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIAdapter4_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIAdapter4_EnumOutputs(This,Output,ppOutput) \ - ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) + ( (This)->lpVtbl -> EnumOutputs(This,Output,ppOutput) ) #define IDXGIAdapter4_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIAdapter4_CheckInterfaceSupport(This,InterfaceName,pUMDVersion) \ - ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) + ( (This)->lpVtbl -> CheckInterfaceSupport(This,InterfaceName,pUMDVersion) ) #define IDXGIAdapter4_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGIAdapter4_GetDesc2(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc2(This,pDesc) ) #define IDXGIAdapter4_RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterHardwareContentProtectionTeardownStatusEvent(This,hEvent,pdwCookie) ) #define IDXGIAdapter4_UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterHardwareContentProtectionTeardownStatus(This,dwCookie) ) #define IDXGIAdapter4_QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) \ - ( (This)->lpVtbl -> QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) ) + ( (This)->lpVtbl -> QueryVideoMemoryInfo(This,NodeIndex,MemorySegmentGroup,pVideoMemoryInfo) ) #define IDXGIAdapter4_SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) \ - ( (This)->lpVtbl -> SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) ) + ( (This)->lpVtbl -> SetVideoMemoryReservation(This,NodeIndex,MemorySegmentGroup,Reservation) ) #define IDXGIAdapter4_RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) \ - ( (This)->lpVtbl -> RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) ) + ( (This)->lpVtbl -> RegisterVideoMemoryBudgetChangeNotificationEvent(This,hEvent,pdwCookie) ) #define IDXGIAdapter4_UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) \ - ( (This)->lpVtbl -> UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) ) + ( (This)->lpVtbl -> UnregisterVideoMemoryBudgetChangeNotification(This,dwCookie) ) #define IDXGIAdapter4_GetDesc3(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc3(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc3(This,pDesc) ) #endif /* COBJMACROS */ @@ -315,7 +312,7 @@ EXTERN_C const IID IID_IDXGIAdapter4; #endif /* __IDXGIAdapter4_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_6_0000_0001 */ -/* [local] */ +/* [local] */ typedef struct DXGI_OUTPUT_DESC1 { @@ -335,7 +332,7 @@ typedef struct DXGI_OUTPUT_DESC1 FLOAT MaxFullFrameLuminance; } DXGI_OUTPUT_DESC1; -typedef +typedef enum DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAGS { DXGI_HARDWARE_COMPOSITION_SUPPORT_FLAG_FULLSCREEN = 1, @@ -352,216 +349,215 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgi1_6_0000_0001_v0_0_s_ifspec; #define __IDXGIOutput6_INTERFACE_DEFINED__ /* interface IDXGIOutput6 */ -/* [unique][local][uuid][object] */ +/* [unique][local][uuid][object] */ EXTERN_C const IID IID_IDXGIOutput6; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("068346e8-aaec-4b84-add7-137f513f77a1") IDXGIOutput6 : public IDXGIOutput5 { public: - virtual HRESULT STDMETHODCALLTYPE GetDesc1( - /* [annotation][out] */ + virtual HRESULT STDMETHODCALLTYPE GetDesc1( + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC1 *pDesc) = 0; - - virtual HRESULT STDMETHODCALLTYPE CheckHardwareCompositionSupport( - /* [annotation][out] */ + + virtual HRESULT STDMETHODCALLTYPE CheckHardwareCompositionSupport( + /* [annotation][out] */ _Out_ UINT *pFlags) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIOutput6Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIOutput6 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIOutput6 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIOutput6 * This); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateData )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, /* [in] */ UINT DataSize, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_bytes_(DataSize) const void *pData); - - HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( + + HRESULT ( STDMETHODCALLTYPE *SetPrivateDataInterface )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ const IUnknown *pUnknown); - - HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( + + HRESULT ( STDMETHODCALLTYPE *GetPrivateData )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFGUID Name, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pDataSize, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_bytes_(*pDataSize) void *pData); - - HRESULT ( STDMETHODCALLTYPE *GetParent )( + + HRESULT ( STDMETHODCALLTYPE *GetParent )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ REFIID riid, - /* [annotation][retval][out] */ + /* [annotation][retval][out] */ _COM_Outptr_ void **ppParent); - - HRESULT ( STDMETHODCALLTYPE *GetDesc )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList )( IDXGIOutput6 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( + + HRESULT ( STDMETHODCALLTYPE *WaitForVBlank )( IDXGIOutput6 * This); - - HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( + + HRESULT ( STDMETHODCALLTYPE *TakeOwnership )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, BOOL Exclusive); - - void ( STDMETHODCALLTYPE *ReleaseOwnership )( + + void ( STDMETHODCALLTYPE *ReleaseOwnership )( IDXGIOutput6 * This); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControlCapabilities )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps); - - HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *SetGammaControl )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( + + HRESULT ( STDMETHODCALLTYPE *GetGammaControl )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_GAMMA_CONTROL *pArray); - - HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( + + HRESULT ( STDMETHODCALLTYPE *SetDisplaySurface )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pScanoutSurface); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGISurface *pDestination); - - HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( + + HRESULT ( STDMETHODCALLTYPE *GetFrameStatistics )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_FRAME_STATISTICS *pStats); - - HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplayModeList1 )( IDXGIOutput6 * This, /* [in] */ DXGI_FORMAT EnumFormat, /* [in] */ UINT Flags, - /* [annotation][out][in] */ + /* [annotation][out][in] */ _Inout_ UINT *pNumModes, - /* [annotation][out] */ + /* [annotation][out] */ _Out_writes_to_opt_(*pNumModes,*pNumModes) DXGI_MODE_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( + + HRESULT ( STDMETHODCALLTYPE *FindClosestMatchingMode1 )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ const DXGI_MODE_DESC1 *pModeToMatch, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_MODE_DESC1 *pClosestMatch, - /* [annotation][in] */ + /* [annotation][in] */ _In_opt_ IUnknown *pConcernedDevice); - - HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDisplaySurfaceData1 )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IDXGIResource *pDestination); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( + + BOOL ( STDMETHODCALLTYPE *SupportsOverlays )( IDXGIOutput6 * This); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlaySupport )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT EnumFormat, - /* [annotation][out] */ + /* [annotation][out] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckOverlayColorSpaceSupport )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_FORMAT Format, - /* [annotation][in] */ + /* [annotation][in] */ _In_ DXGI_COLOR_SPACE_TYPE ColorSpace, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pConcernedDevice, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - - HRESULT ( STDMETHODCALLTYPE *DuplicateOutput1 )( + + HRESULT ( STDMETHODCALLTYPE *DuplicateOutput1 )( IDXGIOutput6 * This, - /* [annotation][in] */ + /* [annotation][in] */ _In_ IUnknown *pDevice, /* [in] */ UINT Flags, - /* [annotation][in] */ + /* [annotation][in] */ _In_ UINT SupportedFormatsCount, - /* [annotation][in] */ + /* [annotation][in] */ _In_reads_(SupportedFormatsCount) const DXGI_FORMAT *pSupportedFormats, - /* [annotation][out] */ + /* [annotation][out] */ _COM_Outptr_ IDXGIOutputDuplication **ppOutputDuplication); - - HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( + + HRESULT ( STDMETHODCALLTYPE *GetDesc1 )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ DXGI_OUTPUT_DESC1 *pDesc); - - HRESULT ( STDMETHODCALLTYPE *CheckHardwareCompositionSupport )( + + HRESULT ( STDMETHODCALLTYPE *CheckHardwareCompositionSupport )( IDXGIOutput6 * This, - /* [annotation][out] */ + /* [annotation][out] */ _Out_ UINT *pFlags); - + END_INTERFACE } IDXGIOutput6Vtbl; @@ -570,96 +566,94 @@ EXTERN_C const IID IID_IDXGIOutput6; CONST_VTBL struct IDXGIOutput6Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIOutput6_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIOutput6_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIOutput6_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIOutput6_SetPrivateData(This,Name,DataSize,pData) \ - ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) + ( (This)->lpVtbl -> SetPrivateData(This,Name,DataSize,pData) ) #define IDXGIOutput6_SetPrivateDataInterface(This,Name,pUnknown) \ - ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) + ( (This)->lpVtbl -> SetPrivateDataInterface(This,Name,pUnknown) ) #define IDXGIOutput6_GetPrivateData(This,Name,pDataSize,pData) \ - ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) + ( (This)->lpVtbl -> GetPrivateData(This,Name,pDataSize,pData) ) #define IDXGIOutput6_GetParent(This,riid,ppParent) \ - ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) + ( (This)->lpVtbl -> GetParent(This,riid,ppParent) ) #define IDXGIOutput6_GetDesc(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc(This,pDesc) ) #define IDXGIOutput6_GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput6_FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput6_WaitForVBlank(This) \ - ( (This)->lpVtbl -> WaitForVBlank(This) ) + ( (This)->lpVtbl -> WaitForVBlank(This) ) #define IDXGIOutput6_TakeOwnership(This,pDevice,Exclusive) \ - ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) + ( (This)->lpVtbl -> TakeOwnership(This,pDevice,Exclusive) ) #define IDXGIOutput6_ReleaseOwnership(This) \ - ( (This)->lpVtbl -> ReleaseOwnership(This) ) + ( (This)->lpVtbl -> ReleaseOwnership(This) ) #define IDXGIOutput6_GetGammaControlCapabilities(This,pGammaCaps) \ - ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) + ( (This)->lpVtbl -> GetGammaControlCapabilities(This,pGammaCaps) ) #define IDXGIOutput6_SetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> SetGammaControl(This,pArray) ) #define IDXGIOutput6_GetGammaControl(This,pArray) \ - ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) + ( (This)->lpVtbl -> GetGammaControl(This,pArray) ) #define IDXGIOutput6_SetDisplaySurface(This,pScanoutSurface) \ - ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) + ( (This)->lpVtbl -> SetDisplaySurface(This,pScanoutSurface) ) #define IDXGIOutput6_GetDisplaySurfaceData(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData(This,pDestination) ) #define IDXGIOutput6_GetFrameStatistics(This,pStats) \ - ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) + ( (This)->lpVtbl -> GetFrameStatistics(This,pStats) ) #define IDXGIOutput6_GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) \ - ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) + ( (This)->lpVtbl -> GetDisplayModeList1(This,EnumFormat,Flags,pNumModes,pDesc) ) #define IDXGIOutput6_FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) \ - ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) + ( (This)->lpVtbl -> FindClosestMatchingMode1(This,pModeToMatch,pClosestMatch,pConcernedDevice) ) #define IDXGIOutput6_GetDisplaySurfaceData1(This,pDestination) \ - ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) + ( (This)->lpVtbl -> GetDisplaySurfaceData1(This,pDestination) ) #define IDXGIOutput6_DuplicateOutput(This,pDevice,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput(This,pDevice,ppOutputDuplication) ) #define IDXGIOutput6_SupportsOverlays(This) \ - ( (This)->lpVtbl -> SupportsOverlays(This) ) + ( (This)->lpVtbl -> SupportsOverlays(This) ) #define IDXGIOutput6_CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlaySupport(This,EnumFormat,pConcernedDevice,pFlags) ) #define IDXGIOutput6_CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) \ - ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) + ( (This)->lpVtbl -> CheckOverlayColorSpaceSupport(This,Format,ColorSpace,pConcernedDevice,pFlags) ) #define IDXGIOutput6_DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) \ - ( (This)->lpVtbl -> DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) ) + ( (This)->lpVtbl -> DuplicateOutput1(This,pDevice,Flags,SupportedFormatsCount,pSupportedFormats,ppOutputDuplication) ) #define IDXGIOutput6_GetDesc1(This,pDesc) \ - ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) + ( (This)->lpVtbl -> GetDesc1(This,pDesc) ) #define IDXGIOutput6_CheckHardwareCompositionSupport(This,pFlags) \ - ( (This)->lpVtbl -> CheckHardwareCompositionSupport(This,pFlags) ) + ( (This)->lpVtbl -> CheckHardwareCompositionSupport(This,pFlags) ) #endif /* COBJMACROS */ @@ -668,7 +662,7 @@ EXTERN_C const IID IID_IDXGIOutput6; #endif /* __IDXGIOutput6_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgi1_6_0000_0002 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxgidebug.h b/gfx/include/dxsdk/dxgidebug.h index ae2077055e..0d0b51ecc9 100644 --- a/gfx/include/dxsdk/dxgidebug.h +++ b/gfx/include/dxsdk/dxgidebug.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IDXGIInfoQueue_FWD_DEFINED__ #define __IDXGIInfoQueue_FWD_DEFINED__ @@ -59,17 +59,17 @@ typedef interface IDXGIDebug1 IDXGIDebug1; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_dxgidebug_0000_0000 */ -/* [local] */ +/* [local] */ /*#include */ /*#pragma region Application Family*/ /*#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)*/ #define DXGI_DEBUG_BINARY_VERSION ( 1 ) -typedef +typedef enum DXGI_DEBUG_RLO_FLAGS { DXGI_DEBUG_RLO_SUMMARY = 0x1, @@ -84,7 +84,7 @@ DEFINE_GUID(DXGI_DEBUG_ALL, 0xe48ae283, 0xda80, 0x490b, 0x87, 0xe6, 0x43, 0xe9, DEFINE_GUID(DXGI_DEBUG_DX, 0x35cdd7fc, 0x13b2, 0x421d, 0xa5, 0xd7, 0x7e, 0x44, 0x51, 0x28, 0x7d, 0x64); DEFINE_GUID(DXGI_DEBUG_DXGI, 0x25cddaa4, 0xb1c6, 0x47e1, 0xac, 0x3e, 0x98, 0x87, 0x5b, 0x5a, 0x2e, 0x2a); DEFINE_GUID(DXGI_DEBUG_APP, 0x6cd6e01, 0x4219, 0x4ebd, 0x87, 0x9, 0x27, 0xed, 0x23, 0x36, 0xc, 0x62); -typedef +typedef enum DXGI_INFO_QUEUE_MESSAGE_CATEGORY { DXGI_INFO_QUEUE_MESSAGE_CATEGORY_UNKNOWN = 0, @@ -97,17 +97,17 @@ enum DXGI_INFO_QUEUE_MESSAGE_CATEGORY DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_GETTING = ( DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_SETTING + 1 ) , DXGI_INFO_QUEUE_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = ( DXGI_INFO_QUEUE_MESSAGE_CATEGORY_STATE_GETTING + 1 ) , DXGI_INFO_QUEUE_MESSAGE_CATEGORY_EXECUTION = ( DXGI_INFO_QUEUE_MESSAGE_CATEGORY_RESOURCE_MANIPULATION + 1 ) , - DXGI_INFO_QUEUE_MESSAGE_CATEGORY_SHADER = ( DXGI_INFO_QUEUE_MESSAGE_CATEGORY_EXECUTION + 1 ) + DXGI_INFO_QUEUE_MESSAGE_CATEGORY_SHADER = ( DXGI_INFO_QUEUE_MESSAGE_CATEGORY_EXECUTION + 1 ) } DXGI_INFO_QUEUE_MESSAGE_CATEGORY; -typedef +typedef enum DXGI_INFO_QUEUE_MESSAGE_SEVERITY { DXGI_INFO_QUEUE_MESSAGE_SEVERITY_CORRUPTION = 0, DXGI_INFO_QUEUE_MESSAGE_SEVERITY_ERROR = ( DXGI_INFO_QUEUE_MESSAGE_SEVERITY_CORRUPTION + 1 ) , DXGI_INFO_QUEUE_MESSAGE_SEVERITY_WARNING = ( DXGI_INFO_QUEUE_MESSAGE_SEVERITY_ERROR + 1 ) , DXGI_INFO_QUEUE_MESSAGE_SEVERITY_INFO = ( DXGI_INFO_QUEUE_MESSAGE_SEVERITY_WARNING + 1 ) , - DXGI_INFO_QUEUE_MESSAGE_SEVERITY_MESSAGE = ( DXGI_INFO_QUEUE_MESSAGE_SEVERITY_INFO + 1 ) + DXGI_INFO_QUEUE_MESSAGE_SEVERITY_MESSAGE = ( DXGI_INFO_QUEUE_MESSAGE_SEVERITY_INFO + 1 ) } DXGI_INFO_QUEUE_MESSAGE_SEVERITY; typedef int DXGI_INFO_QUEUE_MESSAGE_ID; @@ -119,7 +119,7 @@ typedef struct DXGI_INFO_QUEUE_MESSAGE DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category; DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity; DXGI_INFO_QUEUE_MESSAGE_ID ID; - /* [annotation] */ + /* [annotation] */ _Field_size_(DescriptionByteLength) const char *pDescription; SIZE_T DescriptionByteLength; } DXGI_INFO_QUEUE_MESSAGE; @@ -127,13 +127,13 @@ typedef struct DXGI_INFO_QUEUE_MESSAGE typedef struct DXGI_INFO_QUEUE_FILTER_DESC { UINT NumCategories; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumCategories) DXGI_INFO_QUEUE_MESSAGE_CATEGORY *pCategoryList; UINT NumSeverities; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumSeverities) DXGI_INFO_QUEUE_MESSAGE_SEVERITY *pSeverityList; UINT NumIDs; - /* [annotation] */ + /* [annotation] */ _Field_size_(NumIDs) DXGI_INFO_QUEUE_MESSAGE_ID *pIDList; } DXGI_INFO_QUEUE_FILTER_DESC; @@ -153,478 +153,477 @@ extern RPC_IF_HANDLE __MIDL_itf_dxgidebug_0000_0000_v0_0_s_ifspec; #define __IDXGIInfoQueue_INTERFACE_DEFINED__ /* interface IDXGIInfoQueue */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_IDXGIInfoQueue; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("D67441C7-672A-476f-9E82-CD55B44949CE") IDXGIInfoQueue : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( - /* [annotation] */ + virtual HRESULT STDMETHODCALLTYPE SetMessageCountLimit( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageCountLimit) = 0; - - virtual void STDMETHODCALLTYPE ClearStoredMessages( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearStoredMessages( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetMessage( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) DXGI_INFO_QUEUE_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilters( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessagesAllowedByRetrievalFilters( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetNumStoredMessages( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDiscardedByMessageCountLimit( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetMessageCountLimit( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesAllowedByStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( - /* [annotation] */ + + virtual UINT64 STDMETHODCALLTYPE GetNumMessagesDeniedByStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddStorageFilterEntries( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) DXGI_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - - virtual void STDMETHODCALLTYPE ClearStorageFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushEmptyStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushDenyAllStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushDenyAllStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushCopyOfStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual void STDMETHODCALLTYPE PopStorageFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PopStorageFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( - /* [annotation] */ + + virtual UINT STDMETHODCALLTYPE GetStorageFilterStackSize( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddRetrievalFilterEntries( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE GetRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) DXGI_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength) = 0; - - virtual void STDMETHODCALLTYPE ClearRetrievalFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE ClearRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushEmptyRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushDenyAllRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushDenyAllRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushCopyOfRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE PushRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter) = 0; - - virtual void STDMETHODCALLTYPE PopRetrievalFilter( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE PopRetrievalFilter( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( - /* [annotation] */ + + virtual UINT STDMETHODCALLTYPE GetRetrievalFilterStackSize( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddMessage( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE AddApplicationMessage( + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnCategory( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnSeverity( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( - /* [annotation] */ + + virtual HRESULT STDMETHODCALLTYPE SetBreakOnID( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnCategory( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnSeverity( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity) = 0; - - virtual BOOL STDMETHODCALLTYPE GetBreakOnID( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetBreakOnID( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID) = 0; - - virtual void STDMETHODCALLTYPE SetMuteDebugOutput( - /* [annotation] */ + + virtual void STDMETHODCALLTYPE SetMuteDebugOutput( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMute) = 0; - - virtual BOOL STDMETHODCALLTYPE GetMuteDebugOutput( - /* [annotation] */ + + virtual BOOL STDMETHODCALLTYPE GetMuteDebugOutput( + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIInfoQueueVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIInfoQueue * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIInfoQueue * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIInfoQueue * This); - - HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( + + HRESULT ( STDMETHODCALLTYPE *SetMessageCountLimit )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageCountLimit); - - void ( STDMETHODCALLTYPE *ClearStoredMessages )( + + void ( STDMETHODCALLTYPE *ClearStoredMessages )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *GetMessage )( + + HRESULT ( STDMETHODCALLTYPE *GetMessage )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ UINT64 MessageIndex, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pMessageByteLength) DXGI_INFO_QUEUE_MESSAGE *pMessage, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pMessageByteLength); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilters )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessagesAllowedByRetrievalFilters )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( + + UINT64 ( STDMETHODCALLTYPE *GetNumStoredMessages )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDiscardedByMessageCountLimit )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( + + UINT64 ( STDMETHODCALLTYPE *GetMessageCountLimit )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesAllowedByStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( + + UINT64 ( STDMETHODCALLTYPE *GetNumMessagesDeniedByStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddStorageFilterEntries )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) DXGI_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearStorageFilter )( + + void ( STDMETHODCALLTYPE *ClearStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushDenyAllStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushDenyAllStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopStorageFilter )( + + void ( STDMETHODCALLTYPE *PopStorageFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetStorageFilterStackSize )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( + + HRESULT ( STDMETHODCALLTYPE *AddRetrievalFilterEntries )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter); - - HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *GetRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _Out_writes_bytes_opt_(*pFilterByteLength) DXGI_INFO_QUEUE_FILTER *pFilter, - /* [annotation] */ + /* [annotation] */ _Inout_ SIZE_T *pFilterByteLength); - - void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( + + void ( STDMETHODCALLTYPE *ClearRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushEmptyRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushDenyAllRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushDenyAllRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushCopyOfRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( + + HRESULT ( STDMETHODCALLTYPE *PushRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_FILTER *pFilter); - - void ( STDMETHODCALLTYPE *PopRetrievalFilter )( + + void ( STDMETHODCALLTYPE *PopRetrievalFilter )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( + + UINT ( STDMETHODCALLTYPE *GetRetrievalFilterStackSize )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - - HRESULT ( STDMETHODCALLTYPE *AddMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddMessage )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( + + HRESULT ( STDMETHODCALLTYPE *AddApplicationMessage )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ LPCSTR pDescription); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnCategory )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnSeverity )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( + + HRESULT ( STDMETHODCALLTYPE *SetBreakOnID )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bEnable); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnCategory )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_CATEGORY Category); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnSeverity )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_SEVERITY Severity); - - BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( + + BOOL ( STDMETHODCALLTYPE *GetBreakOnID )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_INFO_QUEUE_MESSAGE_ID ID); - - void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( + + void ( STDMETHODCALLTYPE *SetMuteDebugOutput )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer, - /* [annotation] */ + /* [annotation] */ _In_ BOOL bMute); - - BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( + + BOOL ( STDMETHODCALLTYPE *GetMuteDebugOutput )( IDXGIInfoQueue * This, - /* [annotation] */ + /* [annotation] */ _In_ DXGI_DEBUG_ID Producer); - + END_INTERFACE } IDXGIInfoQueueVtbl; @@ -633,129 +632,127 @@ EXTERN_C const IID IID_IDXGIInfoQueue; CONST_VTBL struct IDXGIInfoQueueVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIInfoQueue_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIInfoQueue_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIInfoQueue_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIInfoQueue_SetMessageCountLimit(This,Producer,MessageCountLimit) \ - ( (This)->lpVtbl -> SetMessageCountLimit(This,Producer,MessageCountLimit) ) + ( (This)->lpVtbl -> SetMessageCountLimit(This,Producer,MessageCountLimit) ) #define IDXGIInfoQueue_ClearStoredMessages(This,Producer) \ - ( (This)->lpVtbl -> ClearStoredMessages(This,Producer) ) + ( (This)->lpVtbl -> ClearStoredMessages(This,Producer) ) #define IDXGIInfoQueue_GetMessage(This,Producer,MessageIndex,pMessage,pMessageByteLength) \ - ( (This)->lpVtbl -> GetMessage(This,Producer,MessageIndex,pMessage,pMessageByteLength) ) + ( (This)->lpVtbl -> GetMessage(This,Producer,MessageIndex,pMessage,pMessageByteLength) ) #define IDXGIInfoQueue_GetNumStoredMessagesAllowedByRetrievalFilters(This,Producer) \ - ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilters(This,Producer) ) + ( (This)->lpVtbl -> GetNumStoredMessagesAllowedByRetrievalFilters(This,Producer) ) #define IDXGIInfoQueue_GetNumStoredMessages(This,Producer) \ - ( (This)->lpVtbl -> GetNumStoredMessages(This,Producer) ) + ( (This)->lpVtbl -> GetNumStoredMessages(This,Producer) ) #define IDXGIInfoQueue_GetNumMessagesDiscardedByMessageCountLimit(This,Producer) \ - ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This,Producer) ) + ( (This)->lpVtbl -> GetNumMessagesDiscardedByMessageCountLimit(This,Producer) ) #define IDXGIInfoQueue_GetMessageCountLimit(This,Producer) \ - ( (This)->lpVtbl -> GetMessageCountLimit(This,Producer) ) + ( (This)->lpVtbl -> GetMessageCountLimit(This,Producer) ) #define IDXGIInfoQueue_GetNumMessagesAllowedByStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> GetNumMessagesAllowedByStorageFilter(This,Producer) ) #define IDXGIInfoQueue_GetNumMessagesDeniedByStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> GetNumMessagesDeniedByStorageFilter(This,Producer) ) #define IDXGIInfoQueue_AddStorageFilterEntries(This,Producer,pFilter) \ - ( (This)->lpVtbl -> AddStorageFilterEntries(This,Producer,pFilter) ) + ( (This)->lpVtbl -> AddStorageFilterEntries(This,Producer,pFilter) ) #define IDXGIInfoQueue_GetStorageFilter(This,Producer,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetStorageFilter(This,Producer,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetStorageFilter(This,Producer,pFilter,pFilterByteLength) ) #define IDXGIInfoQueue_ClearStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> ClearStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> ClearStorageFilter(This,Producer) ) #define IDXGIInfoQueue_PushEmptyStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> PushEmptyStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> PushEmptyStorageFilter(This,Producer) ) #define IDXGIInfoQueue_PushDenyAllStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> PushDenyAllStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> PushDenyAllStorageFilter(This,Producer) ) #define IDXGIInfoQueue_PushCopyOfStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> PushCopyOfStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> PushCopyOfStorageFilter(This,Producer) ) #define IDXGIInfoQueue_PushStorageFilter(This,Producer,pFilter) \ - ( (This)->lpVtbl -> PushStorageFilter(This,Producer,pFilter) ) + ( (This)->lpVtbl -> PushStorageFilter(This,Producer,pFilter) ) #define IDXGIInfoQueue_PopStorageFilter(This,Producer) \ - ( (This)->lpVtbl -> PopStorageFilter(This,Producer) ) + ( (This)->lpVtbl -> PopStorageFilter(This,Producer) ) #define IDXGIInfoQueue_GetStorageFilterStackSize(This,Producer) \ - ( (This)->lpVtbl -> GetStorageFilterStackSize(This,Producer) ) + ( (This)->lpVtbl -> GetStorageFilterStackSize(This,Producer) ) #define IDXGIInfoQueue_AddRetrievalFilterEntries(This,Producer,pFilter) \ - ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,Producer,pFilter) ) + ( (This)->lpVtbl -> AddRetrievalFilterEntries(This,Producer,pFilter) ) #define IDXGIInfoQueue_GetRetrievalFilter(This,Producer,pFilter,pFilterByteLength) \ - ( (This)->lpVtbl -> GetRetrievalFilter(This,Producer,pFilter,pFilterByteLength) ) + ( (This)->lpVtbl -> GetRetrievalFilter(This,Producer,pFilter,pFilterByteLength) ) #define IDXGIInfoQueue_ClearRetrievalFilter(This,Producer) \ - ( (This)->lpVtbl -> ClearRetrievalFilter(This,Producer) ) + ( (This)->lpVtbl -> ClearRetrievalFilter(This,Producer) ) #define IDXGIInfoQueue_PushEmptyRetrievalFilter(This,Producer) \ - ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This,Producer) ) + ( (This)->lpVtbl -> PushEmptyRetrievalFilter(This,Producer) ) #define IDXGIInfoQueue_PushDenyAllRetrievalFilter(This,Producer) \ - ( (This)->lpVtbl -> PushDenyAllRetrievalFilter(This,Producer) ) + ( (This)->lpVtbl -> PushDenyAllRetrievalFilter(This,Producer) ) #define IDXGIInfoQueue_PushCopyOfRetrievalFilter(This,Producer) \ - ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This,Producer) ) + ( (This)->lpVtbl -> PushCopyOfRetrievalFilter(This,Producer) ) #define IDXGIInfoQueue_PushRetrievalFilter(This,Producer,pFilter) \ - ( (This)->lpVtbl -> PushRetrievalFilter(This,Producer,pFilter) ) + ( (This)->lpVtbl -> PushRetrievalFilter(This,Producer,pFilter) ) #define IDXGIInfoQueue_PopRetrievalFilter(This,Producer) \ - ( (This)->lpVtbl -> PopRetrievalFilter(This,Producer) ) + ( (This)->lpVtbl -> PopRetrievalFilter(This,Producer) ) #define IDXGIInfoQueue_GetRetrievalFilterStackSize(This,Producer) \ - ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This,Producer) ) + ( (This)->lpVtbl -> GetRetrievalFilterStackSize(This,Producer) ) #define IDXGIInfoQueue_AddMessage(This,Producer,Category,Severity,ID,pDescription) \ - ( (This)->lpVtbl -> AddMessage(This,Producer,Category,Severity,ID,pDescription) ) + ( (This)->lpVtbl -> AddMessage(This,Producer,Category,Severity,ID,pDescription) ) #define IDXGIInfoQueue_AddApplicationMessage(This,Severity,pDescription) \ - ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) + ( (This)->lpVtbl -> AddApplicationMessage(This,Severity,pDescription) ) #define IDXGIInfoQueue_SetBreakOnCategory(This,Producer,Category,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnCategory(This,Producer,Category,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnCategory(This,Producer,Category,bEnable) ) #define IDXGIInfoQueue_SetBreakOnSeverity(This,Producer,Severity,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnSeverity(This,Producer,Severity,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnSeverity(This,Producer,Severity,bEnable) ) #define IDXGIInfoQueue_SetBreakOnID(This,Producer,ID,bEnable) \ - ( (This)->lpVtbl -> SetBreakOnID(This,Producer,ID,bEnable) ) + ( (This)->lpVtbl -> SetBreakOnID(This,Producer,ID,bEnable) ) #define IDXGIInfoQueue_GetBreakOnCategory(This,Producer,Category) \ - ( (This)->lpVtbl -> GetBreakOnCategory(This,Producer,Category) ) + ( (This)->lpVtbl -> GetBreakOnCategory(This,Producer,Category) ) #define IDXGIInfoQueue_GetBreakOnSeverity(This,Producer,Severity) \ - ( (This)->lpVtbl -> GetBreakOnSeverity(This,Producer,Severity) ) + ( (This)->lpVtbl -> GetBreakOnSeverity(This,Producer,Severity) ) #define IDXGIInfoQueue_GetBreakOnID(This,Producer,ID) \ - ( (This)->lpVtbl -> GetBreakOnID(This,Producer,ID) ) + ( (This)->lpVtbl -> GetBreakOnID(This,Producer,ID) ) #define IDXGIInfoQueue_SetMuteDebugOutput(This,Producer,bMute) \ - ( (This)->lpVtbl -> SetMuteDebugOutput(This,Producer,bMute) ) + ( (This)->lpVtbl -> SetMuteDebugOutput(This,Producer,bMute) ) #define IDXGIInfoQueue_GetMuteDebugOutput(This,Producer) \ - ( (This)->lpVtbl -> GetMuteDebugOutput(This,Producer) ) + ( (This)->lpVtbl -> GetMuteDebugOutput(This,Producer) ) #endif /* COBJMACROS */ @@ -767,46 +764,45 @@ EXTERN_C const IID IID_IDXGIInfoQueue; #define __IDXGIDebug_INTERFACE_DEFINED__ /* interface IDXGIDebug */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_IDXGIDebug; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("119E7452-DE9E-40fe-8806-88F90C12B441") IDXGIDebug : public IUnknown { public: - virtual HRESULT STDMETHODCALLTYPE ReportLiveObjects( + virtual HRESULT STDMETHODCALLTYPE ReportLiveObjects( GUID apiid, DXGI_DEBUG_RLO_FLAGS flags) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDebugVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDebug * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDebug * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDebug * This); - - HRESULT ( STDMETHODCALLTYPE *ReportLiveObjects )( + + HRESULT ( STDMETHODCALLTYPE *ReportLiveObjects )( IDXGIDebug * This, GUID apiid, DXGI_DEBUG_RLO_FLAGS flags); - + END_INTERFACE } IDXGIDebugVtbl; @@ -815,21 +811,19 @@ EXTERN_C const IID IID_IDXGIDebug; CONST_VTBL struct IDXGIDebugVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDebug_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDebug_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDebug_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDebug_ReportLiveObjects(This,apiid,flags) \ - ( (This)->lpVtbl -> ReportLiveObjects(This,apiid,flags) ) + ( (This)->lpVtbl -> ReportLiveObjects(This,apiid,flags) ) #endif /* COBJMACROS */ @@ -841,57 +835,56 @@ EXTERN_C const IID IID_IDXGIDebug; #define __IDXGIDebug1_INTERFACE_DEFINED__ /* interface IDXGIDebug1 */ -/* [unique][local][object][uuid] */ +/* [unique][local][object][uuid] */ EXTERN_C const IID IID_IDXGIDebug1; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("c5a05f0c-16f2-4adf-9f4d-a8c4d58ac550") IDXGIDebug1 : public IDXGIDebug { public: virtual void STDMETHODCALLTYPE EnableLeakTrackingForThread( void) = 0; - + virtual void STDMETHODCALLTYPE DisableLeakTrackingForThread( void) = 0; - + virtual BOOL STDMETHODCALLTYPE IsLeakTrackingEnabledForThread( void) = 0; - + }; - - + #else /* C style interface */ typedef struct IDXGIDebug1Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( IDXGIDebug1 * This, /* [in] */ REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( IDXGIDebug1 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( IDXGIDebug1 * This); - - HRESULT ( STDMETHODCALLTYPE *ReportLiveObjects )( + + HRESULT ( STDMETHODCALLTYPE *ReportLiveObjects )( IDXGIDebug1 * This, GUID apiid, DXGI_DEBUG_RLO_FLAGS flags); - - void ( STDMETHODCALLTYPE *EnableLeakTrackingForThread )( + + void ( STDMETHODCALLTYPE *EnableLeakTrackingForThread )( IDXGIDebug1 * This); - - void ( STDMETHODCALLTYPE *DisableLeakTrackingForThread )( + + void ( STDMETHODCALLTYPE *DisableLeakTrackingForThread )( IDXGIDebug1 * This); - - BOOL ( STDMETHODCALLTYPE *IsLeakTrackingEnabledForThread )( + + BOOL ( STDMETHODCALLTYPE *IsLeakTrackingEnabledForThread )( IDXGIDebug1 * This); - + END_INTERFACE } IDXGIDebug1Vtbl; @@ -900,30 +893,28 @@ EXTERN_C const IID IID_IDXGIDebug1; CONST_VTBL struct IDXGIDebug1Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IDXGIDebug1_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IDXGIDebug1_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IDXGIDebug1_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IDXGIDebug1_ReportLiveObjects(This,apiid,flags) \ - ( (This)->lpVtbl -> ReportLiveObjects(This,apiid,flags) ) + ( (This)->lpVtbl -> ReportLiveObjects(This,apiid,flags) ) #define IDXGIDebug1_EnableLeakTrackingForThread(This) \ - ( (This)->lpVtbl -> EnableLeakTrackingForThread(This) ) + ( (This)->lpVtbl -> EnableLeakTrackingForThread(This) ) #define IDXGIDebug1_DisableLeakTrackingForThread(This) \ - ( (This)->lpVtbl -> DisableLeakTrackingForThread(This) ) + ( (This)->lpVtbl -> DisableLeakTrackingForThread(This) ) #define IDXGIDebug1_IsLeakTrackingEnabledForThread(This) \ - ( (This)->lpVtbl -> IsLeakTrackingEnabledForThread(This) ) + ( (This)->lpVtbl -> IsLeakTrackingEnabledForThread(This) ) #endif /* COBJMACROS */ @@ -932,7 +923,7 @@ EXTERN_C const IID IID_IDXGIDebug1; #endif /* __IDXGIDebug1_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_dxgidebug_0000_0003 */ -/* [local] */ +/* [local] */ /*#endif*/ /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ /*#pragma endregion*/ diff --git a/gfx/include/dxsdk/dxsdkver.h b/gfx/include/dxsdk/dxsdkver.h index 4351e14303..8c8de07f29 100644 --- a/gfx/include/dxsdk/dxsdkver.h +++ b/gfx/include/dxsdk/dxsdkver.h @@ -9,9 +9,9 @@ #ifndef _DXSDKVER_H_ #define _DXSDKVER_H_ -#define _DXSDK_PRODUCT_MAJOR 9 -#define _DXSDK_PRODUCT_MINOR 29 -#define _DXSDK_BUILD_MAJOR 1962 -#define _DXSDK_BUILD_MINOR 0 +#define _DXSDK_PRODUCT_MAJOR 9 +#define _DXSDK_PRODUCT_MINOR 29 +#define _DXSDK_BUILD_MAJOR 1962 +#define _DXSDK_BUILD_MINOR 0 #endif // _DXSDKVER_H_ diff --git a/gfx/include/dxsdk/gameux.h b/gfx/include/dxsdk/gameux.h index bee2e2d8d0..56209be268 100644 --- a/gfx/include/dxsdk/gameux.h +++ b/gfx/include/dxsdk/gameux.h @@ -33,7 +33,7 @@ #pragma once #endif -/* Forward Declarations */ +/* Forward Declarations */ #ifndef __IGameExplorer_FWD_DEFINED__ #define __IGameExplorer_FWD_DEFINED__ @@ -88,10 +88,10 @@ typedef struct GameStatistics GameStatistics; #ifdef __cplusplus extern "C"{ -#endif +#endif /* interface __MIDL_itf_gameux_0000_0000 */ -/* [local] */ +/* [local] */ #include #pragma region Desktop Family @@ -101,7 +101,7 @@ extern "C"{ #define ID_ICON_ICO __ICON_ICO #define ID_GDF_XML_STR L"__GDF_XML" #define ID_GDF_THUMBNAIL_STR L"__GDF_THUMBNAIL" -typedef /* [v1_enum] */ +typedef /* [v1_enum] */ enum GAME_INSTALL_SCOPE { GIS_NOT_INSTALLED = 1, @@ -116,73 +116,72 @@ extern RPC_IF_HANDLE __MIDL_itf_gameux_0000_0000_v0_0_s_ifspec; #define __IGameExplorer_INTERFACE_DEFINED__ /* interface IGameExplorer */ -/* [unique][helpstring][uuid][object] */ +/* [unique][helpstring][uuid][object] */ EXTERN_C const IID IID_IGameExplorer; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("E7B2FB72-D728-49B3-A5F2-18EBF5F1349E") IGameExplorer : public IUnknown { public: - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE AddGame( + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE AddGame( /* [in] */ __RPC__in BSTR bstrGDFBinaryPath, /* [in] */ __RPC__in BSTR bstrGameInstallDirectory, /* [in] */ GAME_INSTALL_SCOPE installScope, /* [out][in] */ __RPC__inout GUID *pguidInstanceID) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGame( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGame( /* [in] */ GUID guidInstanceID) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UpdateGame( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UpdateGame( /* [in] */ GUID guidInstanceID) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VerifyAccess( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE VerifyAccess( /* [in] */ __RPC__in BSTR bstrGDFBinaryPath, /* [out] */ __RPC__out BOOL *pfHasAccess) = 0; - + }; - - + #else /* C style interface */ typedef struct IGameExplorerVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( __RPC__in IGameExplorer * This, /* [in] */ __RPC__in REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( __RPC__in IGameExplorer * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( __RPC__in IGameExplorer * This); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *AddGame )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *AddGame )( __RPC__in IGameExplorer * This, /* [in] */ __RPC__in BSTR bstrGDFBinaryPath, /* [in] */ __RPC__in BSTR bstrGameInstallDirectory, /* [in] */ GAME_INSTALL_SCOPE installScope, /* [out][in] */ __RPC__inout GUID *pguidInstanceID); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGame )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGame )( __RPC__in IGameExplorer * This, /* [in] */ GUID guidInstanceID); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UpdateGame )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UpdateGame )( __RPC__in IGameExplorer * This, /* [in] */ GUID guidInstanceID); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VerifyAccess )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *VerifyAccess )( __RPC__in IGameExplorer * This, /* [in] */ __RPC__in BSTR bstrGDFBinaryPath, /* [out] */ __RPC__out BOOL *pfHasAccess); - + END_INTERFACE } IGameExplorerVtbl; @@ -191,30 +190,28 @@ EXTERN_C const IID IID_IGameExplorer; CONST_VTBL struct IGameExplorerVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IGameExplorer_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IGameExplorer_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IGameExplorer_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IGameExplorer_AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID) \ - ( (This)->lpVtbl -> AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID) ) + ( (This)->lpVtbl -> AddGame(This,bstrGDFBinaryPath,bstrGameInstallDirectory,installScope,pguidInstanceID) ) #define IGameExplorer_RemoveGame(This,guidInstanceID) \ - ( (This)->lpVtbl -> RemoveGame(This,guidInstanceID) ) + ( (This)->lpVtbl -> RemoveGame(This,guidInstanceID) ) #define IGameExplorer_UpdateGame(This,guidInstanceID) \ - ( (This)->lpVtbl -> UpdateGame(This,guidInstanceID) ) + ( (This)->lpVtbl -> UpdateGame(This,guidInstanceID) ) #define IGameExplorer_VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess) \ - ( (This)->lpVtbl -> VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess) ) + ( (This)->lpVtbl -> VerifyAccess(This,bstrGDFBinaryPath,pfHasAccess) ) #endif /* COBJMACROS */ @@ -223,16 +220,16 @@ EXTERN_C const IID IID_IGameExplorer; #endif /* __IGameExplorer_INTERFACE_DEFINED__ */ /* interface __MIDL_itf_gameux_0000_0001 */ -/* [local] */ +/* [local] */ -typedef /* [v1_enum] */ +typedef /* [v1_enum] */ enum GAMESTATS_OPEN_TYPE { GAMESTATS_OPEN_OPENORCREATE = 0, GAMESTATS_OPEN_OPENONLY = 1 } GAMESTATS_OPEN_TYPE; -typedef /* [v1_enum] */ +typedef /* [v1_enum] */ enum GAMESTATS_OPEN_RESULT { GAMESTATS_OPEN_CREATED = 0, @@ -246,137 +243,136 @@ extern RPC_IF_HANDLE __MIDL_itf_gameux_0000_0001_v0_0_s_ifspec; #define __IGameStatistics_INTERFACE_DEFINED__ /* interface IGameStatistics */ -/* [unique][helpstring][uuid][object] */ +/* [unique][helpstring][uuid][object] */ EXTERN_C const IID IID_IGameStatistics; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("3887C9CA-04A0-42ae-BC4C-5FA6C7721145") IGameStatistics : public IUnknown { public: - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxCategoryLength( + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxCategoryLength( /* [retval][out] */ __RPC__out UINT *cch) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxNameLength( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxNameLength( /* [retval][out] */ __RPC__out UINT *cch) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxValueLength( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxValueLength( /* [retval][out] */ __RPC__out UINT *cch) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxCategories( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxCategories( /* [retval][out] */ __RPC__out WORD *pMax) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxStatsPerCategory( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetMaxStatsPerCategory( /* [retval][out] */ __RPC__out WORD *pMax) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetCategoryTitle( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetCategoryTitle( /* [in] */ WORD categoryIndex, /* [string][in] */ __RPC__in_string LPCWSTR title) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetCategoryTitle( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetCategoryTitle( /* [in] */ WORD categoryIndex, /* [retval][string][out] */ __RPC__deref_out_opt_string LPWSTR *pTitle) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetStatistic( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetStatistic( /* [in] */ WORD categoryIndex, /* [in] */ WORD statIndex, /* [string][unique][out][in] */ __RPC__deref_opt_inout_opt_string LPWSTR *pName, /* [string][unique][out][in] */ __RPC__deref_opt_inout_opt_string LPWSTR *pValue) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetStatistic( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetStatistic( /* [in] */ WORD categoryIndex, /* [in] */ WORD statIndex, /* [string][in] */ __RPC__in_string LPCWSTR name, /* [string][in] */ __RPC__in_string LPCWSTR value) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Save( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE Save( /* [in] */ BOOL trackChanges) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetLastPlayedCategory( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE SetLastPlayedCategory( /* [in] */ UINT categoryIndex) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLastPlayedCategory( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetLastPlayedCategory( /* [retval][out] */ __RPC__out UINT *pCategoryIndex) = 0; - + }; - - + #else /* C style interface */ typedef struct IGameStatisticsVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( __RPC__in IGameStatistics * This, /* [in] */ __RPC__in REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( __RPC__in IGameStatistics * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( __RPC__in IGameStatistics * This); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxCategoryLength )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxCategoryLength )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out UINT *cch); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxNameLength )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxNameLength )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out UINT *cch); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxValueLength )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxValueLength )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out UINT *cch); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxCategories )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxCategories )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out WORD *pMax); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxStatsPerCategory )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetMaxStatsPerCategory )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out WORD *pMax); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetCategoryTitle )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetCategoryTitle )( __RPC__in IGameStatistics * This, /* [in] */ WORD categoryIndex, /* [string][in] */ __RPC__in_string LPCWSTR title); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetCategoryTitle )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetCategoryTitle )( __RPC__in IGameStatistics * This, /* [in] */ WORD categoryIndex, /* [retval][string][out] */ __RPC__deref_out_opt_string LPWSTR *pTitle); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetStatistic )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetStatistic )( __RPC__in IGameStatistics * This, /* [in] */ WORD categoryIndex, /* [in] */ WORD statIndex, /* [string][unique][out][in] */ __RPC__deref_opt_inout_opt_string LPWSTR *pName, /* [string][unique][out][in] */ __RPC__deref_opt_inout_opt_string LPWSTR *pValue); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetStatistic )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetStatistic )( __RPC__in IGameStatistics * This, /* [in] */ WORD categoryIndex, /* [in] */ WORD statIndex, /* [string][in] */ __RPC__in_string LPCWSTR name, /* [string][in] */ __RPC__in_string LPCWSTR value); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *Save )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *Save )( __RPC__in IGameStatistics * This, /* [in] */ BOOL trackChanges); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetLastPlayedCategory )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *SetLastPlayedCategory )( __RPC__in IGameStatistics * This, /* [in] */ UINT categoryIndex); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetLastPlayedCategory )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetLastPlayedCategory )( __RPC__in IGameStatistics * This, /* [retval][out] */ __RPC__out UINT *pCategoryIndex); - + END_INTERFACE } IGameStatisticsVtbl; @@ -385,54 +381,52 @@ EXTERN_C const IID IID_IGameStatistics; CONST_VTBL struct IGameStatisticsVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IGameStatistics_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IGameStatistics_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IGameStatistics_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IGameStatistics_GetMaxCategoryLength(This,cch) \ - ( (This)->lpVtbl -> GetMaxCategoryLength(This,cch) ) + ( (This)->lpVtbl -> GetMaxCategoryLength(This,cch) ) #define IGameStatistics_GetMaxNameLength(This,cch) \ - ( (This)->lpVtbl -> GetMaxNameLength(This,cch) ) + ( (This)->lpVtbl -> GetMaxNameLength(This,cch) ) #define IGameStatistics_GetMaxValueLength(This,cch) \ - ( (This)->lpVtbl -> GetMaxValueLength(This,cch) ) + ( (This)->lpVtbl -> GetMaxValueLength(This,cch) ) #define IGameStatistics_GetMaxCategories(This,pMax) \ - ( (This)->lpVtbl -> GetMaxCategories(This,pMax) ) + ( (This)->lpVtbl -> GetMaxCategories(This,pMax) ) #define IGameStatistics_GetMaxStatsPerCategory(This,pMax) \ - ( (This)->lpVtbl -> GetMaxStatsPerCategory(This,pMax) ) + ( (This)->lpVtbl -> GetMaxStatsPerCategory(This,pMax) ) #define IGameStatistics_SetCategoryTitle(This,categoryIndex,title) \ - ( (This)->lpVtbl -> SetCategoryTitle(This,categoryIndex,title) ) + ( (This)->lpVtbl -> SetCategoryTitle(This,categoryIndex,title) ) #define IGameStatistics_GetCategoryTitle(This,categoryIndex,pTitle) \ - ( (This)->lpVtbl -> GetCategoryTitle(This,categoryIndex,pTitle) ) + ( (This)->lpVtbl -> GetCategoryTitle(This,categoryIndex,pTitle) ) #define IGameStatistics_GetStatistic(This,categoryIndex,statIndex,pName,pValue) \ - ( (This)->lpVtbl -> GetStatistic(This,categoryIndex,statIndex,pName,pValue) ) + ( (This)->lpVtbl -> GetStatistic(This,categoryIndex,statIndex,pName,pValue) ) #define IGameStatistics_SetStatistic(This,categoryIndex,statIndex,name,value) \ - ( (This)->lpVtbl -> SetStatistic(This,categoryIndex,statIndex,name,value) ) + ( (This)->lpVtbl -> SetStatistic(This,categoryIndex,statIndex,name,value) ) #define IGameStatistics_Save(This,trackChanges) \ - ( (This)->lpVtbl -> Save(This,trackChanges) ) + ( (This)->lpVtbl -> Save(This,trackChanges) ) #define IGameStatistics_SetLastPlayedCategory(This,categoryIndex) \ - ( (This)->lpVtbl -> SetLastPlayedCategory(This,categoryIndex) ) + ( (This)->lpVtbl -> SetLastPlayedCategory(This,categoryIndex) ) #define IGameStatistics_GetLastPlayedCategory(This,pCategoryIndex) \ - ( (This)->lpVtbl -> GetLastPlayedCategory(This,pCategoryIndex) ) + ( (This)->lpVtbl -> GetLastPlayedCategory(This,pCategoryIndex) ) #endif /* COBJMACROS */ @@ -444,57 +438,56 @@ EXTERN_C const IID IID_IGameStatistics; #define __IGameStatisticsMgr_INTERFACE_DEFINED__ /* interface IGameStatisticsMgr */ -/* [unique][helpstring][uuid][object] */ +/* [unique][helpstring][uuid][object] */ EXTERN_C const IID IID_IGameStatisticsMgr; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("AFF3EA11-E70E-407d-95DD-35E612C41CE2") IGameStatisticsMgr : public IUnknown { public: - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGameStatistics( + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE GetGameStatistics( /* [string][in] */ __RPC__in_string LPCWSTR GDFBinaryPath, /* [in] */ GAMESTATS_OPEN_TYPE openType, /* [out] */ __RPC__out GAMESTATS_OPEN_RESULT *pOpenResult, /* [retval][out] */ __RPC__deref_out_opt IGameStatistics **ppiStats) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGameStatistics( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE RemoveGameStatistics( /* [string][in] */ __RPC__in_string LPCWSTR GDFBinaryPath) = 0; - + }; - - + #else /* C style interface */ typedef struct IGameStatisticsMgrVtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( __RPC__in IGameStatisticsMgr * This, /* [in] */ __RPC__in REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( __RPC__in IGameStatisticsMgr * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( __RPC__in IGameStatisticsMgr * This); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetGameStatistics )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *GetGameStatistics )( __RPC__in IGameStatisticsMgr * This, /* [string][in] */ __RPC__in_string LPCWSTR GDFBinaryPath, /* [in] */ GAMESTATS_OPEN_TYPE openType, /* [out] */ __RPC__out GAMESTATS_OPEN_RESULT *pOpenResult, /* [retval][out] */ __RPC__deref_out_opt IGameStatistics **ppiStats); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGameStatistics )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *RemoveGameStatistics )( __RPC__in IGameStatisticsMgr * This, /* [string][in] */ __RPC__in_string LPCWSTR GDFBinaryPath); - + END_INTERFACE } IGameStatisticsMgrVtbl; @@ -503,24 +496,22 @@ EXTERN_C const IID IID_IGameStatisticsMgr; CONST_VTBL struct IGameStatisticsMgrVtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IGameStatisticsMgr_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IGameStatisticsMgr_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IGameStatisticsMgr_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IGameStatisticsMgr_GetGameStatistics(This,GDFBinaryPath,openType,pOpenResult,ppiStats) \ - ( (This)->lpVtbl -> GetGameStatistics(This,GDFBinaryPath,openType,pOpenResult,ppiStats) ) + ( (This)->lpVtbl -> GetGameStatistics(This,GDFBinaryPath,openType,pOpenResult,ppiStats) ) #define IGameStatisticsMgr_RemoveGameStatistics(This,GDFBinaryPath) \ - ( (This)->lpVtbl -> RemoveGameStatistics(This,GDFBinaryPath) ) + ( (This)->lpVtbl -> RemoveGameStatistics(This,GDFBinaryPath) ) #endif /* COBJMACROS */ @@ -532,64 +523,63 @@ EXTERN_C const IID IID_IGameStatisticsMgr; #define __IGameExplorer2_INTERFACE_DEFINED__ /* interface IGameExplorer2 */ -/* [unique][helpstring][uuid][object] */ +/* [unique][helpstring][uuid][object] */ EXTERN_C const IID IID_IGameExplorer2; #if defined(__cplusplus) && !defined(CINTERFACE) - + MIDL_INTERFACE("86874AA7-A1ED-450d-A7EB-B89E20B2FFF3") IGameExplorer2 : public IUnknown { public: - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE InstallGame( + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE InstallGame( /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath, /* [unique][in] */ __RPC__in_opt LPCWSTR installDirectory, /* [in] */ GAME_INSTALL_SCOPE installScope) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UninstallGame( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE UninstallGame( /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath) = 0; - - virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE CheckAccess( + + virtual /* [helpstring] */ HRESULT STDMETHODCALLTYPE CheckAccess( /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath, /* [retval][out] */ __RPC__out BOOL *pHasAccess) = 0; - + }; - - + #else /* C style interface */ typedef struct IGameExplorer2Vtbl { BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE *QueryInterface )( + + HRESULT ( STDMETHODCALLTYPE *QueryInterface )( __RPC__in IGameExplorer2 * This, /* [in] */ __RPC__in REFIID riid, - /* [annotation][iid_is][out] */ + /* [annotation][iid_is][out] */ _COM_Outptr_ void **ppvObject); - - ULONG ( STDMETHODCALLTYPE *AddRef )( + + ULONG ( STDMETHODCALLTYPE *AddRef )( __RPC__in IGameExplorer2 * This); - - ULONG ( STDMETHODCALLTYPE *Release )( + + ULONG ( STDMETHODCALLTYPE *Release )( __RPC__in IGameExplorer2 * This); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *InstallGame )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *InstallGame )( __RPC__in IGameExplorer2 * This, /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath, /* [unique][in] */ __RPC__in_opt LPCWSTR installDirectory, /* [in] */ GAME_INSTALL_SCOPE installScope); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UninstallGame )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *UninstallGame )( __RPC__in IGameExplorer2 * This, /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath); - - /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *CheckAccess )( + + /* [helpstring] */ HRESULT ( STDMETHODCALLTYPE *CheckAccess )( __RPC__in IGameExplorer2 * This, /* [string][in] */ __RPC__in_string LPCWSTR binaryGDFPath, /* [retval][out] */ __RPC__out BOOL *pHasAccess); - + END_INTERFACE } IGameExplorer2Vtbl; @@ -598,27 +588,25 @@ EXTERN_C const IID IID_IGameExplorer2; CONST_VTBL struct IGameExplorer2Vtbl *lpVtbl; }; - - #ifdef COBJMACROS #define IGameExplorer2_QueryInterface(This,riid,ppvObject) \ - ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) + ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) #define IGameExplorer2_AddRef(This) \ - ( (This)->lpVtbl -> AddRef(This) ) + ( (This)->lpVtbl -> AddRef(This) ) #define IGameExplorer2_Release(This) \ - ( (This)->lpVtbl -> Release(This) ) + ( (This)->lpVtbl -> Release(This) ) #define IGameExplorer2_InstallGame(This,binaryGDFPath,installDirectory,installScope) \ - ( (This)->lpVtbl -> InstallGame(This,binaryGDFPath,installDirectory,installScope) ) + ( (This)->lpVtbl -> InstallGame(This,binaryGDFPath,installDirectory,installScope) ) #define IGameExplorer2_UninstallGame(This,binaryGDFPath) \ - ( (This)->lpVtbl -> UninstallGame(This,binaryGDFPath) ) + ( (This)->lpVtbl -> UninstallGame(This,binaryGDFPath) ) #define IGameExplorer2_CheckAccess(This,binaryGDFPath,pHasAccess) \ - ( (This)->lpVtbl -> CheckAccess(This,binaryGDFPath,pHasAccess) ) + ( (This)->lpVtbl -> CheckAccess(This,binaryGDFPath,pHasAccess) ) #endif /* COBJMACROS */ @@ -630,7 +618,7 @@ EXTERN_C const IID IID_IGameExplorer2; #define __gameuxLib_LIBRARY_DEFINED__ /* library gameuxLib */ -/* [helpstring][version][uuid] */ +/* [helpstring][version][uuid] */ EXTERN_C const IID LIBID_gameuxLib; @@ -652,7 +640,7 @@ GameStatistics; #endif /* __gameuxLib_LIBRARY_DEFINED__ */ /* interface __MIDL_itf_gameux_0000_0005 */ -/* [local] */ +/* [local] */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #pragma endregion @@ -662,15 +650,15 @@ extern RPC_IF_HANDLE __MIDL_itf_gameux_0000_0005_v0_0_s_ifspec; /* Additional Prototypes for ALL interfaces */ -unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * ); -unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); -unsigned char * __RPC_USER BSTR_UserUnmarshal(__RPC__in unsigned long *, __RPC__in_xcount(0) unsigned char *, __RPC__out BSTR * ); -void __RPC_USER BSTR_UserFree( __RPC__in unsigned long *, __RPC__in BSTR * ); +unsigned long __RPC_USER BSTR_UserSize( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * ); +unsigned char * __RPC_USER BSTR_UserMarshal( __RPC__in unsigned long *, __RPC__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); +unsigned char * __RPC_USER BSTR_UserUnmarshal(__RPC__in unsigned long *, __RPC__in_xcount(0) unsigned char *, __RPC__out BSTR * ); +void __RPC_USER BSTR_UserFree( __RPC__in unsigned long *, __RPC__in BSTR * ); -unsigned long __RPC_USER BSTR_UserSize64( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * ); -unsigned char * __RPC_USER BSTR_UserMarshal64( __RPC__in unsigned long *, __RPC__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); -unsigned char * __RPC_USER BSTR_UserUnmarshal64(__RPC__in unsigned long *, __RPC__in_xcount(0) unsigned char *, __RPC__out BSTR * ); -void __RPC_USER BSTR_UserFree64( __RPC__in unsigned long *, __RPC__in BSTR * ); +unsigned long __RPC_USER BSTR_UserSize64( __RPC__in unsigned long *, unsigned long , __RPC__in BSTR * ); +unsigned char * __RPC_USER BSTR_UserMarshal64( __RPC__in unsigned long *, __RPC__inout_xcount(0) unsigned char *, __RPC__in BSTR * ); +unsigned char * __RPC_USER BSTR_UserUnmarshal64(__RPC__in unsigned long *, __RPC__in_xcount(0) unsigned char *, __RPC__out BSTR * ); +void __RPC_USER BSTR_UserFree64( __RPC__in unsigned long *, __RPC__in BSTR * ); /* end of Additional Prototypes */ diff --git a/gfx/include/dxsdk/pixplugin.h b/gfx/include/dxsdk/pixplugin.h index 297598b1d8..c2327470d5 100644 --- a/gfx/include/dxsdk/pixplugin.h +++ b/gfx/include/dxsdk/pixplugin.h @@ -9,7 +9,7 @@ #pragma once #ifdef __cplusplus -extern "C" +extern "C" { #endif @@ -50,7 +50,7 @@ struct PIXPLUGININFO }; //================================================================================================== -// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX +// PIXCOUNTERINFO - This structure is filled out by PIXGetCounterInfo and passed back to PIX // to allow PIX to determine information about the counters in the plugin. //================================================================================================== struct PIXCOUNTERINFO @@ -66,7 +66,7 @@ struct PIXCOUNTERINFO BOOL WINAPI PIXGetPluginInfo( PIXPLUGININFO* pPIXPluginInfo ); //================================================================================================== -// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX. +// PIXGetCounterInfo - This returns an array of PIXCOUNTERINFO structs to PIX. // These PIXCOUNTERINFOs allow PIX to enumerate the counters contained // in this plugin. //================================================================================================== @@ -86,8 +86,8 @@ BOOL WINAPI PIXBeginExperiment( PIXCOUNTERID id, const WCHAR* pstrApplication ); // PIXEndFrame - This is called by PIX once per counter at the end of each frame to gather the // counter value for that frame. Note that the pointer to the return data must // continue to point to valid counter data until the next call to PIXEndFrame (or -// PIXEndExperiment) for the same counter. So do not set *ppReturnData to the same -// pointer for multiple counters, or point to a local variable that will go out of +// PIXEndExperiment) for the same counter. So do not set *ppReturnData to the same +// pointer for multiple counters, or point to a local variable that will go out of // scope. See the sample PIX plugin for an example of how to structure a plugin // properly. //================================================================================================== diff --git a/gfx/include/dxsdk/rmxfguid.h b/gfx/include/dxsdk/rmxfguid.h index 5be04ddd20..bb6c5374cb 100644 --- a/gfx/include/dxsdk/rmxfguid.h +++ b/gfx/include/dxsdk/rmxfguid.h @@ -208,15 +208,15 @@ DEFINE_GUID(TID_D3DRMExternalVisual, 0x98116AA0, 0xBDBA, 0x11d1, 0x82, 0xC0, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x71); /* {7F0F21E0-BFE1-11d1-82C0-00A0C9697271} */ -DEFINE_GUID(TID_D3DRMStringProperty, +DEFINE_GUID(TID_D3DRMStringProperty, 0x7f0f21e0, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71); /* {7F0F21E1-BFE1-11d1-82C0-00A0C9697271} */ -DEFINE_GUID(TID_D3DRMPropertyBag, +DEFINE_GUID(TID_D3DRMPropertyBag, 0x7f0f21e1, 0xbfe1, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71); // {7F5D5EA0-D53A-11d1-82C0-00A0C9697271} -DEFINE_GUID(TID_D3DRMRightHanded, +DEFINE_GUID(TID_D3DRMRightHanded, 0x7f5d5ea0, 0xd53a, 0x11d1, 0x82, 0xc0, 0x0, 0xa0, 0xc9, 0x69, 0x72, 0x71); #endif /* __RMXFGUID_H_ */ diff --git a/gfx/include/dxsdk/rmxftmpl.h b/gfx/include/dxsdk/rmxftmpl.h index e0018d0461..dad1171fd5 100644 --- a/gfx/include/dxsdk/rmxftmpl.h +++ b/gfx/include/dxsdk/rmxftmpl.h @@ -4,333 +4,333 @@ #define _RMXFTMPL_H_ unsigned char D3DRM_XTEMPLATES[] = { - 0x78, 0x6f, 0x66, 0x20, 0x30, 0x33, 0x30, 0x32, 0x62, - 0x69, 0x6e, 0x20, 0x30, 0x30, 0x36, 0x34, 0x1f, 0, 0x1, - 0, 0x6, 0, 0, 0, 0x48, 0x65, 0x61, 0x64, 0x65, - 0x72, 0xa, 0, 0x5, 0, 0x43, 0xab, 0x82, 0x3d, 0xda, - 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, - 0x33, 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x6d, - 0x61, 0x6a, 0x6f, 0x72, 0x14, 0, 0x28, 0, 0x1, 0, - 0x5, 0, 0, 0, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x14, - 0, 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x66, - 0x6c, 0x61, 0x67, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, - 0x6f, 0x72, 0xa, 0, 0x5, 0, 0x5e, 0xab, 0x82, 0x3d, - 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, - 0xe4, 0x33, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 0, - 0x78, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 0, - 0, 0x79, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, - 0, 0, 0x7a, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, - 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, - 0x73, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x44, 0x3f, 0xf2, - 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, - 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, 0x1, 0, 0, - 0, 0x75, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, - 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, - 0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, - 0x78, 0x34, 0x78, 0x34, 0xa, 0, 0x5, 0, 0x45, 0x3f, - 0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, - 0x33, 0x35, 0x94, 0xa3, 0x34, 0, 0x2a, 0, 0x1, 0, - 0x6, 0, 0, 0, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, - 0xe, 0, 0x3, 0, 0x10, 0, 0, 0, 0xf, 0, - 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, - 0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, - 0x41, 0xa, 0, 0x5, 0, 0xe0, 0x44, 0xff, 0x35, 0x7c, - 0x6c, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, - 0xa3, 0x2a, 0, 0x1, 0, 0x3, 0, 0, 0, 0x72, - 0x65, 0x64, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, - 0, 0, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x14, 0, 0x2a, - 0, 0x1, 0, 0x4, 0, 0, 0, 0x62, 0x6c, 0x75, - 0x65, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, 0, - 0, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x14, 0, 0xb, 0, - 0x1f, 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, - 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0xa, 0, 0x5, 0, - 0x81, 0x6e, 0xe1, 0xd3, 0x35, 0x78, 0xcf, 0x11, 0x8f, 0x52, - 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, - 0x3, 0, 0, 0, 0x72, 0x65, 0x64, 0x14, 0, 0x2a, - 0, 0x1, 0, 0x5, 0, 0, 0, 0x67, 0x72, 0x65, - 0x65, 0x6e, 0x14, 0, 0x2a, 0, 0x1, 0, 0x4, 0, - 0, 0, 0x62, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, 0, - 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x49, 0x6e, - 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, - 0xa, 0, 0x5, 0, 0x20, 0xb8, 0x30, 0x16, 0x42, 0x78, - 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, - 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x14, 0, 0x1, 0, 0x9, 0, 0, - 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, - 0x1, 0, 0xa, 0, 0, 0, 0x69, 0x6e, 0x64, 0x65, - 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0xb, 0, - 0x1f, 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, - 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0xa, 0, 0x5, 0, 0xa0, - 0xa6, 0x7d, 0x53, 0x37, 0xca, 0xd0, 0x11, 0x94, 0x1c, 0, - 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, 0, 0x9, - 0, 0, 0, 0x74, 0x72, 0x75, 0x65, 0x66, 0x61, 0x6c, - 0x73, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, - 0x9, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, - 0x6e, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x63, 0xae, 0x85, - 0x48, 0xe8, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, - 0x35, 0x94, 0xa3, 0x1, 0, 0x7, 0, 0, 0, 0x42, - 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, - 0, 0, 0x75, 0x14, 0, 0x1, 0, 0x7, 0, 0, - 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, - 0x1, 0, 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, - 0, 0x1, 0, 0xc, 0, 0, 0, 0x4d, 0x61, 0x74, - 0x65, 0x72, 0x69, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0xa, - 0, 0x5, 0, 0x60, 0xae, 0x85, 0x48, 0xe8, 0x78, 0xcf, - 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, - 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, - 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, 0x75, 0x14, - 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, - 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, - 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0xf, - 0, 0, 0, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, - 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0xa, 0, - 0x5, 0, 0xe1, 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, - 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x31, 0, - 0x1, 0, 0x8, 0, 0, 0, 0x66, 0x69, 0x6c, 0x65, - 0x6e, 0x61, 0x6d, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0x8, 0, 0, 0, 0x4d, 0x61, 0x74, 0x65, - 0x72, 0x69, 0x61, 0x6c, 0xa, 0, 0x5, 0, 0x4d, 0xab, - 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, - 0xaf, 0x71, 0xe4, 0x33, 0x1, 0, 0x9, 0, 0, 0, - 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, 0x1, - 0, 0x9, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x43, - 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x2a, 0, 0x1, 0, - 0x5, 0, 0, 0, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x14, - 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6c, - 0x6f, 0x72, 0x52, 0x47, 0x42, 0x1, 0, 0xd, 0, 0, - 0, 0x73, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x43, - 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x1, 0, 0x8, 0, - 0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, - 0x1, 0, 0xd, 0, 0, 0, 0x65, 0x6d, 0x69, 0x73, - 0x73, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, - 0, 0xe, 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, - 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x8, 0, 0, - 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, 0xa, - 0, 0x5, 0, 0x5f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, - 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, - 0, 0x1, 0, 0x12, 0, 0, 0, 0x6e, 0x46, 0x61, - 0x63, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, - 0x64, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, - 0, 0x1, 0, 0x11, 0, 0, 0, 0x66, 0x61, 0x63, - 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, - 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, 0, 0x12, 0, - 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x56, 0x65, 0x72, - 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, - 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, - 0xd, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, - 0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x73, 0xa, 0, 0x5, - 0, 0xc0, 0xc5, 0x1e, 0xed, 0xa8, 0xc0, 0xd0, 0x11, 0x94, - 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, - 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, - 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, - 0x14, 0, 0x34, 0, 0x1, 0, 0x9, 0, 0, 0, - 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x32, 0x64, 0x1, - 0, 0xe, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x57, - 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0xe, - 0, 0x1, 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, - 0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0x11, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, - 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, - 0x72, 0x64, 0x73, 0xa, 0, 0x5, 0, 0x40, 0x3f, 0xf2, - 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, - 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xe, 0, 0, - 0, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, - 0x6f, 0x6f, 0x72, 0x64, 0x73, 0x14, 0, 0x34, 0, 0x1, - 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, - 0x73, 0x32, 0x64, 0x1, 0, 0xd, 0, 0, 0, 0x74, - 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, 0x72, - 0x64, 0x73, 0xe, 0, 0x1, 0, 0xe, 0, 0, 0, - 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, - 0x6f, 0x72, 0x64, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, - 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x4d, 0x65, - 0x73, 0x68, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, - 0x4c, 0x69, 0x73, 0x74, 0xa, 0, 0x5, 0, 0x42, 0x3f, - 0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, - 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, 0, - 0, 0, 0x6e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, - 0x6c, 0x73, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, 0, - 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x64, - 0x65, 0x78, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, 0, - 0x1, 0, 0xb, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, - 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xe, 0, 0x1, - 0, 0xc, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, - 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xf, 0, 0x14, - 0, 0xe, 0, 0x1, 0, 0x8, 0, 0, 0, 0x4d, - 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0xf, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x4d, - 0x65, 0x73, 0x68, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, - 0xa, 0, 0x5, 0, 0x43, 0x3f, 0xf2, 0xf6, 0x86, 0x76, - 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, - 0x29, 0, 0x1, 0, 0x8, 0, 0, 0, 0x6e, 0x4e, - 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, - 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, - 0x6f, 0x72, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x6f, - 0x72, 0x6d, 0x61, 0x6c, 0x73, 0xe, 0, 0x1, 0, 0x8, - 0, 0, 0, 0x6e, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, - 0x73, 0xf, 0, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, - 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x4e, 0x6f, - 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x1, - 0, 0x8, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, - 0x61, 0x63, 0x65, 0x1, 0, 0xb, 0, 0, 0, 0x66, - 0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, - 0xe, 0, 0x1, 0, 0xc, 0, 0, 0, 0x6e, 0x46, - 0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, - 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, - 0x10, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x56, 0x65, - 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x73, - 0xa, 0, 0x5, 0, 0x21, 0xb8, 0x30, 0x16, 0x42, 0x78, - 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, - 0x29, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, 0x56, - 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, - 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0xc, 0, 0, - 0, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, - 0x6c, 0x6f, 0x72, 0x1, 0, 0xc, 0, 0, 0, 0x76, - 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, - 0x73, 0xe, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, - 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, - 0x72, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0x4, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, - 0xa, 0, 0x5, 0, 0x44, 0xab, 0x82, 0x3d, 0xda, 0x62, - 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, - 0x29, 0, 0x1, 0, 0x9, 0, 0, 0, 0x6e, 0x56, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, - 0, 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, - 0x74, 0x6f, 0x72, 0x1, 0, 0x8, 0, 0, 0, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, - 0, 0x9, 0, 0, 0, 0x6e, 0x56, 0x65, 0x72, 0x74, - 0x69, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0x29, 0, - 0x1, 0, 0x6, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, - 0x65, 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0x8, 0, - 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, - 0x1, 0, 0x5, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, - 0x73, 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x6e, - 0x46, 0x61, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xe, - 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0x14, 0, 0, 0, 0x46, - 0x72, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, - 0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, 0xa, - 0, 0x5, 0, 0x41, 0x3f, 0xf2, 0xf6, 0x86, 0x76, 0xcf, - 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, - 0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, - 0x78, 0x34, 0x78, 0x34, 0x1, 0, 0xb, 0, 0, 0, - 0x66, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x72, 0x69, - 0x78, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x5, - 0, 0, 0, 0x46, 0x72, 0x61, 0x6d, 0x65, 0xa, 0, - 0x5, 0, 0x46, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, - 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, 0, - 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 0, - 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, 0x46, 0x6c, - 0x6f, 0x61, 0x74, 0x4b, 0x65, 0x79, 0x73, 0xa, 0, 0x5, - 0, 0xa9, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, 0x8f, - 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, - 0, 0x7, 0, 0, 0, 0x6e, 0x56, 0x61, 0x6c, 0x75, - 0x65, 0x73, 0x14, 0, 0x34, 0, 0x2a, 0, 0x1, 0, - 0x6, 0, 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, - 0xe, 0, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, - 0x69, 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, - 0x65, 0x79, 0x73, 0xa, 0, 0x5, 0, 0x80, 0xb1, 0x6, - 0xf4, 0x3b, 0x7b, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, - 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x4, 0, 0, - 0, 0x74, 0x69, 0x6d, 0x65, 0x14, 0, 0x1, 0, 0x9, - 0, 0, 0, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, - 0x79, 0x73, 0x1, 0, 0x6, 0, 0, 0, 0x74, 0x66, - 0x6b, 0x65, 0x79, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0xc, 0, 0, 0, 0x41, 0x6e, 0x69, 0x6d, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0xa, 0, - 0x5, 0, 0xa8, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, - 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, - 0x1, 0, 0x7, 0, 0, 0, 0x6b, 0x65, 0x79, 0x54, - 0x79, 0x70, 0x65, 0x14, 0, 0x29, 0, 0x1, 0, 0x5, - 0, 0, 0, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x14, 0, - 0x34, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, 0x69, - 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, - 0x79, 0x73, 0x1, 0, 0x4, 0, 0, 0, 0x6b, 0x65, - 0x79, 0x73, 0xe, 0, 0x1, 0, 0x5, 0, 0, 0, - 0x6e, 0x4b, 0x65, 0x79, 0x73, 0xf, 0, 0x14, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x41, - 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0xa, 0, 0x5, 0, 0xc0, - 0x56, 0xbf, 0xe2, 0xf, 0x84, 0xcf, 0x11, 0x8f, 0x52, 0, - 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, - 0, 0, 0, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6c, 0x6f, - 0x73, 0x65, 0x64, 0x14, 0, 0x29, 0, 0x1, 0, 0xf, - 0, 0, 0, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x14, 0, - 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, - 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xa, - 0, 0x5, 0, 0x4f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, - 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, - 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x41, - 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, - 0x74, 0xa, 0, 0x5, 0, 0x50, 0xab, 0x82, 0x3d, 0xda, - 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, - 0x33, 0xe, 0, 0x1, 0, 0x9, 0, 0, 0, 0x41, - 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xf, 0, - 0xb, 0, 0x1f, 0, 0x1, 0, 0xa, 0, 0, 0, - 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, - 0xa, 0, 0x5, 0, 0xa0, 0xee, 0x23, 0x3a, 0xb1, 0x94, - 0xd0, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, - 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x42, 0x49, - 0x4e, 0x41, 0x52, 0x59, 0xf, 0, 0xb, 0, 0x1f, 0, - 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, 0x6c, 0xa, - 0, 0x5, 0, 0xa1, 0xee, 0x23, 0x3a, 0xb1, 0x94, 0xd0, - 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, - 0, 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, - 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x31, 0, 0x1, 0, - 0x4, 0, 0, 0, 0x75, 0x72, 0x6c, 0x73, 0xe, 0, - 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, 0x6c, - 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, - 0, 0xf, 0, 0, 0, 0x50, 0x72, 0x6f, 0x67, 0x72, - 0x65, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x68, - 0xa, 0, 0x5, 0, 0x60, 0xc3, 0x63, 0x8a, 0x7d, 0x99, - 0xd0, 0x11, 0x94, 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, - 0xe, 0, 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, - 0x6c, 0x13, 0, 0x1, 0, 0xa, 0, 0, 0, 0x49, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0xf, - 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x4, 0, 0, - 0, 0x47, 0x75, 0x69, 0x64, 0xa, 0, 0x5, 0, 0xe0, - 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, - 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x5, - 0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x31, 0x14, 0, - 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x64, 0x61, - 0x74, 0x61, 0x32, 0x14, 0, 0x28, 0, 0x1, 0, 0x5, - 0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x33, 0x14, 0, - 0x34, 0, 0x2d, 0, 0x1, 0, 0x5, 0, 0, 0, - 0x64, 0x61, 0x74, 0x61, 0x34, 0xe, 0, 0x3, 0, 0x8, - 0, 0, 0, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, - 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, 0x72, - 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0xa, 0, 0x5, 0, 0xe0, 0x21, 0xf, 0x7f, 0xe1, - 0xbf, 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, - 0x71, 0x31, 0, 0x1, 0, 0x3, 0, 0, 0, 0x6b, - 0x65, 0x79, 0x14, 0, 0x31, 0, 0x1, 0, 0x5, 0, - 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, - 0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x50, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x61, 0x67, - 0xa, 0, 0x5, 0, 0xe1, 0x21, 0xf, 0x7f, 0xe1, 0xbf, - 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, - 0xe, 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, - 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, - 0xe, 0, 0, 0, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, - 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0xa, 0, - 0x5, 0, 0xa0, 0x6a, 0x11, 0x98, 0xba, 0xbd, 0xd1, 0x11, - 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x1, 0, - 0x4, 0, 0, 0, 0x47, 0x75, 0x69, 0x64, 0x1, 0, - 0x12, 0, 0, 0, 0x67, 0x75, 0x69, 0x64, 0x45, 0x78, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, - 0x61, 0x6c, 0x14, 0, 0xe, 0, 0x12, 0, 0x12, 0, - 0x12, 0, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, - 0xb, 0, 0, 0, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, - 0x61, 0x6e, 0x64, 0x65, 0x64, 0xa, 0, 0x5, 0, 0xa0, - 0x5e, 0x5d, 0x7f, 0x3a, 0xd5, 0xd1, 0x11, 0x82, 0xc0, 0, - 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x29, 0, 0x1, 0, 0xc, - 0, 0, 0, 0x62, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, + 0x78, 0x6f, 0x66, 0x20, 0x30, 0x33, 0x30, 0x32, 0x62, + 0x69, 0x6e, 0x20, 0x30, 0x30, 0x36, 0x34, 0x1f, 0, 0x1, + 0, 0x6, 0, 0, 0, 0x48, 0x65, 0x61, 0x64, 0x65, + 0x72, 0xa, 0, 0x5, 0, 0x43, 0xab, 0x82, 0x3d, 0xda, + 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, + 0x33, 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x6d, + 0x61, 0x6a, 0x6f, 0x72, 0x14, 0, 0x28, 0, 0x1, 0, + 0x5, 0, 0, 0, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x14, + 0, 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x66, + 0x6c, 0x61, 0x67, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, + 0x6f, 0x72, 0xa, 0, 0x5, 0, 0x5e, 0xab, 0x82, 0x3d, + 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, + 0xe4, 0x33, 0x2a, 0, 0x1, 0, 0x1, 0, 0, 0, + 0x78, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, 0, + 0, 0x79, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, + 0, 0, 0x7a, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, + 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, + 0x73, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x44, 0x3f, 0xf2, + 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, + 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, 0x1, 0, 0, + 0, 0x75, 0x14, 0, 0x2a, 0, 0x1, 0, 0x1, 0, + 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, + 0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, + 0x78, 0x34, 0x78, 0x34, 0xa, 0, 0x5, 0, 0x45, 0x3f, + 0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, + 0x33, 0x35, 0x94, 0xa3, 0x34, 0, 0x2a, 0, 0x1, 0, + 0x6, 0, 0, 0, 0x6d, 0x61, 0x74, 0x72, 0x69, 0x78, + 0xe, 0, 0x3, 0, 0x10, 0, 0, 0, 0xf, 0, + 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, + 0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, + 0x41, 0xa, 0, 0x5, 0, 0xe0, 0x44, 0xff, 0x35, 0x7c, + 0x6c, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, + 0xa3, 0x2a, 0, 0x1, 0, 0x3, 0, 0, 0, 0x72, + 0x65, 0x64, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, + 0, 0, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x14, 0, 0x2a, + 0, 0x1, 0, 0x4, 0, 0, 0, 0x62, 0x6c, 0x75, + 0x65, 0x14, 0, 0x2a, 0, 0x1, 0, 0x5, 0, 0, + 0, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x14, 0, 0xb, 0, + 0x1f, 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, + 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0xa, 0, 0x5, 0, + 0x81, 0x6e, 0xe1, 0xd3, 0x35, 0x78, 0xcf, 0x11, 0x8f, 0x52, + 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x2a, 0, 0x1, 0, + 0x3, 0, 0, 0, 0x72, 0x65, 0x64, 0x14, 0, 0x2a, + 0, 0x1, 0, 0x5, 0, 0, 0, 0x67, 0x72, 0x65, + 0x65, 0x6e, 0x14, 0, 0x2a, 0, 0x1, 0, 0x4, 0, + 0, 0, 0x62, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, 0, + 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x49, 0x6e, + 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0xa, 0, 0x5, 0, 0x20, 0xb8, 0x30, 0x16, 0x42, 0x78, + 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, + 0x29, 0, 0x1, 0, 0x5, 0, 0, 0, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x14, 0, 0x1, 0, 0x9, 0, 0, + 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, + 0x1, 0, 0xa, 0, 0, 0, 0x69, 0x6e, 0x64, 0x65, + 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0xb, 0, + 0x1f, 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, + 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0xa, 0, 0x5, 0, 0xa0, + 0xa6, 0x7d, 0x53, 0x37, 0xca, 0xd0, 0x11, 0x94, 0x1c, 0, + 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, 0, 0x9, + 0, 0, 0, 0x74, 0x72, 0x75, 0x65, 0x66, 0x61, 0x6c, + 0x73, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, + 0x9, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, + 0x6e, 0x32, 0x64, 0xa, 0, 0x5, 0, 0x63, 0xae, 0x85, + 0x48, 0xe8, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, + 0x35, 0x94, 0xa3, 0x1, 0, 0x7, 0, 0, 0, 0x42, + 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, + 0, 0, 0x75, 0x14, 0, 0x1, 0, 0x7, 0, 0, + 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, + 0x1, 0, 0, 0, 0x76, 0x14, 0, 0xb, 0, 0x1f, + 0, 0x1, 0, 0xc, 0, 0, 0, 0x4d, 0x61, 0x74, + 0x65, 0x72, 0x69, 0x61, 0x6c, 0x57, 0x72, 0x61, 0x70, 0xa, + 0, 0x5, 0, 0x60, 0xae, 0x85, 0x48, 0xe8, 0x78, 0xcf, + 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, + 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, 0x6c, 0x65, + 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, 0x75, 0x14, + 0, 0x1, 0, 0x7, 0, 0, 0, 0x42, 0x6f, 0x6f, + 0x6c, 0x65, 0x61, 0x6e, 0x1, 0, 0x1, 0, 0, 0, + 0x76, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0xf, + 0, 0, 0, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, + 0x46, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0xa, 0, + 0x5, 0, 0xe1, 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, + 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x31, 0, + 0x1, 0, 0x8, 0, 0, 0, 0x66, 0x69, 0x6c, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x14, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0x8, 0, 0, 0, 0x4d, 0x61, 0x74, 0x65, + 0x72, 0x69, 0x61, 0x6c, 0xa, 0, 0x5, 0, 0x4d, 0xab, + 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, + 0xaf, 0x71, 0xe4, 0x33, 0x1, 0, 0x9, 0, 0, 0, + 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, 0x41, 0x1, + 0, 0x9, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x43, + 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x2a, 0, 0x1, 0, + 0x5, 0, 0, 0, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x14, + 0, 0x1, 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6c, + 0x6f, 0x72, 0x52, 0x47, 0x42, 0x1, 0, 0xd, 0, 0, + 0, 0x73, 0x70, 0x65, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x43, + 0x6f, 0x6c, 0x6f, 0x72, 0x14, 0, 0x1, 0, 0x8, 0, + 0, 0, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x52, 0x47, 0x42, + 0x1, 0, 0xd, 0, 0, 0, 0x65, 0x6d, 0x69, 0x73, + 0x73, 0x69, 0x76, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x14, + 0, 0xe, 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, + 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x8, 0, 0, + 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, 0xa, + 0, 0x5, 0, 0x5f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, + 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, + 0, 0x1, 0, 0x12, 0, 0, 0, 0x6e, 0x46, 0x61, + 0x63, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, + 0x64, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, + 0, 0x1, 0, 0x11, 0, 0, 0, 0x66, 0x61, 0x63, + 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, + 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, 0, 0x12, 0, + 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x56, 0x65, 0x72, + 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, + 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, + 0xd, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, + 0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x73, 0xa, 0, 0x5, + 0, 0xc0, 0xc5, 0x1e, 0xed, 0xa8, 0xc0, 0xd0, 0x11, 0x94, + 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, 0x29, 0, 0x1, + 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, + 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, + 0x14, 0, 0x34, 0, 0x1, 0, 0x9, 0, 0, 0, + 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x32, 0x64, 0x1, + 0, 0xe, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, 0x57, + 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0xe, + 0, 0x1, 0, 0xf, 0, 0, 0, 0x6e, 0x46, 0x61, + 0x63, 0x65, 0x57, 0x72, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0x11, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, + 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, + 0x72, 0x64, 0x73, 0xa, 0, 0x5, 0, 0x40, 0x3f, 0xf2, + 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, + 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xe, 0, 0, + 0, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, + 0x6f, 0x6f, 0x72, 0x64, 0x73, 0x14, 0, 0x34, 0, 0x1, + 0, 0x8, 0, 0, 0, 0x43, 0x6f, 0x6f, 0x72, 0x64, + 0x73, 0x32, 0x64, 0x1, 0, 0xd, 0, 0, 0, 0x74, + 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, 0x6f, 0x72, + 0x64, 0x73, 0xe, 0, 0x1, 0, 0xe, 0, 0, 0, + 0x6e, 0x54, 0x65, 0x78, 0x74, 0x75, 0x72, 0x65, 0x43, 0x6f, + 0x6f, 0x72, 0x64, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, + 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x4d, 0x65, + 0x73, 0x68, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, + 0x4c, 0x69, 0x73, 0x74, 0xa, 0, 0x5, 0, 0x42, 0x3f, + 0xf2, 0xf6, 0x86, 0x76, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, + 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, 0, + 0, 0, 0x6e, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, + 0x6c, 0x73, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, 0, + 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x64, + 0x65, 0x78, 0x65, 0x73, 0x14, 0, 0x34, 0, 0x29, 0, + 0x1, 0, 0xb, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, + 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xe, 0, 0x1, + 0, 0xc, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, + 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x73, 0xf, 0, 0x14, + 0, 0xe, 0, 0x1, 0, 0x8, 0, 0, 0, 0x4d, + 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c, 0xf, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x4d, + 0x65, 0x73, 0x68, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, + 0xa, 0, 0x5, 0, 0x43, 0x3f, 0xf2, 0xf6, 0x86, 0x76, + 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, + 0x29, 0, 0x1, 0, 0x8, 0, 0, 0, 0x6e, 0x4e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, + 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, 0x74, + 0x6f, 0x72, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x6f, + 0x72, 0x6d, 0x61, 0x6c, 0x73, 0xe, 0, 0x1, 0, 0x8, + 0, 0, 0, 0x6e, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x73, 0xf, 0, 0x14, 0, 0x29, 0, 0x1, 0, 0xc, + 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, 0x65, 0x4e, 0x6f, + 0x72, 0x6d, 0x61, 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x1, + 0, 0x8, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, + 0x61, 0x63, 0x65, 0x1, 0, 0xb, 0, 0, 0, 0x66, + 0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, + 0xe, 0, 0x1, 0, 0xc, 0, 0, 0, 0x6e, 0x46, + 0x61, 0x63, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x73, + 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, + 0x10, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x56, 0x65, + 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x73, + 0xa, 0, 0x5, 0, 0x21, 0xb8, 0x30, 0x16, 0x42, 0x78, + 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, + 0x29, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, 0x56, + 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0xc, 0, 0, + 0, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x65, 0x64, 0x43, 0x6f, + 0x6c, 0x6f, 0x72, 0x1, 0, 0xc, 0, 0, 0, 0x76, + 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, 0x72, + 0x73, 0xe, 0, 0x1, 0, 0xd, 0, 0, 0, 0x6e, + 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x43, 0x6f, 0x6c, 0x6f, + 0x72, 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0x4, 0, 0, 0, 0x4d, 0x65, 0x73, 0x68, + 0xa, 0, 0x5, 0, 0x44, 0xab, 0x82, 0x3d, 0xda, 0x62, + 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, + 0x29, 0, 0x1, 0, 0x9, 0, 0, 0, 0x6e, 0x56, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x14, 0, 0x34, + 0, 0x1, 0, 0x6, 0, 0, 0, 0x56, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x1, 0, 0x8, 0, 0, 0, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0xe, 0, 0x1, + 0, 0x9, 0, 0, 0, 0x6e, 0x56, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0x29, 0, + 0x1, 0, 0x6, 0, 0, 0, 0x6e, 0x46, 0x61, 0x63, + 0x65, 0x73, 0x14, 0, 0x34, 0, 0x1, 0, 0x8, 0, + 0, 0, 0x4d, 0x65, 0x73, 0x68, 0x46, 0x61, 0x63, 0x65, + 0x1, 0, 0x5, 0, 0, 0, 0x66, 0x61, 0x63, 0x65, + 0x73, 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x6e, + 0x46, 0x61, 0x63, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xe, + 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0x14, 0, 0, 0, 0x46, + 0x72, 0x61, 0x6d, 0x65, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, + 0x6f, 0x72, 0x6d, 0x4d, 0x61, 0x74, 0x72, 0x69, 0x78, 0xa, + 0, 0x5, 0, 0x41, 0x3f, 0xf2, 0xf6, 0x86, 0x76, 0xcf, + 0x11, 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x1, + 0, 0x9, 0, 0, 0, 0x4d, 0x61, 0x74, 0x72, 0x69, + 0x78, 0x34, 0x78, 0x34, 0x1, 0, 0xb, 0, 0, 0, + 0x66, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x74, 0x72, 0x69, + 0x78, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x5, + 0, 0, 0, 0x46, 0x72, 0x61, 0x6d, 0x65, 0xa, 0, + 0x5, 0, 0x46, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, 0x11, + 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, 0, + 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, 0, + 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, 0x46, 0x6c, + 0x6f, 0x61, 0x74, 0x4b, 0x65, 0x79, 0x73, 0xa, 0, 0x5, + 0, 0xa9, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, 0x8f, + 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, + 0, 0x7, 0, 0, 0, 0x6e, 0x56, 0x61, 0x6c, 0x75, + 0x65, 0x73, 0x14, 0, 0x34, 0, 0x2a, 0, 0x1, 0, + 0x6, 0, 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, + 0xe, 0, 0x1, 0, 0x7, 0, 0, 0, 0x6e, 0x56, + 0x61, 0x6c, 0x75, 0x65, 0x73, 0xf, 0, 0x14, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, + 0x69, 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, + 0x65, 0x79, 0x73, 0xa, 0, 0x5, 0, 0x80, 0xb1, 0x6, + 0xf4, 0x3b, 0x7b, 0xcf, 0x11, 0x8f, 0x52, 0, 0x40, 0x33, + 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x4, 0, 0, + 0, 0x74, 0x69, 0x6d, 0x65, 0x14, 0, 0x1, 0, 0x9, + 0, 0, 0, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, + 0x79, 0x73, 0x1, 0, 0x6, 0, 0, 0, 0x74, 0x66, + 0x6b, 0x65, 0x79, 0x73, 0x14, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0xc, 0, 0, 0, 0x41, 0x6e, 0x69, 0x6d, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0xa, 0, + 0x5, 0, 0xa8, 0x46, 0xdd, 0x10, 0x5b, 0x77, 0xcf, 0x11, + 0x8f, 0x52, 0, 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, + 0x1, 0, 0x7, 0, 0, 0, 0x6b, 0x65, 0x79, 0x54, + 0x79, 0x70, 0x65, 0x14, 0, 0x29, 0, 0x1, 0, 0x5, + 0, 0, 0, 0x6e, 0x4b, 0x65, 0x79, 0x73, 0x14, 0, + 0x34, 0, 0x1, 0, 0xe, 0, 0, 0, 0x54, 0x69, + 0x6d, 0x65, 0x64, 0x46, 0x6c, 0x6f, 0x61, 0x74, 0x4b, 0x65, + 0x79, 0x73, 0x1, 0, 0x4, 0, 0, 0, 0x6b, 0x65, + 0x79, 0x73, 0xe, 0, 0x1, 0, 0x5, 0, 0, 0, + 0x6e, 0x4b, 0x65, 0x79, 0x73, 0xf, 0, 0x14, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0x10, 0, 0, 0, 0x41, + 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0xa, 0, 0x5, 0, 0xc0, + 0x56, 0xbf, 0xe2, 0xf, 0x84, 0xcf, 0x11, 0x8f, 0x52, 0, + 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0xa, + 0, 0, 0, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6c, 0x6f, + 0x73, 0x65, 0x64, 0x14, 0, 0x29, 0, 0x1, 0, 0xf, + 0, 0, 0, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x14, 0, + 0xb, 0, 0x1f, 0, 0x1, 0, 0x9, 0, 0, 0, + 0x41, 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xa, + 0, 0x5, 0, 0x4f, 0xab, 0x82, 0x3d, 0xda, 0x62, 0xcf, + 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0xe, + 0, 0x12, 0, 0x12, 0, 0x12, 0, 0xf, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0xc, 0, 0, 0, 0x41, + 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, + 0x74, 0xa, 0, 0x5, 0, 0x50, 0xab, 0x82, 0x3d, 0xda, + 0x62, 0xcf, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, + 0x33, 0xe, 0, 0x1, 0, 0x9, 0, 0, 0, 0x41, + 0x6e, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xf, 0, + 0xb, 0, 0x1f, 0, 0x1, 0, 0xa, 0, 0, 0, + 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, + 0xa, 0, 0x5, 0, 0xa0, 0xee, 0x23, 0x3a, 0xb1, 0x94, + 0xd0, 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, + 0xe, 0, 0x1, 0, 0x6, 0, 0, 0, 0x42, 0x49, + 0x4e, 0x41, 0x52, 0x59, 0xf, 0, 0xb, 0, 0x1f, 0, + 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, 0x6c, 0xa, + 0, 0x5, 0, 0xa1, 0xee, 0x23, 0x3a, 0xb1, 0x94, 0xd0, + 0x11, 0xab, 0x39, 0, 0x20, 0xaf, 0x71, 0xe4, 0x33, 0x29, + 0, 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, + 0x6c, 0x73, 0x14, 0, 0x34, 0, 0x31, 0, 0x1, 0, + 0x4, 0, 0, 0, 0x75, 0x72, 0x6c, 0x73, 0xe, 0, + 0x1, 0, 0x5, 0, 0, 0, 0x6e, 0x55, 0x72, 0x6c, + 0x73, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, 0, 0x1, + 0, 0xf, 0, 0, 0, 0x50, 0x72, 0x6f, 0x67, 0x72, + 0x65, 0x73, 0x73, 0x69, 0x76, 0x65, 0x4d, 0x65, 0x73, 0x68, + 0xa, 0, 0x5, 0, 0x60, 0xc3, 0x63, 0x8a, 0x7d, 0x99, + 0xd0, 0x11, 0x94, 0x1c, 0, 0x80, 0xc8, 0xc, 0xfa, 0x7b, + 0xe, 0, 0x1, 0, 0x3, 0, 0, 0, 0x55, 0x72, + 0x6c, 0x13, 0, 0x1, 0, 0xa, 0, 0, 0, 0x49, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x61, 0x74, 0x61, 0xf, + 0, 0xb, 0, 0x1f, 0, 0x1, 0, 0x4, 0, 0, + 0, 0x47, 0x75, 0x69, 0x64, 0xa, 0, 0x5, 0, 0xe0, + 0x90, 0x27, 0xa4, 0x10, 0x78, 0xcf, 0x11, 0x8f, 0x52, 0, + 0x40, 0x33, 0x35, 0x94, 0xa3, 0x29, 0, 0x1, 0, 0x5, + 0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x31, 0x14, 0, + 0x28, 0, 0x1, 0, 0x5, 0, 0, 0, 0x64, 0x61, + 0x74, 0x61, 0x32, 0x14, 0, 0x28, 0, 0x1, 0, 0x5, + 0, 0, 0, 0x64, 0x61, 0x74, 0x61, 0x33, 0x14, 0, + 0x34, 0, 0x2d, 0, 0x1, 0, 0x5, 0, 0, 0, + 0x64, 0x61, 0x74, 0x61, 0x34, 0xe, 0, 0x3, 0, 0x8, + 0, 0, 0, 0xf, 0, 0x14, 0, 0xb, 0, 0x1f, + 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, 0x72, + 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0xa, 0, 0x5, 0, 0xe0, 0x21, 0xf, 0x7f, 0xe1, + 0xbf, 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, + 0x71, 0x31, 0, 0x1, 0, 0x3, 0, 0, 0, 0x6b, + 0x65, 0x79, 0x14, 0, 0x31, 0, 0x1, 0, 0x5, 0, + 0, 0, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x14, 0, 0xb, + 0, 0x1f, 0, 0x1, 0, 0xb, 0, 0, 0, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x42, 0x61, 0x67, + 0xa, 0, 0x5, 0, 0xe1, 0x21, 0xf, 0x7f, 0xe1, 0xbf, + 0xd1, 0x11, 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, + 0xe, 0, 0x1, 0, 0xe, 0, 0, 0, 0x53, 0x74, + 0x72, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, + 0xe, 0, 0, 0, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, + 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, 0x61, 0x6c, 0xa, 0, + 0x5, 0, 0xa0, 0x6a, 0x11, 0x98, 0xba, 0xbd, 0xd1, 0x11, + 0x82, 0xc0, 0, 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x1, 0, + 0x4, 0, 0, 0, 0x47, 0x75, 0x69, 0x64, 0x1, 0, + 0x12, 0, 0, 0, 0x67, 0x75, 0x69, 0x64, 0x45, 0x78, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x56, 0x69, 0x73, 0x75, + 0x61, 0x6c, 0x14, 0, 0xe, 0, 0x12, 0, 0x12, 0, + 0x12, 0, 0xf, 0, 0xb, 0, 0x1f, 0, 0x1, 0, + 0xb, 0, 0, 0, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, + 0x61, 0x6e, 0x64, 0x65, 0x64, 0xa, 0, 0x5, 0, 0xa0, + 0x5e, 0x5d, 0x7f, 0x3a, 0xd5, 0xd1, 0x11, 0x82, 0xc0, 0, + 0xa0, 0xc9, 0x69, 0x72, 0x71, 0x29, 0, 0x1, 0, 0xc, + 0, 0, 0, 0x62, 0x52, 0x69, 0x67, 0x68, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x65, 0x64, 0x14, 0, 0xb, 0 }; diff --git a/gfx/include/dxsdk/rpcsal.h b/gfx/include/dxsdk/rpcsal.h index 254acc867b..bf5e68b160 100644 --- a/gfx/include/dxsdk/rpcsal.h +++ b/gfx/include/dxsdk/rpcsal.h @@ -12,31 +12,31 @@ // Introduction // // rpcsal.h provides a set of annotations to describe how RPC functions use their -// parameters - the assumptions it makes about them, adn the guarantees it makes +// parameters - the assumptions it makes about them, adn the guarantees it makes // upon finishing. These annotations are similar to those found in specstrings.h, // but are designed to be used by the MIDL compiler when it generates annotations // enabled header files. // // IDL authors do not need to annotate their functions declarations. The MIDL compiler -// will interpret the IDL directives and use one of the annotations contained -// in this header. This documentation is intended to help those trying to understand +// will interpret the IDL directives and use one of the annotations contained +// in this header. This documentation is intended to help those trying to understand // the MIDL-generated header files or those who maintain their own copies of these files. // // ------------------------------------------------------------------------------- // Differences between rpcsal.h and specstrings.h -// +// // There are a few important differences between the annotations found in rpcsal.h and // those in specstrings.h: -// -// 1. [in] parameters are not marked as read-only. They may be used for scratch space +// +// 1. [in] parameters are not marked as read-only. They may be used for scratch space // at the server and changes will not affect the client. // 2. String versions of each macro alleviates the need for a special type definition // // ------------------------------------------------------------------------------- // Interpreting RPC Annotations // -// These annotations are interpreted precisely in the same way as those in specstrings.h. -// Please refer to that header for information related to general usage in annotations. +// These annotations are interpreted precisely in the same way as those in specstrings.h. +// Please refer to that header for information related to general usage in annotations. // // To construct an RPC annotation, concatenate the appropriate value from each category // along with a leading __RPC_. A typical annotation looks like "__RPC__in_string". @@ -116,17 +116,17 @@ // // 1. Specifying two buffer annotations on a single parameter results in unspecified behavior // (e.g. __RPC__in_bcount(5) __RPC__out_bcount(6) -// -// 2. The size of the buffer and the amount that has been initialized are separate concepts. -// Specify the size using _ecount or _bcount. Specify the amount that is initialized using -// _full, _part, or _string. As a special case, a single element buffer does not need +// +// 2. The size of the buffer and the amount that has been initialized are separate concepts. +// Specify the size using _ecount or _bcount. Specify the amount that is initialized using +// _full, _part, or _string. As a special case, a single element buffer does not need // _ecount, _bcount, _full, or _part -// -// 3. The count may be less than the total size of the buffer in which case it describes the -// accessible portion. -// +// +// 3. The count may be less than the total size of the buffer in which case it describes the +// accessible portion. +// // 4. "__RPC__opt" and "__RPC_deref" are not valid annotations. -// +// // 5. The placement of _opt when using _deref is important: // __RPC__deref_opt_... : Input may be NULL // __RPC__deref_..._opt : Output may be NULL @@ -207,7 +207,7 @@ extern "C" { #define __RPC__out_xcount_full(size) _SAL1_2_Source_(__RPC__out_xcount_full, (size), __RPC__out) #define __RPC__out_xcount_full_string(size) _SAL1_2_Source_(__RPC__out_xcount_full_string, (size), __RPC__out _Post_ _Null_terminated_) -// [in,out] +// [in,out] #define __RPC__inout _SAL1_2_Source_(__RPC__inout, (), _Inout_) #define __RPC__inout_string _SAL1_2_Source_(__RPC__inout_string, (), __RPC__inout _Pre_ _Null_terminated_ _Post_ _Null_terminated_) #define __RPC__inout_ecount(size) _SAL1_2_Source_(__RPC__inout_ecount, (size), _Inout_updates_(size)) @@ -219,7 +219,7 @@ extern "C" { #define __RPC__inout_xcount_full(size) _SAL1_2_Source_(__RPC__inout_xcount_full, (size), __RPC__inout) #define __RPC__inout_xcount_full_string(size) _SAL1_2_Source_(__RPC__inout_xcount_full_string, (size), __RPC__inout _Pre_ _Null_terminated_ _Post_ _Null_terminated_) -// [in,unique] +// [in,unique] #define __RPC__in_opt _SAL1_2_Source_(__RPC__in_opt, (), _Pre_ _Notref_ _Maybenull_ _Pre_ _Valid_) #define __RPC__in_opt_string _SAL1_2_Source_(__RPC__in_opt_string, (), __RPC__in_opt _Pre_ _Null_terminated_) #define __RPC__in_ecount_opt(size) _SAL1_2_Source_(__RPC__in_ecount_opt, (size), __RPC__in_opt _Pre_readable_size_(size)) @@ -233,7 +233,7 @@ extern "C" { #define __RPC__in_xcount_opt(size) _SAL1_2_Source_(__RPC__in_xcount_opt, (size), __RPC__in_ecount_opt(size)) #define __RPC__in_xcount_opt_string(size) _SAL1_2_Source_(__RPC__in_xcount_opt_string, (size), __RPC__in_ecount_opt(size) _Pre_ _Null_terminated_) -// [in,out,unique] +// [in,out,unique] #define __RPC__inout_opt _SAL1_2_Source_(__RPC__inout_opt, (), _Inout_opt_) #define __RPC__inout_opt_string _SAL1_2_Source_(__RPC__inout_opt_string, (), __RPC__inout_opt _Pre_ _Null_terminated_) #define __RPC__inout_ecount_opt(size) _SAL1_2_Source_(__RPC__inout_ecount_opt, (size), _Inout_updates_opt_(size)) @@ -259,7 +259,7 @@ extern "C" { #define __RPC__deref_out_xcount_full(size) _SAL1_2_Source_(__RPC__deref_out_xcount_full, (size), __RPC__deref_out) #define __RPC__deref_out_xcount_full_string(size) _SAL1_2_Source_(__RPC__deref_out_xcount_full_string, (size), __RPC__deref_out _At_(*_Curr_, _Post_ _Null_terminated_)) -// [in,out] **, second pointer decoration. +// [in,out] **, second pointer decoration. #define __RPC__deref_inout _SAL1_2_Source_(__RPC__deref_inout, (), _Inout_ _At_(*_Curr_, _Pre_ _Notnull_ _Post_ _Notnull_)) #define __RPC__deref_inout_string _SAL1_2_Source_(__RPC__deref_inout_string, (), __RPC__deref_inout _At_(*_Curr_, _Pre_ _Null_terminated_ _Post_ _Null_terminated_)) #define __RPC__deref_inout_opt _SAL1_2_Source_(__RPC__deref_inout_opt, (), _Inout_ _At_(*_Curr_, _Pre_ _Maybenull_ _Post_ _Maybenull_)) @@ -279,7 +279,7 @@ extern "C" { // #define __RPC_out_opt out_opt is not allowed in rpc -// [in,out,unique] +// [in,out,unique] #define __RPC__deref_opt_inout _SAL1_2_Source_(__RPC__deref_opt_inout, (), _Inout_opt_ _At_(*_Curr_, _Pre_ _Notnull_ _Post_ _Notnull_)) #define __RPC__deref_opt_inout_ecount(size) _SAL1_2_Source_(__RPC__deref_opt_inout_ecount, (size), __RPC__deref_opt_inout _At_(*_Curr_, _Pre_writable_size_(size) _Post_writable_size_(size))) #define __RPC__deref_opt_inout_string _SAL1_2_Source_(__RPC__deref_opt_inout_string, (), __RPC__deref_opt_inout _At_(*_Curr_, _Pre_ _Null_terminated_ _Post_ _Null_terminated_)) diff --git a/gfx/include/dxsdk/xnamath.h b/gfx/include/dxsdk/xnamath.h index da085be63a..c7f538bb53 100644 --- a/gfx/include/dxsdk/xnamath.h +++ b/gfx/include/dxsdk/xnamath.h @@ -214,7 +214,7 @@ typedef UINT __vector4i[4]; typedef __declspec(align(16)) UINT __vector4i[4]; #endif -// Vector intrinsic: Four 32 bit floating point components aligned on a 16 byte +// Vector intrinsic: Four 32 bit floating point components aligned on a 16 byte // boundary and mapped to hardware vector registers #if defined(_XM_SSE_INTRINSICS_) && !defined(_XM_NO_INTRINSICS_) typedef __m128 XMVECTOR; @@ -377,7 +377,7 @@ typedef const XMMATRIX& CXMMATRIX; typedef const XMMATRIX CXMMATRIX; #endif -// 16 bit floating point number consisting of a sign bit, a 5 bit biased +// 16 bit floating point number consisting of a sign bit, a 5 bit biased // exponent, and a 10 bit mantissa //typedef WORD HALF; typedef USHORT HALF; @@ -544,13 +544,13 @@ __declspec(align(16)) struct XMFLOAT3A : public XMFLOAT3 XMFLOAT3A& operator= (CONST XMFLOAT3A& Float3); }; #else -typedef __declspec(align(16)) XMFLOAT3 XMFLOAT3A; +typedef __declspec(align(16)) XMFLOAT3 XMFLOAT3A; #endif // __cplusplus // 3D Vector; 11-11-10 bit normalized components packed into a 32 bit integer -// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit signed, -// normalized integer for the z component and 11 bit signed, normalized -// integers for the x and y components. The z component is stored in the +// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit signed, +// normalized integer for the z component and 11 bit signed, normalized +// integers for the x and y components. The z component is stored in the // most significant bits and the x component in the least significant bits // (Z10Y11X11): [32] zzzzzzzz zzyyyyyy yyyyyxxx xxxxxxxx [0] typedef struct _XMHENDN3 @@ -583,9 +583,9 @@ typedef struct _XMHENDN3 } XMHENDN3; // 3D Vector; 11-11-10 bit components packed into a 32 bit integer -// The 3D Vector is packed into 32 bits as follows: a 10 bit signed, -// integer for the z component and 11 bit signed integers for the -// x and y components. The z component is stored in the +// The 3D Vector is packed into 32 bits as follows: a 10 bit signed, +// integer for the z component and 11 bit signed integers for the +// x and y components. The z component is stored in the // most significant bits and the x component in the least significant bits // (Z10Y11X11): [32] zzzzzzzz zzyyyyyy yyyyyxxx xxxxxxxx [0] typedef struct _XMHEND3 @@ -618,9 +618,9 @@ typedef struct _XMHEND3 } XMHEND3; // 3D Vector; 11-11-10 bit normalized components packed into a 32 bit integer -// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, -// normalized integer for the z component and 11 bit unsigned, normalized -// integers for the x and y components. The z component is stored in the +// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, +// normalized integer for the z component and 11 bit unsigned, normalized +// integers for the x and y components. The z component is stored in the // most significant bits and the x component in the least significant bits // (Z10Y11X11): [32] zzzzzzzz zzyyyyyy yyyyyxxx xxxxxxxx [0] typedef struct _XMUHENDN3 @@ -654,8 +654,8 @@ typedef struct _XMUHENDN3 // 3D Vector; 11-11-10 bit components packed into a 32 bit integer // The 3D Vector is packed into 32 bits as follows: a 10 bit unsigned -// integer for the z component and 11 bit unsigned integers -// for the x and y components. The z component is stored in the +// integer for the z component and 11 bit unsigned integers +// for the x and y components. The z component is stored in the // most significant bits and the x component in the least significant bits // (Z10Y11X11): [32] zzzzzzzz zzyyyyyy yyyyyxxx xxxxxxxx [0] typedef struct _XMUHEND3 @@ -688,9 +688,9 @@ typedef struct _XMUHEND3 } XMUHEND3; // 3D Vector; 10-11-11 bit normalized components packed into a 32 bit integer -// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit signed, -// normalized integer for the x component and 11 bit signed, normalized -// integers for the y and z components. The z component is stored in the +// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit signed, +// normalized integer for the x component and 11 bit signed, normalized +// integers for the y and z components. The z component is stored in the // most significant bits and the x component in the least significant bits // (Z11Y11X10): [32] zzzzzzzz zzzyyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMDHENN3 @@ -723,9 +723,9 @@ typedef struct _XMDHENN3 } XMDHENN3; // 3D Vector; 10-11-11 bit components packed into a 32 bit integer -// The 3D Vector is packed into 32 bits as follows: a 10 bit signed, -// integer for the x component and 11 bit signed integers for the -// y and z components. The w component is stored in the +// The 3D Vector is packed into 32 bits as follows: a 10 bit signed, +// integer for the x component and 11 bit signed integers for the +// y and z components. The w component is stored in the // most significant bits and the x component in the least significant bits // (Z11Y11X10): [32] zzzzzzzz zzzyyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMDHEN3 @@ -758,9 +758,9 @@ typedef struct _XMDHEN3 } XMDHEN3; // 3D Vector; 10-11-11 bit normalized components packed into a 32 bit integer -// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, -// normalized integer for the x component and 11 bit unsigned, normalized -// integers for the y and z components. The w component is stored in the +// The normalized 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, +// normalized integer for the x component and 11 bit unsigned, normalized +// integers for the y and z components. The w component is stored in the // most significant bits and the x component in the least significant bits // (Z11Y11X10): [32] zzzzzzzz zzzyyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMUDHENN3 @@ -793,9 +793,9 @@ typedef struct _XMUDHENN3 } XMUDHENN3; // 3D Vector; 10-11-11 bit components packed into a 32 bit integer -// The 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, -// integer for the x component and 11 bit unsigned integers -// for the y and z components. The w component is stored in the +// The 3D Vector is packed into 32 bits as follows: a 10 bit unsigned, +// integer for the x component and 11 bit unsigned integers +// for the y and z components. The w component is stored in the // most significant bits and the x component in the least significant bits // (Z11Y11X10): [32] zzzzzzzz zzzyyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMUDHEN3 @@ -964,7 +964,7 @@ __declspec(align(16)) struct XMFLOAT4A : public XMFLOAT4 XMFLOAT4A(FLOAT _x, FLOAT _y, FLOAT _z, FLOAT _w) : XMFLOAT4(_x, _y, _z, _w) {}; XMFLOAT4A(CONST FLOAT *pArray) : XMFLOAT4(pArray) {}; - XMFLOAT4A& operator= (CONST XMFLOAT4A& Float4); + XMFLOAT4A& operator= (CONST XMFLOAT4A& Float4); }; #else typedef __declspec(align(16)) XMFLOAT4 XMFLOAT4A; @@ -1081,9 +1081,9 @@ typedef struct _XMUSHORT4 } XMUSHORT4; // 4D Vector; 10-10-10-2 bit normalized components packed into a 32 bit integer -// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, -// normalized integer for the w component and 10 bit signed, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, +// normalized integer for the w component and 10 bit signed, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMXDECN4 @@ -1118,8 +1118,8 @@ typedef struct _XMXDECN4 // 4D Vector; 10-10-10-2 bit components packed into a 32 bit integer // The normalized 4D Vector is packed into 32 bits as follows: a 2 bit unsigned -// integer for the w component and 10 bit signed integers for the -// z, y, and x components. The w component is stored in the +// integer for the w component and 10 bit signed integers for the +// z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMXDEC4 @@ -1153,9 +1153,9 @@ typedef struct _XMXDEC4 } XMXDEC4; // 4D Vector; 10-10-10-2 bit normalized components packed into a 32 bit integer -// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit signed, -// normalized integer for the w component and 10 bit signed, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit signed, +// normalized integer for the w component and 10 bit signed, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMDECN4 @@ -1189,9 +1189,9 @@ typedef struct _XMDECN4 } XMDECN4; // 4D Vector; 10-10-10-2 bit components packed into a 32 bit integer -// The 4D Vector is packed into 32 bits as follows: a 2 bit signed, -// integer for the w component and 10 bit signed integers for the -// z, y, and x components. The w component is stored in the +// The 4D Vector is packed into 32 bits as follows: a 2 bit signed, +// integer for the w component and 10 bit signed integers for the +// z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMDEC4 @@ -1225,9 +1225,9 @@ typedef struct _XMDEC4 } XMDEC4; // 4D Vector; 10-10-10-2 bit normalized components packed into a 32 bit integer -// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, -// normalized integer for the w component and 10 bit unsigned, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, +// normalized integer for the w component and 10 bit unsigned, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMUDECN4 @@ -1261,9 +1261,9 @@ typedef struct _XMUDECN4 } XMUDECN4; // 4D Vector; 10-10-10-2 bit components packed into a 32 bit integer -// The 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, -// integer for the w component and 10 bit unsigned integers -// for the z, y, and x components. The w component is stored in the +// The 4D Vector is packed into 32 bits as follows: a 2 bit unsigned, +// integer for the w component and 10 bit unsigned integers +// for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W2Z10Y10X10): [32] wwzzzzzz zzzzyyyy yyyyyyxx xxxxxxxx [0] typedef struct _XMUDEC4 @@ -1297,9 +1297,9 @@ typedef struct _XMUDEC4 } XMUDEC4; // 4D Vector; 20-20-20-4 bit normalized components packed into a 64 bit integer -// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit unsigned, -// normalized integer for the w component and 20 bit signed, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit unsigned, +// normalized integer for the w component and 20 bit signed, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMXICON4 @@ -1334,8 +1334,8 @@ typedef struct _XMXICON4 // 4D Vector; 20-20-20-4 bit components packed into a 64 bit integer // The 4D Vector is packed into 64 bits as follows: a 4 bit unsigned -// integer for the w component and 20 bit signed integers for the -// z, y, and x components. The w component is stored in the +// integer for the w component and 20 bit signed integers for the +// z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMXICO4 @@ -1369,9 +1369,9 @@ typedef struct _XMXICO4 } XMXICO4; // 4D Vector; 20-20-20-4 bit normalized components packed into a 64 bit integer -// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit signed, -// normalized integer for the w component and 20 bit signed, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit signed, +// normalized integer for the w component and 20 bit signed, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMICON4 @@ -1405,9 +1405,9 @@ typedef struct _XMICON4 } XMICON4; // 4D Vector; 20-20-20-4 bit components packed into a 64 bit integer -// The 4D Vector is packed into 64 bits as follows: a 4 bit signed, -// integer for the w component and 20 bit signed integers for the -// z, y, and x components. The w component is stored in the +// The 4D Vector is packed into 64 bits as follows: a 4 bit signed, +// integer for the w component and 20 bit signed integers for the +// z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMICO4 @@ -1441,9 +1441,9 @@ typedef struct _XMICO4 } XMICO4; // 4D Vector; 20-20-20-4 bit normalized components packed into a 64 bit integer -// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit unsigned, -// normalized integer for the w component and 20 bit unsigned, normalized -// integers for the z, y, and x components. The w component is stored in the +// The normalized 4D Vector is packed into 64 bits as follows: a 4 bit unsigned, +// normalized integer for the w component and 20 bit unsigned, normalized +// integers for the z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMUICON4 @@ -1477,9 +1477,9 @@ typedef struct _XMUICON4 } XMUICON4; // 4D Vector; 20-20-20-4 bit components packed into a 64 bit integer -// The 4D Vector is packed into 64 bits as follows: a 4 bit unsigned -// integer for the w component and 20 bit unsigned integers for the -// z, y, and x components. The w component is stored in the +// The 4D Vector is packed into 64 bits as follows: a 4 bit unsigned +// integer for the w component and 20 bit unsigned integers for the +// z, y, and x components. The w component is stored in the // most significant bits and the x component in the least significant bits // (W4Z20Y20X20): [64] wwwwzzzz zzzzzzzz zzzzzzzz yyyyyyyy yyyyyyyy yyyyxxxx xxxxxxxx xxxxxxxx [0] typedef struct _XMUICO4 @@ -2367,21 +2367,21 @@ XMFLOAT3* XMVector3TransformNormalStream(_Out_bytecap_x_(sizeof(XMFLOAT3)+ _In_ UINT OutputStride, _In_bytecount_x_(sizeof(XMFLOAT3)+InputStride*(VectorCount-1)) CONST XMFLOAT3* pInputStream, _In_ UINT InputStride, _In_ UINT VectorCount, CXMMATRIX M); -XMVECTOR XMVector3Project(FXMVECTOR V, FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, +XMVECTOR XMVector3Project(FXMVECTOR V, FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, CXMMATRIX Projection, CXMMATRIX View, CXMMATRIX World); XMFLOAT3* XMVector3ProjectStream(_Out_bytecap_x_(sizeof(XMFLOAT3)+OutputStride*(VectorCount-1)) XMFLOAT3* pOutputStream, _In_ UINT OutputStride, _In_bytecount_x_(sizeof(XMFLOAT3)+InputStride*(VectorCount-1)) CONST XMFLOAT3* pInputStream, - _In_ UINT InputStride, _In_ UINT VectorCount, - FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, + _In_ UINT InputStride, _In_ UINT VectorCount, + FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, CXMMATRIX Projection, CXMMATRIX View, CXMMATRIX World); -XMVECTOR XMVector3Unproject(FXMVECTOR V, FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, +XMVECTOR XMVector3Unproject(FXMVECTOR V, FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, CXMMATRIX Projection, CXMMATRIX View, CXMMATRIX World); XMFLOAT3* XMVector3UnprojectStream(_Out_bytecap_x_(sizeof(XMFLOAT3)+OutputStride*(VectorCount-1)) XMFLOAT3* pOutputStream, _In_ UINT OutputStride, _In_bytecount_x_(sizeof(XMFLOAT3)+InputStride*(VectorCount-1)) CONST XMFLOAT3* pInputStream, - _In_ UINT InputStride, _In_ UINT VectorCount, - FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, + _In_ UINT InputStride, _In_ UINT VectorCount, + FLOAT ViewportX, FLOAT ViewportY, FLOAT ViewportWidth, FLOAT ViewportHeight, FLOAT ViewportMinZ, FLOAT ViewportMaxZ, CXMMATRIX Projection, CXMMATRIX View, CXMMATRIX World); /**************************************************************************** @@ -2467,9 +2467,9 @@ XMMATRIX XMMatrixRotationRollPitchYawFromVector(FXMVECTOR Angles); XMMATRIX XMMatrixRotationNormal(FXMVECTOR NormalAxis, FLOAT Angle); XMMATRIX XMMatrixRotationAxis(FXMVECTOR Axis, FLOAT Angle); XMMATRIX XMMatrixRotationQuaternion(FXMVECTOR Quaternion); -XMMATRIX XMMatrixTransformation2D(FXMVECTOR ScalingOrigin, FLOAT ScalingOrientation, FXMVECTOR Scaling, +XMMATRIX XMMatrixTransformation2D(FXMVECTOR ScalingOrigin, FLOAT ScalingOrientation, FXMVECTOR Scaling, FXMVECTOR RotationOrigin, FLOAT Rotation, CXMVECTOR Translation); -XMMATRIX XMMatrixTransformation(FXMVECTOR ScalingOrigin, FXMVECTOR ScalingOrientationQuaternion, FXMVECTOR Scaling, +XMMATRIX XMMatrixTransformation(FXMVECTOR ScalingOrigin, FXMVECTOR ScalingOrientationQuaternion, FXMVECTOR Scaling, CXMVECTOR RotationOrigin, CXMVECTOR RotationQuaternion, CXMVECTOR Translation); XMMATRIX XMMatrixAffineTransformation2D(FXMVECTOR Scaling, FXMVECTOR RotationOrigin, FLOAT Rotation, FXMVECTOR Translation); XMMATRIX XMMatrixAffineTransformation(FXMVECTOR Scaling, FXMVECTOR RotationOrigin, FXMVECTOR RotationQuaternion, CXMVECTOR Translation); @@ -2613,12 +2613,12 @@ FLOAT XMScalarACosEst(FLOAT Value); * ****************************************************************************/ -// The purpose of the following global constants is to prevent redundant +// The purpose of the following global constants is to prevent redundant // reloading of the constants when they are referenced by more than one // separate inline math routine called within the same function. Declaring // a constant locally within a routine is sufficient to prevent redundant // reloads of that constant when that single routine is called multiple -// times in a function, but if the constant is used (and declared) in a +// times in a function, but if the constant is used (and declared) in a // separate math routine it would be reloaded. #define XMGLOBALCONST extern CONST __declspec(selectany) diff --git a/gfx/include/dxsdk/xnamathconvert.inl b/gfx/include/dxsdk/xnamathconvert.inl index deaeacb448..8c900619d0 100644 --- a/gfx/include/dxsdk/xnamathconvert.inl +++ b/gfx/include/dxsdk/xnamathconvert.inl @@ -118,10 +118,10 @@ XMFINLINE FLOAT XMConvertHalfToFloat XMINLINE FLOAT* XMConvertHalfToFloatStream ( - FLOAT* pOutputStream, - UINT OutputStride, - CONST HALF* pInputStream, - UINT InputStride, + FLOAT* pOutputStream, + UINT OutputStride, + CONST HALF* pInputStream, + UINT InputStride, UINT HalfCount ) { @@ -138,7 +138,7 @@ XMINLINE FLOAT* XMConvertHalfToFloatStream { *(FLOAT*)pFloat = XMConvertHalfToFloat(*(HALF*)pHalf); pHalf += InputStride; - pFloat += OutputStride; + pFloat += OutputStride; } return pOutputStream; @@ -181,7 +181,7 @@ XMFINLINE HALF XMConvertFloatToHalf IValue += 0xC8000000U; } - Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U)&0x7FFFU; + Result = ((IValue + 0x0FFFU + ((IValue >> 13U) & 1U)) >> 13U)&0x7FFFU; } return (HALF)(Result|Sign); @@ -193,10 +193,10 @@ XMFINLINE HALF XMConvertFloatToHalf XMINLINE HALF* XMConvertFloatToHalfStream ( - HALF* pOutputStream, - UINT OutputStride, - CONST FLOAT* pInputStream, - UINT InputStride, + HALF* pOutputStream, + UINT OutputStride, + CONST FLOAT* pInputStream, + UINT InputStride, UINT FloatCount ) { @@ -212,7 +212,7 @@ XMINLINE HALF* XMConvertFloatToHalfStream for (i = 0; i < FloatCount; i++) { *(HALF*)pHalf = XMConvertFloatToHalf(*(FLOAT*)pFloat); - pFloat += InputStride; + pFloat += InputStride; pHalf += OutputStride; } return pOutputStream; @@ -571,7 +571,7 @@ XMFINLINE XMVECTOR XMLoadFloat2A #else // _XM_VMX128_INTRINSICS_ #endif // _XM_VMX128_INTRINSICS_ } - + //------------------------------------------------------------------------------ XMFINLINE XMVECTOR XMLoadHalf2 @@ -1336,20 +1336,20 @@ XMFINLINE XMVECTOR XMLoadFloat3PK { // Normalize the value in the resulting float Exponent = 1; - + do { Exponent--; Mantissa <<= 1; } while ((Mantissa & 0x40) == 0); - + Mantissa &= 0x3F; } else // The value is zero { Exponent = (UINT)-112; } - + Result[0] = ((Exponent + 112) << 23) | (Mantissa << 17); } @@ -1370,20 +1370,20 @@ XMFINLINE XMVECTOR XMLoadFloat3PK { // Normalize the value in the resulting float Exponent = 1; - + do { Exponent--; Mantissa <<= 1; } while ((Mantissa & 0x40) == 0); - + Mantissa &= 0x3F; } else // The value is zero { Exponent = (UINT)-112; } - + Result[1] = ((Exponent + 112) << 23) | (Mantissa << 17); } @@ -1404,13 +1404,13 @@ XMFINLINE XMVECTOR XMLoadFloat3PK { // Normalize the value in the resulting float Exponent = 1; - + do { Exponent--; Mantissa <<= 1; } while ((Mantissa & 0x20) == 0); - + Mantissa &= 0x1F; } else // The value is zero @@ -2173,7 +2173,6 @@ XMFINLINE XMVECTOR XMLoadIco4 #endif // _XM_VMX128_INTRINSICS_ } - //------------------------------------------------------------------------------ XMFINLINE XMVECTOR XMLoadXDecN4 @@ -2811,7 +2810,7 @@ XMFINLINE XMMATRIX XMLoadFloat3x3 T2 = _mm_unpacklo_ps( V2, Z ); T3 = _mm_shuffle_ps( V3, T2, _MM_SHUFFLE( 0, 1, 0, 0 ) ); T4 = _mm_movehl_ps( T2, T3 ); - T5 = _mm_movehl_ps( Z, T1 ); + T5 = _mm_movehl_ps( Z, T1 ); M.r[0] = _mm_movelh_ps( V1, T1 ); M.r[1] = _mm_add_ps( T4, T5 ); @@ -2858,7 +2857,7 @@ XMFINLINE XMMATRIX XMLoadFloat4x3 #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pSource); - // Use unaligned load instructions to + // Use unaligned load instructions to // load the 12 floats // vTemp1 = x1,y1,z1,x2 XMVECTOR vTemp1 = _mm_loadu_ps(&pSource->m[0][0]); @@ -2929,7 +2928,7 @@ XMFINLINE XMMATRIX XMLoadFloat4x3A #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pSource); - // Use aligned load instructions to + // Use aligned load instructions to // load the 12 floats // vTemp1 = x1,y1,z1,x2 XMVECTOR vTemp1 = _mm_load_ps(&pSource->m[0][0]); @@ -3116,7 +3115,7 @@ XMFINLINE VOID XMStoreFloat XMFINLINE VOID XMStoreInt2 ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -3143,7 +3142,7 @@ XMFINLINE VOID XMStoreInt2 XMFINLINE VOID XMStoreInt2A ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -3170,7 +3169,7 @@ XMFINLINE VOID XMStoreInt2A XMFINLINE VOID XMStoreFloat2 ( - XMFLOAT2* pDestination, + XMFLOAT2* pDestination, FXMVECTOR V ) { @@ -3197,7 +3196,7 @@ XMFINLINE VOID XMStoreFloat2 XMFINLINE VOID XMStoreFloat2A ( - XMFLOAT2A* pDestination, + XMFLOAT2A* pDestination, FXMVECTOR V ) { @@ -3224,7 +3223,7 @@ XMFINLINE VOID XMStoreFloat2A XMFINLINE VOID XMStoreHalf2 ( - XMHALF2* pDestination, + XMHALF2* pDestination, FXMVECTOR V ) { @@ -3247,7 +3246,7 @@ XMFINLINE VOID XMStoreHalf2 XMFINLINE VOID XMStoreShortN2 ( - XMSHORTN2* pDestination, + XMSHORTN2* pDestination, FXMVECTOR V ) { @@ -3283,7 +3282,7 @@ XMFINLINE VOID XMStoreShortN2 XMFINLINE VOID XMStoreShort2 ( - XMSHORT2* pDestination, + XMSHORT2* pDestination, FXMVECTOR V ) { @@ -3321,7 +3320,7 @@ XMFINLINE VOID XMStoreShort2 XMFINLINE VOID XMStoreUShortN2 ( - XMUSHORTN2* pDestination, + XMUSHORTN2* pDestination, FXMVECTOR V ) { @@ -3360,7 +3359,7 @@ XMFINLINE VOID XMStoreUShortN2 XMFINLINE VOID XMStoreUShort2 ( - XMUSHORT2* pDestination, + XMUSHORT2* pDestination, FXMVECTOR V ) { @@ -3397,7 +3396,7 @@ XMFINLINE VOID XMStoreUShort2 XMFINLINE VOID XMStoreInt3 ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -3429,7 +3428,7 @@ XMFINLINE VOID XMStoreInt3 XMFINLINE VOID XMStoreInt3A ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -3459,7 +3458,7 @@ XMFINLINE VOID XMStoreInt3A XMFINLINE VOID XMStoreFloat3 ( - XMFLOAT3* pDestination, + XMFLOAT3* pDestination, FXMVECTOR V ) { @@ -3491,7 +3490,7 @@ XMFINLINE VOID XMStoreFloat3 XMFINLINE VOID XMStoreFloat3A ( - XMFLOAT3A* pDestination, + XMFLOAT3A* pDestination, FXMVECTOR V ) { @@ -3521,7 +3520,7 @@ XMFINLINE VOID XMStoreFloat3A XMFINLINE VOID XMStoreUHenDN3 ( - XMUHENDN3* pDestination, + XMUHENDN3* pDestination, FXMVECTOR V ) { @@ -3571,7 +3570,7 @@ XMFINLINE VOID XMStoreUHenDN3 XMFINLINE VOID XMStoreUHenD3 ( - XMUHEND3* pDestination, + XMUHEND3* pDestination, FXMVECTOR V ) { @@ -3621,7 +3620,7 @@ XMFINLINE VOID XMStoreUHenD3 XMFINLINE VOID XMStoreHenDN3 ( - XMHENDN3* pDestination, + XMHENDN3* pDestination, FXMVECTOR V ) { @@ -3665,7 +3664,7 @@ XMFINLINE VOID XMStoreHenDN3 XMFINLINE VOID XMStoreHenD3 ( - XMHEND3* pDestination, + XMHEND3* pDestination, FXMVECTOR V ) { @@ -3711,7 +3710,7 @@ XMFINLINE VOID XMStoreHenD3 XMFINLINE VOID XMStoreUDHenN3 ( - XMUDHENN3* pDestination, + XMUDHENN3* pDestination, FXMVECTOR V ) { @@ -3761,7 +3760,7 @@ XMFINLINE VOID XMStoreUDHenN3 XMFINLINE VOID XMStoreUDHen3 ( - XMUDHEN3* pDestination, + XMUDHEN3* pDestination, FXMVECTOR V ) { @@ -3811,7 +3810,7 @@ XMFINLINE VOID XMStoreUDHen3 XMFINLINE VOID XMStoreDHenN3 ( - XMDHENN3* pDestination, + XMDHENN3* pDestination, FXMVECTOR V ) { @@ -3855,7 +3854,7 @@ XMFINLINE VOID XMStoreDHenN3 XMFINLINE VOID XMStoreDHen3 ( - XMDHEN3* pDestination, + XMDHEN3* pDestination, FXMVECTOR V ) { @@ -3995,7 +3994,7 @@ XMFINLINE VOID XMStoreFloat3PK // Rebias the exponent to represent the value as a normalized float11 I += 0xC8000000U; } - + Result[j] = ((I + 0xFFFFU + ((I >> 17U) & 1U)) >> 17U)&0x7ffU; } } @@ -4042,7 +4041,7 @@ XMFINLINE VOID XMStoreFloat3PK // Rebias the exponent to represent the value as a normalized float10 I += 0xC8000000U; } - + Result[2] = ((I + 0x1FFFFU + ((I >> 18U) & 1U)) >> 18U)&0x3ffU; } @@ -4052,7 +4051,6 @@ XMFINLINE VOID XMStoreFloat3PK | ( (Result[2] & 0x3ff) << 22 ); } - //------------------------------------------------------------------------------ XMFINLINE VOID XMStoreFloat3SE @@ -4065,7 +4063,6 @@ XMFINLINE VOID XMStoreFloat3SE UINT I, Sign, j, T; UINT Frac[3]; UINT Exp[3]; - XMASSERT(pDestination); @@ -4116,7 +4113,7 @@ XMFINLINE VOID XMStoreFloat3SE // Rebias the exponent to represent the value as a normalized float11 I += 0xC8000000U; } - + T = ((I + 0x1FFFU + ((I >> 14U) & 1U)) >> 14U)&0x3fffU; Exp[j] = (T & 0x3E00) >> 9; @@ -4142,7 +4139,7 @@ XMFINLINE VOID XMStoreFloat3SE XMFINLINE VOID XMStoreInt4 ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -4157,7 +4154,7 @@ XMFINLINE VOID XMStoreInt4 #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pDestination); - + _mm_storeu_si128( (__m128i*)pDestination, reinterpret_cast(&V)[0] ); #else // _XM_VMX128_INTRINSICS_ @@ -4168,7 +4165,7 @@ XMFINLINE VOID XMStoreInt4 XMFINLINE VOID XMStoreInt4A ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -4196,7 +4193,7 @@ XMFINLINE VOID XMStoreInt4A XMFINLINE VOID XMStoreInt4NC ( - UINT* pDestination, + UINT* pDestination, FXMVECTOR V ) { @@ -4204,7 +4201,7 @@ XMFINLINE VOID XMStoreInt4NC XMASSERT(pDestination); XMASSERT(((UINT_PTR)pDestination & 3) == 0); - + pDestination[0] = V.vector4_u32[0]; pDestination[1] = V.vector4_u32[1]; pDestination[2] = V.vector4_u32[2]; @@ -4213,7 +4210,7 @@ XMFINLINE VOID XMStoreInt4NC #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pDestination); XMASSERT(((UINT_PTR)pDestination & 3) == 0); - + _mm_storeu_si128( (__m128i*)pDestination, reinterpret_cast(&V)[0] ); #else // _XM_VMX128_INTRINSICS_ @@ -4224,14 +4221,14 @@ XMFINLINE VOID XMStoreInt4NC XMFINLINE VOID XMStoreFloat4 ( - XMFLOAT4* pDestination, + XMFLOAT4* pDestination, FXMVECTOR V ) { #if defined(_XM_NO_INTRINSICS_) XMASSERT(pDestination); - + pDestination->x = V.vector4_f32[0]; pDestination->y = V.vector4_f32[1]; pDestination->z = V.vector4_f32[2]; @@ -4239,7 +4236,7 @@ XMFINLINE VOID XMStoreFloat4 #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pDestination); - + _mm_storeu_ps( &pDestination->x, V ); #else // _XM_VMX128_INTRINSICS_ @@ -4250,7 +4247,7 @@ XMFINLINE VOID XMStoreFloat4 XMFINLINE VOID XMStoreFloat4A ( - XMFLOAT4A* pDestination, + XMFLOAT4A* pDestination, FXMVECTOR V ) { @@ -4277,7 +4274,7 @@ XMFINLINE VOID XMStoreFloat4A XMFINLINE VOID XMStoreFloat4NC ( - XMFLOAT4* pDestination, + XMFLOAT4* pDestination, FXMVECTOR V ) { @@ -4285,7 +4282,7 @@ XMFINLINE VOID XMStoreFloat4NC XMASSERT(pDestination); XMASSERT(((UINT_PTR)pDestination & 3) == 0); - + pDestination->x = V.vector4_f32[0]; pDestination->y = V.vector4_f32[1]; pDestination->z = V.vector4_f32[2]; @@ -4294,7 +4291,7 @@ XMFINLINE VOID XMStoreFloat4NC #elif defined(_XM_SSE_INTRINSICS_) XMASSERT(pDestination); XMASSERT(((UINT_PTR)pDestination & 3) == 0); - + _mm_storeu_ps( &pDestination->x, V ); #else // _XM_VMX128_INTRINSICS_ @@ -4305,11 +4302,11 @@ XMFINLINE VOID XMStoreFloat4NC XMFINLINE VOID XMStoreHalf4 ( - XMHALF4* pDestination, + XMHALF4* pDestination, FXMVECTOR V ) { -#if defined(_XM_NO_INTRINSICS_) +#if defined(_XM_NO_INTRINSICS_) XMASSERT(pDestination); @@ -4332,7 +4329,7 @@ XMFINLINE VOID XMStoreHalf4 XMFINLINE VOID XMStoreShortN4 ( - XMSHORTN4* pDestination, + XMSHORTN4* pDestination, FXMVECTOR V ) { @@ -4370,7 +4367,7 @@ XMFINLINE VOID XMStoreShortN4 XMFINLINE VOID XMStoreShort4 ( - XMSHORT4* pDestination, + XMSHORT4* pDestination, FXMVECTOR V ) { @@ -4410,7 +4407,7 @@ XMFINLINE VOID XMStoreShort4 XMFINLINE VOID XMStoreUShortN4 ( - XMUSHORTN4* pDestination, + XMUSHORTN4* pDestination, FXMVECTOR V ) { @@ -4453,7 +4450,7 @@ XMFINLINE VOID XMStoreUShortN4 XMFINLINE VOID XMStoreUShort4 ( - XMUSHORT4* pDestination, + XMUSHORT4* pDestination, FXMVECTOR V ) { @@ -4494,7 +4491,7 @@ XMFINLINE VOID XMStoreUShort4 XMFINLINE VOID XMStoreXIcoN4 ( - XMXICON4* pDestination, + XMXICON4* pDestination, FXMVECTOR V ) { @@ -4551,7 +4548,7 @@ XMFINLINE VOID XMStoreXIcoN4 XMFINLINE VOID XMStoreXIco4 ( - XMXICO4* pDestination, + XMXICO4* pDestination, FXMVECTOR V ) { @@ -4604,7 +4601,7 @@ XMFINLINE VOID XMStoreXIco4 XMFINLINE VOID XMStoreUIcoN4 ( - XMUICON4* pDestination, + XMUICON4* pDestination, FXMVECTOR V ) { @@ -4676,7 +4673,7 @@ XMFINLINE VOID XMStoreUIcoN4 XMFINLINE VOID XMStoreUIco4 ( - XMUICO4* pDestination, + XMUICO4* pDestination, FXMVECTOR V ) { @@ -4737,7 +4734,7 @@ XMFINLINE VOID XMStoreUIco4 XMFINLINE VOID XMStoreIcoN4 ( - XMICON4* pDestination, + XMICON4* pDestination, FXMVECTOR V ) { @@ -4799,7 +4796,7 @@ XMFINLINE VOID XMStoreIcoN4 XMFINLINE VOID XMStoreIco4 ( - XMICO4* pDestination, + XMICO4* pDestination, FXMVECTOR V ) { @@ -4859,7 +4856,7 @@ XMFINLINE VOID XMStoreIco4 XMFINLINE VOID XMStoreXDecN4 ( - XMXDECN4* pDestination, + XMXDECN4* pDestination, FXMVECTOR V ) { @@ -4912,7 +4909,7 @@ XMFINLINE VOID XMStoreXDecN4 XMFINLINE VOID XMStoreXDec4 ( - XMXDEC4* pDestination, + XMXDEC4* pDestination, FXMVECTOR V ) { @@ -4965,7 +4962,7 @@ XMFINLINE VOID XMStoreXDec4 XMFINLINE VOID XMStoreUDecN4 ( - XMUDECN4* pDestination, + XMUDECN4* pDestination, FXMVECTOR V ) { @@ -5016,7 +5013,7 @@ XMFINLINE VOID XMStoreUDecN4 XMFINLINE VOID XMStoreUDec4 ( - XMUDEC4* pDestination, + XMUDEC4* pDestination, FXMVECTOR V ) { @@ -5067,7 +5064,7 @@ XMFINLINE VOID XMStoreUDec4 XMFINLINE VOID XMStoreDecN4 ( - XMDECN4* pDestination, + XMDECN4* pDestination, FXMVECTOR V ) { @@ -5116,7 +5113,7 @@ XMFINLINE VOID XMStoreDecN4 XMFINLINE VOID XMStoreDec4 ( - XMDEC4* pDestination, + XMDEC4* pDestination, FXMVECTOR V ) { @@ -5167,7 +5164,7 @@ XMFINLINE VOID XMStoreDec4 XMFINLINE VOID XMStoreUByteN4 ( - XMUBYTEN4* pDestination, + XMUBYTEN4* pDestination, FXMVECTOR V ) { @@ -5206,7 +5203,7 @@ XMFINLINE VOID XMStoreUByteN4 vResulti = _mm_or_si128(vResulti,vResulti2); // Move Z to the x position vResulti2 = _mm_shuffle_epi32(vResulti,_MM_SHUFFLE(1,1,1,1)); - // Perform a single bit left shift to fix y|w + // Perform a single bit left shift to fix y|w vResulti2 = _mm_add_epi32(vResulti2,vResulti2); // i = x|y|z|w vResulti = _mm_or_si128(vResulti,vResulti2); @@ -5219,7 +5216,7 @@ XMFINLINE VOID XMStoreUByteN4 XMFINLINE VOID XMStoreUByte4 ( - XMUBYTE4* pDestination, + XMUBYTE4* pDestination, FXMVECTOR V ) { @@ -5258,7 +5255,7 @@ XMFINLINE VOID XMStoreUByte4 vResulti = _mm_or_si128(vResulti,vResulti2); // Move Z to the x position vResulti2 = _mm_shuffle_epi32(vResulti,_MM_SHUFFLE(1,1,1,1)); - // Perform a single bit left shift to fix y|w + // Perform a single bit left shift to fix y|w vResulti2 = _mm_add_epi32(vResulti2,vResulti2); // i = x|y|z|w vResulti = _mm_or_si128(vResulti,vResulti2); @@ -5271,7 +5268,7 @@ XMFINLINE VOID XMStoreUByte4 XMFINLINE VOID XMStoreByteN4 ( - XMBYTEN4* pDestination, + XMBYTEN4* pDestination, FXMVECTOR V ) { @@ -5320,7 +5317,7 @@ XMFINLINE VOID XMStoreByteN4 XMFINLINE VOID XMStoreByte4 ( - XMBYTE4* pDestination, + XMBYTE4* pDestination, FXMVECTOR V ) { @@ -5453,7 +5450,7 @@ XMFINLINE VOID XMStoreU555( XMFINLINE VOID XMStoreColor ( - XMCOLOR* pDestination, + XMCOLOR* pDestination, FXMVECTOR V ) { @@ -5484,7 +5481,7 @@ XMFINLINE VOID XMStoreColor vResult = _mm_mul_ps(vResult,Scale); // Shuffle RGBA to ARGB vResult = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(3,0,1,2)); - // Convert to int + // Convert to int __m128i vInt = _mm_cvtps_epi32(vResult); // Mash to shorts vInt = _mm_packs_epi32(vInt,vInt); @@ -5500,7 +5497,7 @@ XMFINLINE VOID XMStoreColor XMFINLINE VOID XMStoreFloat3x3 ( - XMFLOAT3X3* pDestination, + XMFLOAT3X3* pDestination, CXMMATRIX M ) { @@ -5516,7 +5513,7 @@ XMFINLINE VOID XMStoreFloat3x3 XMFINLINE VOID XMStoreFloat3x3NC ( - XMFLOAT3X3* pDestination, + XMFLOAT3X3* pDestination, CXMMATRIX M ) { @@ -5556,7 +5553,7 @@ XMFINLINE VOID XMStoreFloat3x3NC XMFINLINE VOID XMStoreFloat4x3 ( - XMFLOAT4X3* pDestination, + XMFLOAT4X3* pDestination, CXMMATRIX M ) { @@ -5572,7 +5569,7 @@ XMFINLINE VOID XMStoreFloat4x3 XMFINLINE VOID XMStoreFloat4x3A ( - XMFLOAT4X3A* pDestination, + XMFLOAT4X3A* pDestination, CXMMATRIX M ) { @@ -5630,7 +5627,7 @@ XMFINLINE VOID XMStoreFloat4x3A XMFINLINE VOID XMStoreFloat4x3NC ( - XMFLOAT4X3* pDestination, + XMFLOAT4X3* pDestination, CXMMATRIX M ) { @@ -5676,7 +5673,7 @@ XMFINLINE VOID XMStoreFloat4x3NC XMFINLINE VOID XMStoreFloat4x4 ( - XMFLOAT4X4* pDestination, + XMFLOAT4X4* pDestination, CXMMATRIX M ) { @@ -5699,7 +5696,7 @@ XMFINLINE VOID XMStoreFloat4x4 XMFINLINE VOID XMStoreFloat4x4A ( - XMFLOAT4X4A* pDestination, + XMFLOAT4X4A* pDestination, CXMMATRIX M ) { @@ -5743,7 +5740,7 @@ XMFINLINE VOID XMStoreFloat4x4A XMFINLINE VOID XMStoreFloat4x4NC ( - XMFLOAT4X4* pDestination, + XMFLOAT4X4* pDestination, CXMMATRIX M ) { diff --git a/gfx/include/dxsdk/xnamathmatrix.inl b/gfx/include/dxsdk/xnamathmatrix.inl index 6348dc7743..83ddb5c2fa 100644 --- a/gfx/include/dxsdk/xnamathmatrix.inl +++ b/gfx/include/dxsdk/xnamathmatrix.inl @@ -184,7 +184,7 @@ XMFINLINE BOOL XMMatrixIsIdentity // Perform a 4x4 matrix multiply by a 4x4 matrix XMFINLINE XMMATRIX XMMatrixMultiply ( - CXMMATRIX M1, + CXMMATRIX M1, CXMMATRIX M2 ) { @@ -294,7 +294,7 @@ XMFINLINE XMMATRIX XMMatrixMultiply XMFINLINE XMMATRIX XMMatrixMultiplyTranspose ( - CXMMATRIX M1, + CXMMATRIX M1, CXMMATRIX M2 ) { @@ -405,7 +405,7 @@ XMFINLINE XMMATRIX XMMatrixTranspose // Return the inverse and the determinant of a 4x4 matrix XMINLINE XMMATRIX XMMatrixInverse ( - XMVECTOR* pDeterminant, + XMVECTOR* pDeterminant, CXMMATRIX M ) { @@ -800,7 +800,7 @@ XMINLINE XMVECTOR XMMatrixDeterminant } \ } \ } - + #define XM_DECOMP_EPSILON 0.0001f XMINLINE BOOL XMMatrixDecompose( XMVECTOR *outScale, XMVECTOR *outRotQuat, XMVECTOR *outTrans, CXMMATRIX M ) @@ -830,9 +830,9 @@ XMINLINE BOOL XMMatrixDecompose( XMVECTOR *outScale, XMVECTOR *outRotQuat, XMVEC pfScales = (FLOAT *)outScale; - XMVectorGetXPtr(&pfScales[0],XMVector3Length(ppvBasis[0][0])); - XMVectorGetXPtr(&pfScales[1],XMVector3Length(ppvBasis[1][0])); - XMVectorGetXPtr(&pfScales[2],XMVector3Length(ppvBasis[2][0])); + XMVectorGetXPtr(&pfScales[0],XMVector3Length(ppvBasis[0][0])); + XMVectorGetXPtr(&pfScales[1],XMVector3Length(ppvBasis[1][0])); + XMVectorGetXPtr(&pfScales[2],XMVector3Length(ppvBasis[2][0])); XMRANKDECOMPOSE(a, b, c, pfScales[0], pfScales[1], pfScales[2]) @@ -862,7 +862,7 @@ XMINLINE BOOL XMMatrixDecompose( XMVECTOR *outScale, XMVECTOR *outRotQuat, XMVEC { ppvBasis[c][0] = XMVector3Cross(ppvBasis[a][0],ppvBasis[b][0]); } - + ppvBasis[c][0] = XMVector3Normalize(ppvBasis[c][0]); fDet = XMVectorGetX(XMMatrixDeterminant(matTemp)); @@ -899,7 +899,7 @@ XMINLINE BOOL XMMatrixDecompose( XMVECTOR *outScale, XMVECTOR *outRotQuat, XMVEC XMFINLINE XMMATRIX XMMatrixIdentity() { -#if defined(_XM_NO_INTRINSICS_) +#if defined(_XM_NO_INTRINSICS_) XMMATRIX M; M.r[0] = g_XMIdentityR0.v; @@ -943,8 +943,8 @@ XMFINLINE XMMATRIX XMMatrixSet XMFINLINE XMMATRIX XMMatrixTranslation ( - FLOAT OffsetX, - FLOAT OffsetY, + FLOAT OffsetX, + FLOAT OffsetY, FLOAT OffsetZ ) { @@ -984,7 +984,6 @@ XMFINLINE XMMATRIX XMMatrixTranslation #endif // _XM_VMX128_INTRINSICS_ } - //------------------------------------------------------------------------------ XMFINLINE XMMATRIX XMMatrixTranslationFromVector @@ -1033,8 +1032,8 @@ XMFINLINE XMMATRIX XMMatrixTranslationFromVector XMFINLINE XMMATRIX XMMatrixScaling ( - FLOAT ScaleX, - FLOAT ScaleY, + FLOAT ScaleX, + FLOAT ScaleY, FLOAT ScaleZ ) { @@ -1111,7 +1110,7 @@ XMINLINE XMMATRIX XMMatrixRotationX { #if defined(_XM_NO_INTRINSICS_) XMMATRIX M; - + FLOAT fSinAngle = sinf(Angle); FLOAT fCosAngle = cosf(Angle); @@ -1167,7 +1166,7 @@ XMINLINE XMMATRIX XMMatrixRotationY { #if defined(_XM_NO_INTRINSICS_) XMMATRIX M; - + FLOAT fSinAngle = sinf(Angle); FLOAT fCosAngle = cosf(Angle); @@ -1222,7 +1221,7 @@ XMINLINE XMMATRIX XMMatrixRotationZ { #if defined(_XM_NO_INTRINSICS_) XMMATRIX M; - + FLOAT fSinAngle = sinf(Angle); FLOAT fCosAngle = cosf(Angle); @@ -1273,8 +1272,8 @@ XMINLINE XMMATRIX XMMatrixRotationZ XMINLINE XMMATRIX XMMatrixRotationRollPitchYaw ( - FLOAT Pitch, - FLOAT Yaw, + FLOAT Pitch, + FLOAT Yaw, FLOAT Roll ) { @@ -1296,7 +1295,7 @@ XMINLINE XMMATRIX XMMatrixRotationRollPitchYawFromVector { XMVECTOR Q; XMMATRIX M; - + Q = XMQuaternionRotationRollPitchYawFromVector(Angles); M = XMMatrixRotationQuaternion(Q); @@ -1307,7 +1306,7 @@ XMINLINE XMMATRIX XMMatrixRotationRollPitchYawFromVector XMINLINE XMMATRIX XMMatrixRotationNormal ( - FXMVECTOR NormalAxis, + FXMVECTOR NormalAxis, FLOAT Angle ) { @@ -1420,7 +1419,7 @@ XMINLINE XMMATRIX XMMatrixRotationNormal XMINLINE XMMATRIX XMMatrixRotationAxis ( - FXMVECTOR Axis, + FXMVECTOR Axis, FLOAT Angle ) { @@ -1563,11 +1562,11 @@ XMFINLINE XMMATRIX XMMatrixRotationQuaternion XMINLINE XMMATRIX XMMatrixTransformation2D ( - FXMVECTOR ScalingOrigin, - FLOAT ScalingOrientation, - FXMVECTOR Scaling, - FXMVECTOR RotationOrigin, - FLOAT Rotation, + FXMVECTOR ScalingOrigin, + FLOAT ScalingOrientation, + FXMVECTOR Scaling, + FXMVECTOR RotationOrigin, + FLOAT Rotation, CXMVECTOR Translation ) { @@ -1660,11 +1659,11 @@ XMINLINE XMMATRIX XMMatrixTransformation2D XMINLINE XMMATRIX XMMatrixTransformation ( - FXMVECTOR ScalingOrigin, - FXMVECTOR ScalingOrientationQuaternion, - FXMVECTOR Scaling, - CXMVECTOR RotationOrigin, - CXMVECTOR RotationQuaternion, + FXMVECTOR ScalingOrigin, + FXMVECTOR ScalingOrientationQuaternion, + FXMVECTOR Scaling, + CXMVECTOR RotationOrigin, + CXMVECTOR RotationQuaternion, CXMVECTOR Translation ) { @@ -1750,9 +1749,9 @@ XMINLINE XMMATRIX XMMatrixTransformation XMINLINE XMMATRIX XMMatrixAffineTransformation2D ( - FXMVECTOR Scaling, - FXMVECTOR RotationOrigin, - FLOAT Rotation, + FXMVECTOR Scaling, + FXMVECTOR RotationOrigin, + FLOAT Rotation, FXMVECTOR Translation ) { @@ -1814,9 +1813,9 @@ XMINLINE XMMATRIX XMMatrixAffineTransformation2D XMINLINE XMMATRIX XMMatrixAffineTransformation ( - FXMVECTOR Scaling, - FXMVECTOR RotationOrigin, - FXMVECTOR RotationQuaternion, + FXMVECTOR Scaling, + FXMVECTOR RotationOrigin, + FXMVECTOR RotationQuaternion, CXMVECTOR Translation ) { @@ -1935,7 +1934,7 @@ XMFINLINE XMMATRIX XMMatrixReflect XMFINLINE XMMATRIX XMMatrixShadow ( - FXMVECTOR ShadowPlane, + FXMVECTOR ShadowPlane, FXMVECTOR LightPosition ) { @@ -2005,13 +2004,12 @@ XMFINLINE XMMATRIX XMMatrixShadow // View and projection initialization operations //------------------------------------------------------------------------------ - //------------------------------------------------------------------------------ XMFINLINE XMMATRIX XMMatrixLookAtLH ( - FXMVECTOR EyePosition, - FXMVECTOR FocusPosition, + FXMVECTOR EyePosition, + FXMVECTOR FocusPosition, FXMVECTOR UpDirection ) { @@ -2020,7 +2018,7 @@ XMFINLINE XMMATRIX XMMatrixLookAtLH EyeDirection = XMVectorSubtract(FocusPosition, EyePosition); M = XMMatrixLookToLH(EyePosition, EyeDirection, UpDirection); - + return M; } @@ -2028,8 +2026,8 @@ XMFINLINE XMMATRIX XMMatrixLookAtLH XMFINLINE XMMATRIX XMMatrixLookAtRH ( - FXMVECTOR EyePosition, - FXMVECTOR FocusPosition, + FXMVECTOR EyePosition, + FXMVECTOR FocusPosition, FXMVECTOR UpDirection ) { @@ -2038,7 +2036,7 @@ XMFINLINE XMMATRIX XMMatrixLookAtRH NegEyeDirection = XMVectorSubtract(EyePosition, FocusPosition); M = XMMatrixLookToLH(EyePosition, NegEyeDirection, UpDirection); - + return M; } @@ -2046,8 +2044,8 @@ XMFINLINE XMMATRIX XMMatrixLookAtRH XMINLINE XMMATRIX XMMatrixLookToLH ( - FXMVECTOR EyePosition, - FXMVECTOR EyeDirection, + FXMVECTOR EyePosition, + FXMVECTOR EyeDirection, FXMVECTOR UpDirection ) { @@ -2124,8 +2122,8 @@ XMINLINE XMMATRIX XMMatrixLookToLH XMFINLINE XMMATRIX XMMatrixLookToRH ( - FXMVECTOR EyePosition, - FXMVECTOR EyeDirection, + FXMVECTOR EyePosition, + FXMVECTOR EyeDirection, FXMVECTOR UpDirection ) { @@ -2142,9 +2140,9 @@ XMFINLINE XMMATRIX XMMatrixLookToRH XMFINLINE XMMATRIX XMMatrixPerspectiveLH ( - FLOAT ViewWidth, - FLOAT ViewHeight, - FLOAT NearZ, + FLOAT ViewWidth, + FLOAT ViewHeight, + FLOAT NearZ, FLOAT FarZ ) { @@ -2174,7 +2172,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveLH M.m[2][2] = fRange; M.m[2][3] = 1.0f; - M.m[3][0] = 0.0f; + M.m[3][0] = 0.0f; M.m[3][1] = 0.0f; M.m[3][2] = -fRange * NearZ; M.m[3][3] = 0.0f; @@ -2198,7 +2196,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveLH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // TwoNearZ / ViewWidth,0,0,0 @@ -2226,9 +2224,9 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveLH XMFINLINE XMMATRIX XMMatrixPerspectiveRH ( - FLOAT ViewWidth, - FLOAT ViewHeight, - FLOAT NearZ, + FLOAT ViewWidth, + FLOAT ViewHeight, + FLOAT NearZ, FLOAT FarZ ) { @@ -2282,7 +2280,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveRH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // TwoNearZ / ViewWidth,0,0,0 @@ -2309,9 +2307,9 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveRH XMFINLINE XMMATRIX XMMatrixPerspectiveFovLH ( - FLOAT FovAngleY, - FLOAT AspectRatio, - FLOAT NearZ, + FLOAT FovAngleY, + FLOAT AspectRatio, + FLOAT NearZ, FLOAT FarZ ) { @@ -2358,7 +2356,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveFovLH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // CosFov / SinFov,0,0,0 @@ -2385,9 +2383,9 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveFovLH XMFINLINE XMMATRIX XMMatrixPerspectiveFovRH ( - FLOAT FovAngleY, - FLOAT AspectRatio, - FLOAT NearZ, + FLOAT FovAngleY, + FLOAT AspectRatio, + FLOAT NearZ, FLOAT FarZ ) { @@ -2434,7 +2432,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveFovRH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // CosFov / SinFov,0,0,0 @@ -2461,11 +2459,11 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveFovRH XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterLH ( - FLOAT ViewLeft, - FLOAT ViewRight, - FLOAT ViewBottom, - FLOAT ViewTop, - FLOAT NearZ, + FLOAT ViewLeft, + FLOAT ViewRight, + FLOAT ViewBottom, + FLOAT ViewTop, + FLOAT NearZ, FLOAT FarZ ) { @@ -2486,7 +2484,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterLH M.r[0] = XMVectorSet(TwoNearZ * ReciprocalWidth, 0.0f, 0.0f, 0.0f); M.r[1] = XMVectorSet(0.0f, TwoNearZ * ReciprocalHeight, 0.0f, 0.0f); - M.r[2] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, + M.r[2] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, -(ViewTop + ViewBottom) * ReciprocalHeight, FarZ / (FarZ - NearZ), 1.0f); @@ -2512,7 +2510,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterLH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // TwoNearZ*ReciprocalWidth,0,0,0 @@ -2538,11 +2536,11 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterLH XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterRH ( - FLOAT ViewLeft, - FLOAT ViewRight, - FLOAT ViewBottom, - FLOAT ViewTop, - FLOAT NearZ, + FLOAT ViewLeft, + FLOAT ViewRight, + FLOAT ViewBottom, + FLOAT ViewTop, + FLOAT NearZ, FLOAT FarZ ) { @@ -2563,7 +2561,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterRH M.r[0] = XMVectorSet(TwoNearZ * ReciprocalWidth, 0.0f, 0.0f, 0.0f); M.r[1] = XMVectorSet(0.0f, TwoNearZ * ReciprocalHeight, 0.0f, 0.0f); - M.r[2] = XMVectorSet((ViewLeft + ViewRight) * ReciprocalWidth, + M.r[2] = XMVectorSet((ViewLeft + ViewRight) * ReciprocalWidth, (ViewTop + ViewBottom) * ReciprocalHeight, FarZ / (NearZ - FarZ), -1.0f); @@ -2590,7 +2588,7 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterRH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // TwoNearZ*ReciprocalWidth,0,0,0 @@ -2616,9 +2614,9 @@ XMFINLINE XMMATRIX XMMatrixPerspectiveOffCenterRH XMFINLINE XMMATRIX XMMatrixOrthographicLH ( - FLOAT ViewWidth, - FLOAT ViewHeight, - FLOAT NearZ, + FLOAT ViewWidth, + FLOAT ViewHeight, + FLOAT NearZ, FLOAT FarZ ) { @@ -2654,7 +2652,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicLH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // 2.0f / ViewWidth,0,0,0 @@ -2681,9 +2679,9 @@ XMFINLINE XMMATRIX XMMatrixOrthographicLH XMFINLINE XMMATRIX XMMatrixOrthographicRH ( - FLOAT ViewWidth, - FLOAT ViewHeight, - FLOAT NearZ, + FLOAT ViewWidth, + FLOAT ViewHeight, + FLOAT NearZ, FLOAT FarZ ) { @@ -2717,7 +2715,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicRH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // 2.0f / ViewWidth,0,0,0 @@ -2744,11 +2742,11 @@ XMFINLINE XMMATRIX XMMatrixOrthographicRH XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterLH ( - FLOAT ViewLeft, - FLOAT ViewRight, - FLOAT ViewBottom, - FLOAT ViewTop, - FLOAT NearZ, + FLOAT ViewLeft, + FLOAT ViewRight, + FLOAT ViewBottom, + FLOAT ViewTop, + FLOAT NearZ, FLOAT FarZ ) { @@ -2768,7 +2766,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterLH M.r[0] = XMVectorSet(ReciprocalWidth + ReciprocalWidth, 0.0f, 0.0f, 0.0f); M.r[1] = XMVectorSet(0.0f, ReciprocalHeight + ReciprocalHeight, 0.0f, 0.0f); M.r[2] = XMVectorSet(0.0f, 0.0f, 1.0f / (FarZ - NearZ), 0.0f); - M.r[3] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, + M.r[3] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, -(ViewTop + ViewBottom) * ReciprocalHeight, -M.r[2].vector4_f32[2] * NearZ, 1.0f); @@ -2795,7 +2793,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterLH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // fReciprocalWidth*2,0,0,0 @@ -2822,11 +2820,11 @@ XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterLH XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterRH ( - FLOAT ViewLeft, - FLOAT ViewRight, - FLOAT ViewBottom, - FLOAT ViewTop, - FLOAT NearZ, + FLOAT ViewLeft, + FLOAT ViewRight, + FLOAT ViewBottom, + FLOAT ViewTop, + FLOAT NearZ, FLOAT FarZ ) { @@ -2846,7 +2844,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterRH M.r[0] = XMVectorSet(ReciprocalWidth + ReciprocalWidth, 0.0f, 0.0f, 0.0f); M.r[1] = XMVectorSet(0.0f, ReciprocalHeight + ReciprocalHeight, 0.0f, 0.0f); M.r[2] = XMVectorSet(0.0f, 0.0f, 1.0f / (NearZ - FarZ), 0.0f); - M.r[3] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, + M.r[3] = XMVectorSet(-(ViewLeft + ViewRight) * ReciprocalWidth, -(ViewTop + ViewBottom) * ReciprocalHeight, M.r[2].vector4_f32[2] * NearZ, 1.0f); @@ -2873,7 +2871,7 @@ XMFINLINE XMMATRIX XMMatrixOrthographicOffCenterRH }; // Copy from memory to SSE register XMVECTOR vValues = rMem; - XMVECTOR vTemp = _mm_setzero_ps(); + XMVECTOR vTemp = _mm_setzero_ps(); // Copy x only vTemp = _mm_move_ss(vTemp,vValues); // fReciprocalWidth*2,0,0,0 @@ -2983,7 +2981,7 @@ XMFINLINE _XMMATRIX& _XMMATRIX::operator*= //------------------------------------------------------------------------------ -XMFINLINE _XMMATRIX _XMMATRIX::operator* +XMFINLINE _XMMATRIX _XMMATRIX::operator* ( CONST _XMMATRIX& M ) CONST diff --git a/gfx/include/dxsdk/xnamathmisc.inl b/gfx/include/dxsdk/xnamathmisc.inl index 8c16b59854..0fa035d6dc 100644 --- a/gfx/include/dxsdk/xnamathmisc.inl +++ b/gfx/include/dxsdk/xnamathmisc.inl @@ -371,7 +371,7 @@ XMFINLINE XMVECTOR XMQuaternionExp FXMVECTOR Q ) { -#if defined(_XM_NO_INTRINSICS_) +#if defined(_XM_NO_INTRINSICS_) XMVECTOR Theta; XMVECTOR SinTheta; @@ -1748,11 +1748,11 @@ XMFINLINE XMVECTOR XMColorAdjustSaturation #elif defined(_XM_SSE_INTRINSICS_) static const XMVECTORF32 gvLuminance = {0.2125f, 0.7154f, 0.0721f, 0.0f}; // Mul RGB by intensity constants - XMVECTOR vLuminance = _mm_mul_ps(vColor,gvLuminance); + XMVECTOR vLuminance = _mm_mul_ps(vColor,gvLuminance); // vResult.x = vLuminance.y, vResult.y = vLuminance.y, -// vResult.z = vLuminance.z, vResult.w = vLuminance.z +// vResult.z = vLuminance.z, vResult.w = vLuminance.z XMVECTOR vResult = vLuminance; - vResult = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(2,2,1,1)); + vResult = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(2,2,1,1)); // vLuminance.x += vLuminance.y vLuminance = _mm_add_ss(vLuminance,vResult); // Splat vLuminance.z @@ -1825,7 +1825,6 @@ XMINLINE BOOL XMVerifyCPUSupport() #endif } - //------------------------------------------------------------------------------ #define XMASSERT_LINE_STRING_SIZE 16 @@ -1936,7 +1935,7 @@ XMFINLINE XMVECTOR XMFresnelTerm // Calc G-C and G+C XMVECTOR GAddC = _mm_add_ps(G,CosIncidentAngle); XMVECTOR GSubC = _mm_sub_ps(G,CosIncidentAngle); - // Perform the term (0.5f *(g - c)^2) / (g + c)^2 + // Perform the term (0.5f *(g - c)^2) / (g + c)^2 XMVECTOR vResult = _mm_mul_ps(GSubC,GSubC); vTemp = _mm_mul_ps(GAddC,GAddC); vResult = _mm_mul_ps(vResult,g_XMOneHalf); @@ -2253,7 +2252,7 @@ XMFINLINE FLOAT XMScalarSinEst XMASSERT(Value < XM_PI); float ValueSq = Value*Value; XMVECTOR vValue = _mm_set_ps1(Value); - XMVECTOR vTemp = _mm_set_ps(ValueSq * Value,ValueSq,Value,1.0f); + XMVECTOR vTemp = _mm_set_ps(ValueSq * Value,ValueSq,Value,1.0f); vTemp = _mm_mul_ps(vTemp,vTemp); vTemp = _mm_mul_ps(vTemp,vValue); // vTemp = Value,Value^3,Value^5,Value^7 @@ -2264,7 +2263,7 @@ XMFINLINE FLOAT XMScalarSinEst vTemp = _mm_add_ps(vTemp,vValue); // Add Z and W together vTemp = _mm_shuffle_ps(vTemp,vTemp,_MM_SHUFFLE(2,2,2,2)); // Splat Z and return #if defined(_MSC_VER) && (_MSC_VER>=1500) - return _mm_cvtss_f32(vTemp); + return _mm_cvtss_f32(vTemp); #else return vTemp.m128_f32[0]; #endif @@ -2296,7 +2295,7 @@ XMFINLINE FLOAT XMScalarCosEst XMASSERT(Value < XM_PI); float ValueSq = Value*Value; XMVECTOR vValue = _mm_setzero_ps(); - XMVECTOR vTemp = _mm_set_ps(ValueSq * Value,ValueSq,Value,1.0f); + XMVECTOR vTemp = _mm_set_ps(ValueSq * Value,ValueSq,Value,1.0f); vTemp = _mm_mul_ps(vTemp,vTemp); // vTemp = 1.0f,Value^2,Value^4,Value^6 vTemp = _mm_mul_ps(vTemp,g_XMCosEstCoefficients); @@ -2306,7 +2305,7 @@ XMFINLINE FLOAT XMScalarCosEst vTemp = _mm_add_ps(vTemp,vValue); // Add Z and W together vTemp = _mm_shuffle_ps(vTemp,vTemp,_MM_SHUFFLE(2,2,2,2)); // Splat Z and return #if defined(_MSC_VER) && (_MSC_VER>=1500) - return _mm_cvtss_f32(vTemp); + return _mm_cvtss_f32(vTemp); #else return vTemp.m128_f32[0]; #endif @@ -2406,7 +2405,7 @@ XMFINLINE FLOAT XMScalarASinEst Result = _mm_mul_ps(Result, g_XMASinEstCoefficients); Result = XMVector4Dot(VR,Result); #if defined(_MSC_VER) && (_MSC_VER>=1500) - return _mm_cvtss_f32(Result); + return _mm_cvtss_f32(Result); #else return Result.m128_f32[0]; #endif @@ -2452,7 +2451,7 @@ XMFINLINE FLOAT XMScalarACosEst Result = _mm_mul_ps(Result,g_XMASinEstCoefficients); Result = XMVector4Dot(VR,Result); #if defined(_MSC_VER) && (_MSC_VER>=1500) - return XM_PIDIV2 - _mm_cvtss_f32(Result); + return XM_PIDIV2 - _mm_cvtss_f32(Result); #else return XM_PIDIV2 - Result.m128_f32[0]; #endif diff --git a/gfx/include/dxsdk/xnamathvector.inl b/gfx/include/dxsdk/xnamathvector.inl index 80b846c197..8982f75f43 100644 --- a/gfx/include/dxsdk/xnamathvector.inl +++ b/gfx/include/dxsdk/xnamathvector.inl @@ -50,9 +50,9 @@ XMFINLINE XMVECTOR XMVectorZero() // Initialize a vector with four floating point values XMFINLINE XMVECTOR XMVectorSet ( - FLOAT x, - FLOAT y, - FLOAT z, + FLOAT x, + FLOAT y, + FLOAT z, FLOAT w ) { @@ -69,9 +69,9 @@ XMFINLINE XMVECTOR XMVectorSet // Initialize a vector with four integer values XMFINLINE XMVECTOR XMVectorSetInt ( - UINT x, - UINT y, - UINT z, + UINT x, + UINT y, + UINT z, UINT w ) { @@ -188,9 +188,9 @@ XMFINLINE XMVECTOR XMVectorSplatX { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_f32[0] = - vResult.vector4_f32[1] = - vResult.vector4_f32[2] = + vResult.vector4_f32[0] = + vResult.vector4_f32[1] = + vResult.vector4_f32[2] = vResult.vector4_f32[3] = V.vector4_f32[0]; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -208,9 +208,9 @@ XMFINLINE XMVECTOR XMVectorSplatY { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_f32[0] = - vResult.vector4_f32[1] = - vResult.vector4_f32[2] = + vResult.vector4_f32[0] = + vResult.vector4_f32[1] = + vResult.vector4_f32[2] = vResult.vector4_f32[3] = V.vector4_f32[1]; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -228,9 +228,9 @@ XMFINLINE XMVECTOR XMVectorSplatZ { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_f32[0] = - vResult.vector4_f32[1] = - vResult.vector4_f32[2] = + vResult.vector4_f32[0] = + vResult.vector4_f32[1] = + vResult.vector4_f32[2] = vResult.vector4_f32[3] = V.vector4_f32[2]; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -248,9 +248,9 @@ XMFINLINE XMVECTOR XMVectorSplatW { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_f32[0] = - vResult.vector4_f32[1] = - vResult.vector4_f32[2] = + vResult.vector4_f32[0] = + vResult.vector4_f32[1] = + vResult.vector4_f32[2] = vResult.vector4_f32[3] = V.vector4_f32[3]; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -265,9 +265,9 @@ XMFINLINE XMVECTOR XMVectorSplatOne() { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_f32[0] = - vResult.vector4_f32[1] = - vResult.vector4_f32[2] = + vResult.vector4_f32[0] = + vResult.vector4_f32[1] = + vResult.vector4_f32[2] = vResult.vector4_f32[3] = 1.0f; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -282,9 +282,9 @@ XMFINLINE XMVECTOR XMVectorSplatInfinity() { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_u32[0] = - vResult.vector4_u32[1] = - vResult.vector4_u32[2] = + vResult.vector4_u32[0] = + vResult.vector4_u32[1] = + vResult.vector4_u32[2] = vResult.vector4_u32[3] = 0x7F800000; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -299,9 +299,9 @@ XMFINLINE XMVECTOR XMVectorSplatQNaN() { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_u32[0] = - vResult.vector4_u32[1] = - vResult.vector4_u32[2] = + vResult.vector4_u32[0] = + vResult.vector4_u32[1] = + vResult.vector4_u32[2] = vResult.vector4_u32[3] = 0x7FC00000; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -316,9 +316,9 @@ XMFINLINE XMVECTOR XMVectorSplatEpsilon() { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_u32[0] = - vResult.vector4_u32[1] = - vResult.vector4_u32[2] = + vResult.vector4_u32[0] = + vResult.vector4_u32[1] = + vResult.vector4_u32[2] = vResult.vector4_u32[3] = 0x34000000; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -333,9 +333,9 @@ XMFINLINE XMVECTOR XMVectorSplatSignMask() { #if defined(_XM_NO_INTRINSICS_) XMVECTOR vResult; - vResult.vector4_u32[0] = - vResult.vector4_u32[1] = - vResult.vector4_u32[2] = + vResult.vector4_u32[0] = + vResult.vector4_u32[1] = + vResult.vector4_u32[2] = vResult.vector4_u32[3] = 0x80000000U; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -360,7 +360,7 @@ XMFINLINE FLOAT XMVectorGetByIndex(FXMVECTOR V,UINT i) } //------------------------------------------------------------------------------ -// Return the X component in an FPU register. +// Return the X component in an FPU register. // This causes Load/Hit/Store on VMX targets XMFINLINE FLOAT XMVectorGetX(FXMVECTOR V) { @@ -368,7 +368,7 @@ XMFINLINE FLOAT XMVectorGetX(FXMVECTOR V) return V.vector4_f32[0]; #elif defined(_XM_SSE_INTRINSICS_) #if defined(_MSC_VER) && (_MSC_VER>=1500) - return _mm_cvtss_f32(V); + return _mm_cvtss_f32(V); #else return V.m128_f32[0]; #endif @@ -376,7 +376,7 @@ XMFINLINE FLOAT XMVectorGetX(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the Y component in an FPU register. +// Return the Y component in an FPU register. // This causes Load/Hit/Store on VMX targets XMFINLINE FLOAT XMVectorGetY(FXMVECTOR V) { @@ -393,7 +393,7 @@ XMFINLINE FLOAT XMVectorGetY(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the Z component in an FPU register. +// Return the Z component in an FPU register. // This causes Load/Hit/Store on VMX targets XMFINLINE FLOAT XMVectorGetZ(FXMVECTOR V) { @@ -410,7 +410,7 @@ XMFINLINE FLOAT XMVectorGetZ(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the W component in an FPU register. +// Return the W component in an FPU register. // This causes Load/Hit/Store on VMX targets XMFINLINE FLOAT XMVectorGetW(FXMVECTOR V) { @@ -519,7 +519,7 @@ XMFINLINE UINT XMVectorGetIntByIndex(FXMVECTOR V, UINT i) //------------------------------------------------------------------------------ -// Return the X component in an integer register. +// Return the X component in an integer register. // This causes Load/Hit/Store on VMX targets XMFINLINE UINT XMVectorGetIntX(FXMVECTOR V) { @@ -531,7 +531,7 @@ XMFINLINE UINT XMVectorGetIntX(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the Y component in an integer register. +// Return the Y component in an integer register. // This causes Load/Hit/Store on VMX targets XMFINLINE UINT XMVectorGetIntY(FXMVECTOR V) { @@ -544,7 +544,7 @@ XMFINLINE UINT XMVectorGetIntY(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the Z component in an integer register. +// Return the Z component in an integer register. // This causes Load/Hit/Store on VMX targets XMFINLINE UINT XMVectorGetIntZ(FXMVECTOR V) { @@ -557,7 +557,7 @@ XMFINLINE UINT XMVectorGetIntZ(FXMVECTOR V) #endif // _XM_VMX128_INTRINSICS_ } -// Return the W component in an integer register. +// Return the W component in an integer register. // This causes Load/Hit/Store on VMX targets XMFINLINE UINT XMVectorGetIntW(FXMVECTOR V) { @@ -1187,9 +1187,9 @@ XMFINLINE XMVECTOR XMVectorSetIntWPtr(FXMVECTOR V,CONST UINT *w) XMFINLINE XMVECTOR XMVectorPermuteControl ( - UINT ElementIndex0, - UINT ElementIndex1, - UINT ElementIndex2, + UINT ElementIndex0, + UINT ElementIndex1, + UINT ElementIndex2, UINT ElementIndex3 ) { @@ -1226,8 +1226,8 @@ XMFINLINE XMVECTOR XMVectorPermuteControl // 16-31 = V2 XMFINLINE XMVECTOR XMVectorPermute ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Control ) { @@ -1295,21 +1295,21 @@ XMFINLINE XMVECTOR XMVectorPermute } //------------------------------------------------------------------------------ -// Define a control vector to be used in XMVectorSelect +// Define a control vector to be used in XMVectorSelect // operations. The four integers specified in XMVectorSelectControl // serve as indices to select between components in two vectors. -// The first index controls selection for the first component of -// the vectors involved in a select operation, the second index +// The first index controls selection for the first component of +// the vectors involved in a select operation, the second index // controls selection for the second component etc. A value of -// zero for an index causes the corresponding component from the first +// zero for an index causes the corresponding component from the first // vector to be selected whereas a one causes the component from the // second vector to be selected instead. XMFINLINE XMVECTOR XMVectorSelectControl ( - UINT VectorIndex0, - UINT VectorIndex1, - UINT VectorIndex2, + UINT VectorIndex0, + UINT VectorIndex1, + UINT VectorIndex2, UINT VectorIndex3 ) { @@ -1346,8 +1346,8 @@ XMFINLINE XMVECTOR XMVectorSelectControl XMFINLINE XMVECTOR XMVectorSelect ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Control ) { @@ -1374,7 +1374,7 @@ XMFINLINE XMVECTOR XMVectorSelect XMFINLINE XMVECTOR XMVectorMergeXY ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1399,7 +1399,7 @@ XMFINLINE XMVECTOR XMVectorMergeXY XMFINLINE XMVECTOR XMVectorMergeZW ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1428,7 +1428,7 @@ XMFINLINE XMVECTOR XMVectorMergeZW XMFINLINE XMVECTOR XMVectorEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1454,7 +1454,7 @@ XMFINLINE XMVECTOR XMVectorEqual XMFINLINE XMVECTOR XMVectorEqualR ( UINT* pCR, - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1514,7 +1514,7 @@ XMFINLINE XMVECTOR XMVectorEqualR XMFINLINE XMVECTOR XMVectorEqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1541,7 +1541,7 @@ XMFINLINE XMVECTOR XMVectorEqualInt XMFINLINE XMVECTOR XMVectorEqualIntR ( UINT* pCR, - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1591,8 +1591,8 @@ XMFINLINE XMVECTOR XMVectorEqualIntR XMFINLINE XMVECTOR XMVectorNearEqual ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Epsilon ) { @@ -1635,7 +1635,7 @@ XMFINLINE XMVECTOR XMVectorNearEqual XMFINLINE XMVECTOR XMVectorNotEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1658,7 +1658,7 @@ XMFINLINE XMVECTOR XMVectorNotEqual XMFINLINE XMVECTOR XMVectorNotEqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1682,7 +1682,7 @@ XMFINLINE XMVECTOR XMVectorNotEqualInt XMFINLINE XMVECTOR XMVectorGreater ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1706,7 +1706,7 @@ XMFINLINE XMVECTOR XMVectorGreater XMFINLINE XMVECTOR XMVectorGreaterR ( UINT* pCR, - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1762,7 +1762,7 @@ XMFINLINE XMVECTOR XMVectorGreaterR XMFINLINE XMVECTOR XMVectorGreaterOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1786,7 +1786,7 @@ XMFINLINE XMVECTOR XMVectorGreaterOrEqual XMFINLINE XMVECTOR XMVectorGreaterOrEqualR ( UINT* pCR, - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1842,7 +1842,7 @@ XMFINLINE XMVECTOR XMVectorGreaterOrEqualR XMFINLINE XMVECTOR XMVectorLess ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1865,7 +1865,7 @@ XMFINLINE XMVECTOR XMVectorLess XMFINLINE XMVECTOR XMVectorLessOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -1888,7 +1888,7 @@ XMFINLINE XMVECTOR XMVectorLessOrEqual XMFINLINE XMVECTOR XMVectorInBounds ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { @@ -1920,7 +1920,7 @@ XMFINLINE XMVECTOR XMVectorInBounds XMFINLINE XMVECTOR XMVectorInBoundsR ( UINT* pCR, - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { @@ -2039,7 +2039,7 @@ XMFINLINE XMVECTOR XMVectorIsInfinite XMFINLINE XMVECTOR XMVectorMin ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2062,7 +2062,7 @@ XMFINLINE XMVECTOR XMVectorMin XMFINLINE XMVECTOR XMVectorMax ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2229,8 +2229,8 @@ XMFINLINE XMVECTOR XMVectorCeiling XMFINLINE XMVECTOR XMVectorClamp ( - FXMVECTOR V, - FXMVECTOR Min, + FXMVECTOR V, + FXMVECTOR Min, FXMVECTOR Max ) { @@ -2445,7 +2445,7 @@ XMFINLINE XMVECTOR XMVectorNegate XMFINLINE XMVECTOR XMVectorAdd ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2470,7 +2470,7 @@ XMFINLINE XMVECTOR XMVectorAdd XMFINLINE XMVECTOR XMVectorAddAngles ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2519,7 +2519,7 @@ XMFINLINE XMVECTOR XMVectorAddAngles XMFINLINE XMVECTOR XMVectorSubtract ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2544,7 +2544,7 @@ XMFINLINE XMVECTOR XMVectorSubtract XMFINLINE XMVECTOR XMVectorSubtractAngles ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2593,7 +2593,7 @@ XMFINLINE XMVECTOR XMVectorSubtractAngles XMFINLINE XMVECTOR XMVectorMultiply ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2615,8 +2615,8 @@ XMFINLINE XMVECTOR XMVectorMultiply XMFINLINE XMVECTOR XMVectorMultiplyAdd ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR V3 ) { @@ -2640,7 +2640,7 @@ XMFINLINE XMVECTOR XMVectorMultiplyAdd XMFINLINE XMVECTOR XMVectorDivide ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -2661,8 +2661,8 @@ XMFINLINE XMVECTOR XMVectorDivide XMFINLINE XMVECTOR XMVectorNegativeMultiplySubtract ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR V3 ) { @@ -2687,7 +2687,7 @@ XMFINLINE XMVECTOR XMVectorNegativeMultiplySubtract XMFINLINE XMVECTOR XMVectorScale ( - FXMVECTOR V, + FXMVECTOR V, FLOAT ScaleFactor ) { @@ -3155,7 +3155,7 @@ XMFINLINE XMVECTOR XMVectorAbs XMFINLINE XMVECTOR XMVectorMod ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -3230,7 +3230,7 @@ XMINLINE XMVECTOR XMVectorSin V1 = XMVectorModAngles(V); - // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - + // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - // V^15 / 15! + V^17 / 17! - V^19 / 19! + V^21 / 21! - V^23 / 23! (for -PI <= V < PI) V2 = XMVectorMultiply(V1, V1); V3 = XMVectorMultiply(V2, V1); @@ -3278,7 +3278,7 @@ XMINLINE XMVECTOR XMVectorSin // V2 = V1^2 XMVECTOR V2 = _mm_mul_ps(vResult,vResult); // V1^3 - XMVECTOR vPower = _mm_mul_ps(vResult,V2); + XMVECTOR vPower = _mm_mul_ps(vResult,V2); XMVECTOR vConstants = _mm_load_ps1(&g_XMSinCoefficients0.f[1]); vConstants = _mm_mul_ps(vConstants,vPower); vResult = _mm_add_ps(vResult,vConstants); @@ -3362,7 +3362,7 @@ XMINLINE XMVECTOR XMVectorCos V1 = XMVectorModAngles(V); - // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - + // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - // V^14 / 14! + V^16 / 16! - V^18 / 18! + V^20 / 20! - V^22 / 22! (for -PI <= V < PI) V2 = XMVectorMultiply(V1, V1); V4 = XMVectorMultiply(V2, V2); @@ -3481,8 +3481,8 @@ XMINLINE XMVECTOR XMVectorCos XMINLINE VOID XMVectorSinCos ( - XMVECTOR* pSin, - XMVECTOR* pCos, + XMVECTOR* pSin, + XMVECTOR* pCos, FXMVECTOR V ) { @@ -3499,9 +3499,9 @@ XMINLINE VOID XMVectorSinCos V1 = XMVectorModAngles(V); - // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - + // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - // V^15 / 15! + V^17 / 17! - V^19 / 19! + V^21 / 21! - V^23 / 23! (for -PI <= V < PI) - // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - + // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - // V^14 / 14! + V^16 / 16! - V^18 / 18! + V^20 / 20! - V^22 / 22! (for -PI <= V < PI) V2 = XMVectorMultiply(V1, V1); @@ -3589,9 +3589,9 @@ XMINLINE VOID XMVectorSinCos V1 = XMVectorModAngles(V); - // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - + // sin(V) ~= V - V^3 / 3! + V^5 / 5! - V^7 / 7! + V^9 / 9! - V^11 / 11! + V^13 / 13! - // V^15 / 15! + V^17 / 17! - V^19 / 19! + V^21 / 21! - V^23 / 23! (for -PI <= V < PI) - // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - + // cos(V) ~= 1 - V^2 / 2! + V^4 / 4! - V^6 / 6! + V^8 / 8! - V^10 / 10! + V^12 / 12! - // V^14 / 14! + V^16 / 16! - V^18 / 18! + V^20 / 20! - V^22 / 22! (for -PI <= V < PI) V2 = XMVectorMultiply(V1, V1); @@ -3976,7 +3976,7 @@ XMINLINE XMVECTOR XMVectorASin XMVECTOR Result; static CONST XMVECTOR OnePlusEpsilon = {1.00000011921f, 1.00000011921f, 1.00000011921f, 1.00000011921f}; - // asin(V) = V * (C0 + C1 * V + C2 * V^2 + C3 * V^3 + C4 * V^4 + C5 * V^5) + (1 - V) * rsq(1 - V) * + // asin(V) = V * (C0 + C1 * V + C2 * V^2 + C3 * V^3 + C4 * V^4 + C5 * V^5) + (1 - V) * rsq(1 - V) * // V * (C6 + C7 * V + C8 * V^2 + C9 * V^3 + C10 * V^4 + C11 * V^5) AbsV = XMVectorAbs(V); @@ -4027,7 +4027,7 @@ XMINLINE XMVECTOR XMVectorASin #elif defined(_XM_SSE_INTRINSICS_) static CONST XMVECTORF32 OnePlusEpsilon = {1.00000011921f, 1.00000011921f, 1.00000011921f, 1.00000011921f}; - // asin(V) = V * (C0 + C1 * V + C2 * V^2 + C3 * V^3 + C4 * V^4 + C5 * V^5) + (1 - V) * rsq(1 - V) * + // asin(V) = V * (C0 + C1 * V + C2 * V^2 + C3 * V^3 + C4 * V^4 + C5 * V^5) + (1 - V) * rsq(1 - V) * // V * (C6 + C7 * V + C8 * V^2 + C9 * V^3 + C10 * V^4 + C11 * V^5) // Get abs(V) XMVECTOR vAbsV = _mm_setzero_ps(); @@ -4442,7 +4442,7 @@ XMINLINE XMVECTOR XMVectorATan XMINLINE XMVECTOR XMVectorATan2 ( - FXMVECTOR Y, + FXMVECTOR Y, FXMVECTOR X ) { @@ -4672,8 +4672,8 @@ XMFINLINE XMVECTOR XMVectorCosEst XMFINLINE VOID XMVectorSinCosEst ( - XMVECTOR* pSin, - XMVECTOR* pCos, + XMVECTOR* pSin, + XMVECTOR* pCos, FXMVECTOR V ) { @@ -5167,7 +5167,7 @@ XMFINLINE XMVECTOR XMVectorATanEst XMFINLINE XMVECTOR XMVectorATan2Est ( - FXMVECTOR Y, + FXMVECTOR Y, FXMVECTOR X ) { @@ -5285,8 +5285,8 @@ XMFINLINE XMVECTOR XMVectorATan2Est XMFINLINE XMVECTOR XMVectorLerp ( - FXMVECTOR V0, - FXMVECTOR V1, + FXMVECTOR V0, + FXMVECTOR V1, FLOAT t ) { @@ -5322,8 +5322,8 @@ XMFINLINE XMVECTOR XMVectorLerp XMFINLINE XMVECTOR XMVectorLerpV ( - FXMVECTOR V0, - FXMVECTOR V1, + FXMVECTOR V0, + FXMVECTOR V1, FXMVECTOR T ) { @@ -5355,10 +5355,10 @@ XMFINLINE XMVECTOR XMVectorLerpV XMFINLINE XMVECTOR XMVectorHermite ( - FXMVECTOR Position0, - FXMVECTOR Tangent0, - FXMVECTOR Position1, - CXMVECTOR Tangent1, + FXMVECTOR Position0, + FXMVECTOR Tangent0, + FXMVECTOR Position1, + CXMVECTOR Tangent1, FLOAT t ) { @@ -5416,10 +5416,10 @@ XMFINLINE XMVECTOR XMVectorHermite XMFINLINE XMVECTOR XMVectorHermiteV ( - FXMVECTOR Position0, - FXMVECTOR Tangent0, - FXMVECTOR Position1, - CXMVECTOR Tangent1, + FXMVECTOR Position0, + FXMVECTOR Tangent0, + FXMVECTOR Position1, + CXMVECTOR Tangent1, CXMVECTOR T ) { @@ -5498,10 +5498,10 @@ XMFINLINE XMVECTOR XMVectorHermiteV XMFINLINE XMVECTOR XMVectorCatmullRom ( - FXMVECTOR Position0, - FXMVECTOR Position1, - FXMVECTOR Position2, - CXMVECTOR Position3, + FXMVECTOR Position0, + FXMVECTOR Position1, + FXMVECTOR Position2, + CXMVECTOR Position3, FLOAT t ) { @@ -5559,10 +5559,10 @@ XMFINLINE XMVECTOR XMVectorCatmullRom XMFINLINE XMVECTOR XMVectorCatmullRomV ( - FXMVECTOR Position0, - FXMVECTOR Position1, - FXMVECTOR Position2, - CXMVECTOR Position3, + FXMVECTOR Position0, + FXMVECTOR Position1, + FXMVECTOR Position2, + CXMVECTOR Position3, CXMVECTOR T ) { @@ -5632,10 +5632,10 @@ XMFINLINE XMVECTOR XMVectorCatmullRomV XMFINLINE XMVECTOR XMVectorBaryCentric ( - FXMVECTOR Position0, - FXMVECTOR Position1, - FXMVECTOR Position2, - FLOAT f, + FXMVECTOR Position0, + FXMVECTOR Position1, + FXMVECTOR Position2, + FLOAT f, FLOAT g ) { @@ -5677,10 +5677,10 @@ XMFINLINE XMVECTOR XMVectorBaryCentric XMFINLINE XMVECTOR XMVectorBaryCentricV ( - FXMVECTOR Position0, - FXMVECTOR Position1, - FXMVECTOR Position2, - CXMVECTOR F, + FXMVECTOR Position0, + FXMVECTOR Position1, + FXMVECTOR Position2, + CXMVECTOR F, CXMVECTOR G ) { @@ -5725,7 +5725,7 @@ XMFINLINE XMVECTOR XMVectorBaryCentricV XMFINLINE BOOL XMVector2Equal ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5740,12 +5740,11 @@ XMFINLINE BOOL XMVector2Equal #endif } - //------------------------------------------------------------------------------ XMFINLINE UINT XMVector2EqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5753,12 +5752,12 @@ XMFINLINE UINT XMVector2EqualR UINT CR = 0; - if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && (V1.vector4_f32[1] == V2.vector4_f32[1])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && (V1.vector4_f32[1] != V2.vector4_f32[1])) { CR = XM_CRMASK_CR6FALSE; @@ -5786,7 +5785,7 @@ XMFINLINE UINT XMVector2EqualR XMFINLINE BOOL XMVector2EqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5804,19 +5803,19 @@ XMFINLINE BOOL XMVector2EqualInt XMFINLINE UINT XMVector2EqualIntR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_u32[0] == V2.vector4_u32[0]) && + if ((V1.vector4_u32[0] == V2.vector4_u32[0]) && (V1.vector4_u32[1] == V2.vector4_u32[1])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_u32[0] != V2.vector4_u32[0]) && + else if ((V1.vector4_u32[0] != V2.vector4_u32[0]) && (V1.vector4_u32[1] != V2.vector4_u32[1])) { CR = XM_CRMASK_CR6FALSE; @@ -5844,8 +5843,8 @@ XMFINLINE UINT XMVector2EqualIntR XMFINLINE BOOL XMVector2NearEqual ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Epsilon ) { @@ -5873,7 +5872,7 @@ XMFINLINE BOOL XMVector2NearEqual XMFINLINE BOOL XMVector2NotEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5892,7 +5891,7 @@ XMFINLINE BOOL XMVector2NotEqual XMFINLINE BOOL XMVector2NotEqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5910,7 +5909,7 @@ XMFINLINE BOOL XMVector2NotEqualInt XMFINLINE BOOL XMVector2Greater ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5930,19 +5929,19 @@ XMFINLINE BOOL XMVector2Greater XMFINLINE UINT XMVector2GreaterR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] > V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] > V2.vector4_f32[0]) && (V1.vector4_f32[1] > V2.vector4_f32[1])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] <= V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] <= V2.vector4_f32[0]) && (V1.vector4_f32[1] <= V2.vector4_f32[1])) { CR = XM_CRMASK_CR6FALSE; @@ -5969,7 +5968,7 @@ XMFINLINE UINT XMVector2GreaterR XMFINLINE BOOL XMVector2GreaterOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -5987,18 +5986,18 @@ XMFINLINE BOOL XMVector2GreaterOrEqual XMFINLINE UINT XMVector2GreaterOrEqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && (V1.vector4_f32[1] >= V2.vector4_f32[1])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && (V1.vector4_f32[1] < V2.vector4_f32[1])) { CR = XM_CRMASK_CR6FALSE; @@ -6026,7 +6025,7 @@ XMFINLINE UINT XMVector2GreaterOrEqualR XMFINLINE BOOL XMVector2Less ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -6044,7 +6043,7 @@ XMFINLINE BOOL XMVector2Less XMFINLINE BOOL XMVector2LessOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -6062,12 +6061,12 @@ XMFINLINE BOOL XMVector2LessOrEqual XMFINLINE BOOL XMVector2InBounds ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) - return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1])) != 0); #elif defined(_XM_SSE_INTRINSICS_) // Test if less than or equal @@ -6080,7 +6079,7 @@ XMFINLINE BOOL XMVector2InBounds vTemp1 = _mm_and_ps(vTemp1,vTemp2); // x and y in bounds? (z and w are don't care) return (((_mm_movemask_ps(vTemp1)&0x3)==0x3) != 0); -#else // _XM_VMX128_INTRINSICS_ +#else // _XM_VMX128_INTRINSICS_ return XMComparisonAllInBounds(XMVector2InBoundsR(V, Bounds)); #endif } @@ -6089,13 +6088,13 @@ XMFINLINE BOOL XMVector2InBounds XMFINLINE UINT XMVector2InBoundsR ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1])) { CR = XM_CRMASK_CR6BOUNDS; @@ -6174,7 +6173,7 @@ XMFINLINE BOOL XMVector2IsInfinite XMFINLINE XMVECTOR XMVector2Dot ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -6206,13 +6205,13 @@ XMFINLINE XMVECTOR XMVector2Dot XMFINLINE XMVECTOR XMVector2Cross ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) FLOAT fCross = (V1.vector4_f32[0] * V2.vector4_f32[1]) - (V1.vector4_f32[1] * V2.vector4_f32[0]); - XMVECTOR vResult = { + XMVECTOR vResult = { fCross, fCross, fCross, @@ -6422,7 +6421,7 @@ XMFINLINE XMVECTOR XMVector2Normalize if (fLength > 0) { fLength = 1.0f/fLength; } - + vResult.vector4_f32[0] = V.vector4_f32[0]*fLength; vResult.vector4_f32[1] = V.vector4_f32[1]*fLength; vResult.vector4_f32[2] = V.vector4_f32[2]*fLength; @@ -6461,8 +6460,8 @@ XMFINLINE XMVECTOR XMVector2Normalize XMFINLINE XMVECTOR XMVector2ClampLength ( - FXMVECTOR V, - FLOAT LengthMin, + FXMVECTOR V, + FLOAT LengthMin, FLOAT LengthMax ) { @@ -6488,8 +6487,8 @@ XMFINLINE XMVECTOR XMVector2ClampLength XMFINLINE XMVECTOR XMVector2ClampLengthV ( - FXMVECTOR V, - FXMVECTOR LengthMin, + FXMVECTOR V, + FXMVECTOR LengthMin, FXMVECTOR LengthMax ) { @@ -6591,7 +6590,7 @@ XMFINLINE XMVECTOR XMVector2ClampLengthV XMFINLINE XMVECTOR XMVector2Reflect ( - FXMVECTOR Incident, + FXMVECTOR Incident, FXMVECTOR Normal ) { @@ -6621,8 +6620,8 @@ XMFINLINE XMVECTOR XMVector2Reflect XMFINLINE XMVECTOR XMVector2Refract ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FLOAT RefractionIndex ) { @@ -6643,8 +6642,8 @@ XMFINLINE XMVECTOR XMVector2Refract // Return the refraction of a 2D vector XMFINLINE XMVECTOR XMVector2RefractV ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FXMVECTOR RefractionIndex ) { @@ -6652,7 +6651,7 @@ XMFINLINE XMVECTOR XMVector2RefractV float IDotN; float RX,RY; XMVECTOR vResult; - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) IDotN = (Incident.vector4_f32[0]*Normal.vector4_f32[0])+(Incident.vector4_f32[1]*Normal.vector4_f32[1]); // R = 1.0f - RefractionIndex * RefractionIndex * (1.0f - IDotN * IDotN) @@ -6671,11 +6670,11 @@ XMFINLINE XMVECTOR XMVector2RefractV } vResult.vector4_f32[0] = RX; vResult.vector4_f32[1] = RY; - vResult.vector4_f32[2] = 0.0f; + vResult.vector4_f32[2] = 0.0f; vResult.vector4_f32[3] = 0.0f; return vResult; #elif defined(_XM_SSE_INTRINSICS_) - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) // Get the 2D Dot product of Incident-Normal XMVECTOR IDotN = _mm_mul_ps(Incident,Normal); @@ -6732,7 +6731,7 @@ XMFINLINE XMVECTOR XMVector2Orthogonal XMFINLINE XMVECTOR XMVector2AngleBetweenNormalsEst ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -6765,7 +6764,7 @@ XMFINLINE XMVECTOR XMVector2AngleBetweenNormalsEst XMFINLINE XMVECTOR XMVector2AngleBetweenNormals ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -6798,7 +6797,7 @@ XMFINLINE XMVECTOR XMVector2AngleBetweenNormals XMFINLINE XMVECTOR XMVector2AngleBetweenVectors ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -6850,8 +6849,8 @@ XMFINLINE XMVECTOR XMVector2AngleBetweenVectors XMFINLINE XMVECTOR XMVector2LinePointDistance ( - FXMVECTOR LinePoint1, - FXMVECTOR LinePoint2, + FXMVECTOR LinePoint1, + FXMVECTOR LinePoint2, FXMVECTOR Point ) { @@ -6865,7 +6864,7 @@ XMFINLINE XMVECTOR XMVector2LinePointDistance XMVECTOR Result; // Given a vector PointVector from LinePoint1 to Point and a vector - // LineVector from LinePoint1 to LinePoint2, the scaled distance + // LineVector from LinePoint1 to LinePoint2, the scaled distance // PointProjectionScale from LinePoint1 to the perpendicular projection // of PointVector onto the line is defined as: // @@ -6905,9 +6904,9 @@ XMFINLINE XMVECTOR XMVector2LinePointDistance XMFINLINE XMVECTOR XMVector2IntersectLine ( - FXMVECTOR Line1Point1, - FXMVECTOR Line1Point2, - FXMVECTOR Line2Point1, + FXMVECTOR Line1Point1, + FXMVECTOR Line1Point2, + FXMVECTOR Line2Point1, CXMVECTOR Line2Point2 ) { @@ -6991,7 +6990,7 @@ XMFINLINE XMVECTOR XMVector2IntersectLine XMFINLINE XMVECTOR XMVector2Transform ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -7025,11 +7024,11 @@ XMFINLINE XMVECTOR XMVector2Transform XMINLINE XMFLOAT4* XMVector2TransformStream ( - XMFLOAT4* pOutputStream, - UINT OutputStride, - CONST XMFLOAT2* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT4* pOutputStream, + UINT OutputStride, + CONST XMFLOAT2* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -7059,7 +7058,7 @@ XMINLINE XMFLOAT4* XMVector2TransformStream XMStoreFloat4((XMFLOAT4*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -7081,7 +7080,7 @@ XMINLINE XMFLOAT4* XMVector2TransformStream X = _mm_mul_ps(X,M.r[0]); vResult = _mm_add_ps(vResult,X); _mm_storeu_ps(reinterpret_cast(pOutputVector),vResult); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } return pOutputStream; @@ -7093,11 +7092,11 @@ XMINLINE XMFLOAT4* XMVector2TransformStream XMINLINE XMFLOAT4* XMVector2TransformStreamNC ( - XMFLOAT4* pOutputStream, - UINT OutputStride, - CONST XMFLOAT2* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT4* pOutputStream, + UINT OutputStride, + CONST XMFLOAT2* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -7111,7 +7110,7 @@ XMINLINE XMFLOAT4* XMVector2TransformStreamNC XMFINLINE XMVECTOR XMVector2TransformCoord ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -7153,11 +7152,11 @@ XMFINLINE XMVECTOR XMVector2TransformCoord XMINLINE XMFLOAT2* XMVector2TransformCoordStream ( - XMFLOAT2* pOutputStream, - UINT OutputStride, - CONST XMFLOAT2* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT2* pOutputStream, + UINT OutputStride, + CONST XMFLOAT2* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -7193,7 +7192,7 @@ XMINLINE XMFLOAT2* XMVector2TransformCoordStream XMStoreFloat2((XMFLOAT2*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -7217,7 +7216,7 @@ XMINLINE XMFLOAT2* XMVector2TransformCoordStream X = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(3,3,3,3)); vResult = _mm_div_ps(vResult,X); _mm_store_sd(reinterpret_cast(pOutputVector),reinterpret_cast<__m128d *>(&vResult)[0]); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } return pOutputStream; @@ -7229,7 +7228,7 @@ XMINLINE XMFLOAT2* XMVector2TransformCoordStream XMFINLINE XMVECTOR XMVector2TransformNormal ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -7262,11 +7261,11 @@ XMFINLINE XMVECTOR XMVector2TransformNormal XMINLINE XMFLOAT2* XMVector2TransformNormalStream ( - XMFLOAT2* pOutputStream, - UINT OutputStride, - CONST XMFLOAT2* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT2* pOutputStream, + UINT OutputStride, + CONST XMFLOAT2* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -7296,7 +7295,7 @@ XMINLINE XMFLOAT2* XMVector2TransformNormalStream XMStoreFloat2((XMFLOAT2*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -7317,7 +7316,7 @@ XMINLINE XMFLOAT2* XMVector2TransformNormalStream vResult = _mm_add_ps(vResult,X); _mm_store_sd(reinterpret_cast(pOutputVector),reinterpret_cast(&vResult)[0]); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -7340,7 +7339,7 @@ XMINLINE XMFLOAT2* XMVector2TransformNormalStream XMFINLINE BOOL XMVector3Equal ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7358,19 +7357,19 @@ XMFINLINE BOOL XMVector3Equal XMFINLINE UINT XMVector3EqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && (V1.vector4_f32[1] == V2.vector4_f32[1]) && (V1.vector4_f32[2] == V2.vector4_f32[2])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && (V1.vector4_f32[1] != V2.vector4_f32[1]) && (V1.vector4_f32[2] != V2.vector4_f32[2])) { @@ -7398,7 +7397,7 @@ XMFINLINE UINT XMVector3EqualR XMFINLINE BOOL XMVector3EqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7416,19 +7415,19 @@ XMFINLINE BOOL XMVector3EqualInt XMFINLINE UINT XMVector3EqualIntR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_u32[0] == V2.vector4_u32[0]) && + if ((V1.vector4_u32[0] == V2.vector4_u32[0]) && (V1.vector4_u32[1] == V2.vector4_u32[1]) && (V1.vector4_u32[2] == V2.vector4_u32[2])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_u32[0] != V2.vector4_u32[0]) && + else if ((V1.vector4_u32[0] != V2.vector4_u32[0]) && (V1.vector4_u32[1] != V2.vector4_u32[1]) && (V1.vector4_u32[2] != V2.vector4_u32[2])) { @@ -7456,8 +7455,8 @@ XMFINLINE UINT XMVector3EqualIntR XMFINLINE BOOL XMVector3NearEqual ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Epsilon ) { @@ -7488,7 +7487,7 @@ XMFINLINE BOOL XMVector3NearEqual XMFINLINE BOOL XMVector3NotEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7506,7 +7505,7 @@ XMFINLINE BOOL XMVector3NotEqual XMFINLINE BOOL XMVector3NotEqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7524,7 +7523,7 @@ XMFINLINE BOOL XMVector3NotEqualInt XMFINLINE BOOL XMVector3Greater ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7542,19 +7541,19 @@ XMFINLINE BOOL XMVector3Greater XMFINLINE UINT XMVector3GreaterR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] > V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] > V2.vector4_f32[0]) && (V1.vector4_f32[1] > V2.vector4_f32[1]) && (V1.vector4_f32[2] > V2.vector4_f32[2])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] <= V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] <= V2.vector4_f32[0]) && (V1.vector4_f32[1] <= V2.vector4_f32[1]) && (V1.vector4_f32[2] <= V2.vector4_f32[2])) { @@ -7566,7 +7565,7 @@ XMFINLINE UINT XMVector3GreaterR XMVECTOR vTemp = _mm_cmpgt_ps(V1,V2); UINT CR = 0; int iTest = _mm_movemask_ps(vTemp)&7; - if (iTest==7) + if (iTest==7) { CR = XM_CRMASK_CR6TRUE; } @@ -7583,7 +7582,7 @@ XMFINLINE UINT XMVector3GreaterR XMFINLINE BOOL XMVector3GreaterOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7601,20 +7600,20 @@ XMFINLINE BOOL XMVector3GreaterOrEqual XMFINLINE UINT XMVector3GreaterOrEqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && (V1.vector4_f32[1] >= V2.vector4_f32[1]) && (V1.vector4_f32[2] >= V2.vector4_f32[2])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && (V1.vector4_f32[1] < V2.vector4_f32[1]) && (V1.vector4_f32[2] < V2.vector4_f32[2])) { @@ -7626,7 +7625,7 @@ XMFINLINE UINT XMVector3GreaterOrEqualR XMVECTOR vTemp = _mm_cmpge_ps(V1,V2); UINT CR = 0; int iTest = _mm_movemask_ps(vTemp)&7; - if (iTest==7) + if (iTest==7) { CR = XM_CRMASK_CR6TRUE; } @@ -7643,7 +7642,7 @@ XMFINLINE UINT XMVector3GreaterOrEqualR XMFINLINE BOOL XMVector3Less ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7661,7 +7660,7 @@ XMFINLINE BOOL XMVector3Less XMFINLINE BOOL XMVector3LessOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7679,12 +7678,12 @@ XMFINLINE BOOL XMVector3LessOrEqual XMFINLINE BOOL XMVector3InBounds ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) - return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1]) && (V.vector4_f32[2] <= Bounds.vector4_f32[2] && V.vector4_f32[2] >= -Bounds.vector4_f32[2])) != 0); #elif defined(_XM_SSE_INTRINSICS_) @@ -7707,13 +7706,13 @@ XMFINLINE BOOL XMVector3InBounds XMFINLINE UINT XMVector3InBoundsR ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1]) && (V.vector4_f32[2] <= Bounds.vector4_f32[2] && V.vector4_f32[2] >= -Bounds.vector4_f32[2])) { @@ -7796,7 +7795,7 @@ XMFINLINE BOOL XMVector3IsInfinite XMFINLINE XMVECTOR XMVector3Dot ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -7807,7 +7806,7 @@ XMFINLINE XMVECTOR XMVector3Dot fValue, fValue, fValue - }; + }; return vResult; #elif defined(_XM_SSE_INTRINSICS_) @@ -7831,7 +7830,7 @@ XMFINLINE XMVECTOR XMVector3Dot XMFINLINE XMVECTOR XMVector3Cross ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -8077,7 +8076,7 @@ XMFINLINE XMVECTOR XMVector3Normalize if (fLength > 0) { fLength = 1.0f/fLength; } - + vResult.vector4_f32[0] = V.vector4_f32[0]*fLength; vResult.vector4_f32[1] = V.vector4_f32[1]*fLength; vResult.vector4_f32[2] = V.vector4_f32[2]*fLength; @@ -8118,8 +8117,8 @@ XMFINLINE XMVECTOR XMVector3Normalize XMFINLINE XMVECTOR XMVector3ClampLength ( - FXMVECTOR V, - FLOAT LengthMin, + FXMVECTOR V, + FLOAT LengthMin, FLOAT LengthMax ) { @@ -8145,8 +8144,8 @@ XMFINLINE XMVECTOR XMVector3ClampLength XMFINLINE XMVECTOR XMVector3ClampLengthV ( - FXMVECTOR V, - FXMVECTOR LengthMin, + FXMVECTOR V, + FXMVECTOR LengthMin, FXMVECTOR LengthMax ) { @@ -8249,7 +8248,7 @@ XMFINLINE XMVECTOR XMVector3ClampLengthV XMFINLINE XMVECTOR XMVector3Reflect ( - FXMVECTOR Incident, + FXMVECTOR Incident, FXMVECTOR Normal ) { @@ -8279,8 +8278,8 @@ XMFINLINE XMVECTOR XMVector3Reflect XMFINLINE XMVECTOR XMVector3Refract ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FLOAT RefractionIndex ) { @@ -8301,8 +8300,8 @@ XMFINLINE XMVECTOR XMVector3Refract XMFINLINE XMVECTOR XMVector3RefractV ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FXMVECTOR RefractionIndex ) { @@ -8312,7 +8311,7 @@ XMFINLINE XMVECTOR XMVector3RefractV XMVECTOR R; CONST XMVECTOR Zero = XMVectorZero(); - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) IDotN = XMVector3Dot(Incident, Normal); @@ -8343,7 +8342,7 @@ XMFINLINE XMVECTOR XMVector3RefractV } #elif defined(_XM_SSE_INTRINSICS_) - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) XMVECTOR IDotN = XMVector3Dot(Incident, Normal); // R = 1.0f - RefractionIndex * RefractionIndex * (1.0f - IDotN * IDotN) @@ -8454,7 +8453,7 @@ XMFINLINE XMVECTOR XMVector3Orthogonal XMFINLINE XMVECTOR XMVector3AngleBetweenNormalsEst ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -8487,7 +8486,7 @@ XMFINLINE XMVECTOR XMVector3AngleBetweenNormalsEst XMFINLINE XMVECTOR XMVector3AngleBetweenNormals ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -8520,7 +8519,7 @@ XMFINLINE XMVECTOR XMVector3AngleBetweenNormals XMFINLINE XMVECTOR XMVector3AngleBetweenVectors ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -8575,8 +8574,8 @@ XMFINLINE XMVECTOR XMVector3AngleBetweenVectors XMFINLINE XMVECTOR XMVector3LinePointDistance ( - FXMVECTOR LinePoint1, - FXMVECTOR LinePoint2, + FXMVECTOR LinePoint1, + FXMVECTOR LinePoint2, FXMVECTOR Point ) { @@ -8590,7 +8589,7 @@ XMFINLINE XMVECTOR XMVector3LinePointDistance XMVECTOR Result; // Given a vector PointVector from LinePoint1 to Point and a vector - // LineVector from LinePoint1 to LinePoint2, the scaled distance + // LineVector from LinePoint1 to LinePoint2, the scaled distance // PointProjectionScale from LinePoint1 to the perpendicular projection // of PointVector onto the line is defined as: // @@ -8630,9 +8629,9 @@ XMFINLINE XMVECTOR XMVector3LinePointDistance XMFINLINE VOID XMVector3ComponentsFromNormal ( - XMVECTOR* pParallel, - XMVECTOR* pPerpendicular, - FXMVECTOR V, + XMVECTOR* pParallel, + XMVECTOR* pPerpendicular, + FXMVECTOR V, FXMVECTOR Normal ) { @@ -8667,7 +8666,7 @@ XMFINLINE VOID XMVector3ComponentsFromNormal XMFINLINE XMVECTOR XMVector3Rotate ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR RotationQuaternion ) { @@ -8703,7 +8702,7 @@ XMFINLINE XMVECTOR XMVector3Rotate XMFINLINE XMVECTOR XMVector3InverseRotate ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR RotationQuaternion ) { @@ -8737,7 +8736,7 @@ XMFINLINE XMVECTOR XMVector3InverseRotate XMFINLINE XMVECTOR XMVector3Transform ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -8777,11 +8776,11 @@ XMFINLINE XMVECTOR XMVector3Transform XMINLINE XMFLOAT4* XMVector3TransformStream ( - XMFLOAT4* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT4* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -8812,7 +8811,7 @@ XMINLINE XMFLOAT4* XMVector3TransformStream XMStoreFloat4((XMFLOAT4*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -8837,7 +8836,7 @@ XMINLINE XMFLOAT4* XMVector3TransformStream X = _mm_mul_ps(X,M.r[0]); vResult = _mm_add_ps(vResult,X); _mm_storeu_ps(reinterpret_cast(pOutputVector),vResult); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -8850,11 +8849,11 @@ XMINLINE XMFLOAT4* XMVector3TransformStream XMINLINE XMFLOAT4* XMVector3TransformStreamNC ( - XMFLOAT4* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT4* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -8868,7 +8867,7 @@ XMINLINE XMFLOAT4* XMVector3TransformStreamNC XMFINLINE XMVECTOR XMVector3TransformCoord ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -8916,11 +8915,11 @@ XMFINLINE XMVECTOR XMVector3TransformCoord XMINLINE XMFLOAT3* XMVector3TransformCoordStream ( - XMFLOAT3* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT3* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -8960,7 +8959,7 @@ XMINLINE XMFLOAT3* XMVector3TransformCoordStream XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -8993,7 +8992,7 @@ XMINLINE XMFLOAT3* XMVector3TransformCoordStream _mm_store_ss(&reinterpret_cast(pOutputVector)->y,vResult); vResult = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(0,3,2,1)); _mm_store_ss(&reinterpret_cast(pOutputVector)->z,vResult); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9006,7 +9005,7 @@ XMINLINE XMFLOAT3* XMVector3TransformCoordStream XMFINLINE XMVECTOR XMVector3TransformNormal ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -9045,11 +9044,11 @@ XMFINLINE XMVECTOR XMVector3TransformNormal XMINLINE XMFLOAT3* XMVector3TransformNormalStream ( - XMFLOAT3* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT3* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -9083,7 +9082,7 @@ XMINLINE XMFLOAT3* XMVector3TransformNormalStream XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9112,7 +9111,7 @@ XMINLINE XMFLOAT3* XMVector3TransformNormalStream _mm_store_ss(&reinterpret_cast(pOutputVector)->y,vResult); vResult = _mm_shuffle_ps(vResult,vResult,_MM_SHUFFLE(0,3,2,1)); _mm_store_ss(&reinterpret_cast(pOutputVector)->z,vResult); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9125,15 +9124,15 @@ XMINLINE XMFLOAT3* XMVector3TransformNormalStream XMINLINE XMVECTOR XMVector3Project ( - FXMVECTOR V, - FLOAT ViewportX, - FLOAT ViewportY, - FLOAT ViewportWidth, - FLOAT ViewportHeight, - FLOAT ViewportMinZ, - FLOAT ViewportMaxZ, - CXMMATRIX Projection, - CXMMATRIX View, + FXMVECTOR V, + FLOAT ViewportX, + FLOAT ViewportY, + FLOAT ViewportWidth, + FLOAT ViewportHeight, + FLOAT ViewportMinZ, + FLOAT ViewportMaxZ, + CXMMATRIX Projection, + CXMMATRIX View, CXMMATRIX World ) { @@ -9146,7 +9145,7 @@ XMINLINE XMVECTOR XMVector3Project FLOAT HalfViewportWidth = ViewportWidth * 0.5f; FLOAT HalfViewportHeight = ViewportHeight * 0.5f; - Scale = XMVectorSet(HalfViewportWidth, + Scale = XMVectorSet(HalfViewportWidth, -HalfViewportHeight, ViewportMaxZ - ViewportMinZ, 0.0f); @@ -9173,7 +9172,7 @@ XMINLINE XMVECTOR XMVector3Project FLOAT HalfViewportWidth = ViewportWidth * 0.5f; FLOAT HalfViewportHeight = ViewportHeight * 0.5f; - Scale = XMVectorSet(HalfViewportWidth, + Scale = XMVectorSet(HalfViewportWidth, -HalfViewportHeight, ViewportMaxZ - ViewportMinZ, 0.0f); @@ -9196,19 +9195,19 @@ XMINLINE XMVECTOR XMVector3Project XMINLINE XMFLOAT3* XMVector3ProjectStream ( - XMFLOAT3* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, - FLOAT ViewportX, - FLOAT ViewportY, - FLOAT ViewportWidth, - FLOAT ViewportHeight, - FLOAT ViewportMinZ, - FLOAT ViewportMaxZ, - CXMMATRIX Projection, - CXMMATRIX View, + XMFLOAT3* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, + FLOAT ViewportX, + FLOAT ViewportY, + FLOAT ViewportWidth, + FLOAT ViewportHeight, + FLOAT ViewportMinZ, + FLOAT ViewportMaxZ, + CXMMATRIX Projection, + CXMMATRIX View, CXMMATRIX World ) { @@ -9228,7 +9227,7 @@ XMINLINE XMFLOAT3* XMVector3ProjectStream XMASSERT(pOutputStream); XMASSERT(pInputStream); - Scale = XMVectorSet(HalfViewportWidth, + Scale = XMVectorSet(HalfViewportWidth, -HalfViewportHeight, ViewportMaxZ - ViewportMinZ, 1.0f); @@ -9251,7 +9250,7 @@ XMINLINE XMFLOAT3* XMVector3ProjectStream XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9271,7 +9270,7 @@ XMINLINE XMFLOAT3* XMVector3ProjectStream BYTE* pInputVector = (BYTE*)pInputStream; BYTE* pOutputVector = (BYTE*)pOutputStream; - Scale = XMVectorSet(HalfViewportWidth, + Scale = XMVectorSet(HalfViewportWidth, -HalfViewportHeight, ViewportMaxZ - ViewportMinZ, 1.0f); @@ -9293,7 +9292,7 @@ XMINLINE XMFLOAT3* XMVector3ProjectStream Result = _mm_mul_ps(Result,Scale); Result = _mm_add_ps(Result,Offset); XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } return pOutputStream; @@ -9306,15 +9305,15 @@ XMINLINE XMFLOAT3* XMVector3ProjectStream XMFINLINE XMVECTOR XMVector3Unproject ( - FXMVECTOR V, - FLOAT ViewportX, - FLOAT ViewportY, - FLOAT ViewportWidth, - FLOAT ViewportHeight, - FLOAT ViewportMinZ, - FLOAT ViewportMaxZ, - CXMMATRIX Projection, - CXMMATRIX View, + FXMVECTOR V, + FLOAT ViewportX, + FLOAT ViewportY, + FLOAT ViewportWidth, + FLOAT ViewportHeight, + FLOAT ViewportMinZ, + FLOAT ViewportMaxZ, + CXMMATRIX Projection, + CXMMATRIX View, CXMMATRIX World ) { @@ -9388,19 +9387,19 @@ XMFINLINE XMVECTOR XMVector3Unproject XMINLINE XMFLOAT3* XMVector3UnprojectStream ( - XMFLOAT3* pOutputStream, - UINT OutputStride, - CONST XMFLOAT3* pInputStream, - UINT InputStride, - UINT VectorCount, - FLOAT ViewportX, - FLOAT ViewportY, - FLOAT ViewportWidth, - FLOAT ViewportHeight, - FLOAT ViewportMinZ, - FLOAT ViewportMaxZ, - CXMMATRIX Projection, - CXMMATRIX View, + XMFLOAT3* pOutputStream, + UINT OutputStride, + CONST XMFLOAT3* pInputStream, + UINT InputStride, + UINT VectorCount, + FLOAT ViewportX, + FLOAT ViewportY, + FLOAT ViewportWidth, + FLOAT ViewportHeight, + FLOAT ViewportMinZ, + FLOAT ViewportMaxZ, + CXMMATRIX Projection, + CXMMATRIX View, CXMMATRIX World) { #if defined(_XM_NO_INTRINSICS_) @@ -9445,7 +9444,7 @@ XMINLINE XMFLOAT3* XMVector3UnprojectStream XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9492,7 +9491,7 @@ XMINLINE XMFLOAT3* XMVector3UnprojectStream XMStoreFloat3((XMFLOAT3*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -9515,7 +9514,7 @@ XMINLINE XMFLOAT3* XMVector3UnprojectStream XMFINLINE BOOL XMVector4Equal ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9533,7 +9532,7 @@ XMFINLINE BOOL XMVector4Equal XMFINLINE UINT XMVector4EqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9541,14 +9540,14 @@ XMFINLINE UINT XMVector4EqualR UINT CR = 0; - if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] == V2.vector4_f32[0]) && (V1.vector4_f32[1] == V2.vector4_f32[1]) && (V1.vector4_f32[2] == V2.vector4_f32[2]) && (V1.vector4_f32[3] == V2.vector4_f32[3])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] != V2.vector4_f32[0]) && (V1.vector4_f32[1] != V2.vector4_f32[1]) && (V1.vector4_f32[2] != V2.vector4_f32[2]) && (V1.vector4_f32[3] != V2.vector4_f32[3])) @@ -9578,7 +9577,7 @@ XMFINLINE UINT XMVector4EqualR XMFINLINE BOOL XMVector4EqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9596,20 +9595,20 @@ XMFINLINE BOOL XMVector4EqualInt XMFINLINE UINT XMVector4EqualIntR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if (V1.vector4_u32[0] == V2.vector4_u32[0] && + if (V1.vector4_u32[0] == V2.vector4_u32[0] && V1.vector4_u32[1] == V2.vector4_u32[1] && V1.vector4_u32[2] == V2.vector4_u32[2] && V1.vector4_u32[3] == V2.vector4_u32[3]) { CR = XM_CRMASK_CR6TRUE; } - else if (V1.vector4_u32[0] != V2.vector4_u32[0] && + else if (V1.vector4_u32[0] != V2.vector4_u32[0] && V1.vector4_u32[1] != V2.vector4_u32[1] && V1.vector4_u32[2] != V2.vector4_u32[2] && V1.vector4_u32[3] != V2.vector4_u32[3]) @@ -9637,8 +9636,8 @@ XMFINLINE UINT XMVector4EqualIntR XMFINLINE BOOL XMVector4NearEqual ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR Epsilon ) { @@ -9670,7 +9669,7 @@ XMFINLINE BOOL XMVector4NearEqual XMFINLINE BOOL XMVector4NotEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9688,7 +9687,7 @@ XMFINLINE BOOL XMVector4NotEqual XMFINLINE BOOL XMVector4NotEqualInt ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9706,7 +9705,7 @@ XMFINLINE BOOL XMVector4NotEqualInt XMFINLINE BOOL XMVector4Greater ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9724,20 +9723,20 @@ XMFINLINE BOOL XMVector4Greater XMFINLINE UINT XMVector4GreaterR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if (V1.vector4_f32[0] > V2.vector4_f32[0] && + if (V1.vector4_f32[0] > V2.vector4_f32[0] && V1.vector4_f32[1] > V2.vector4_f32[1] && V1.vector4_f32[2] > V2.vector4_f32[2] && V1.vector4_f32[3] > V2.vector4_f32[3]) { CR = XM_CRMASK_CR6TRUE; } - else if (V1.vector4_f32[0] <= V2.vector4_f32[0] && + else if (V1.vector4_f32[0] <= V2.vector4_f32[0] && V1.vector4_f32[1] <= V2.vector4_f32[1] && V1.vector4_f32[2] <= V2.vector4_f32[2] && V1.vector4_f32[3] <= V2.vector4_f32[3]) @@ -9766,7 +9765,7 @@ XMFINLINE UINT XMVector4GreaterR XMFINLINE BOOL XMVector4GreaterOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9784,20 +9783,20 @@ XMFINLINE BOOL XMVector4GreaterOrEqual XMFINLINE UINT XMVector4GreaterOrEqualR ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && + if ((V1.vector4_f32[0] >= V2.vector4_f32[0]) && (V1.vector4_f32[1] >= V2.vector4_f32[1]) && (V1.vector4_f32[2] >= V2.vector4_f32[2]) && (V1.vector4_f32[3] >= V2.vector4_f32[3])) { CR = XM_CRMASK_CR6TRUE; } - else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && + else if ((V1.vector4_f32[0] < V2.vector4_f32[0]) && (V1.vector4_f32[1] < V2.vector4_f32[1]) && (V1.vector4_f32[2] < V2.vector4_f32[2]) && (V1.vector4_f32[3] < V2.vector4_f32[3])) @@ -9827,7 +9826,7 @@ XMFINLINE UINT XMVector4GreaterOrEqualR XMFINLINE BOOL XMVector4Less ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9845,7 +9844,7 @@ XMFINLINE BOOL XMVector4Less XMFINLINE BOOL XMVector4LessOrEqual ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -9863,12 +9862,12 @@ XMFINLINE BOOL XMVector4LessOrEqual XMFINLINE BOOL XMVector4InBounds ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) - return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + return (((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1]) && (V.vector4_f32[2] <= Bounds.vector4_f32[2] && V.vector4_f32[2] >= -Bounds.vector4_f32[2]) && (V.vector4_f32[3] <= Bounds.vector4_f32[3] && V.vector4_f32[3] >= -Bounds.vector4_f32[3])) != 0); @@ -9892,14 +9891,14 @@ XMFINLINE BOOL XMVector4InBounds XMFINLINE UINT XMVector4InBoundsR ( - FXMVECTOR V, + FXMVECTOR V, FXMVECTOR Bounds ) { #if defined(_XM_NO_INTRINSICS_) UINT CR = 0; - if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && + if ((V.vector4_f32[0] <= Bounds.vector4_f32[0] && V.vector4_f32[0] >= -Bounds.vector4_f32[0]) && (V.vector4_f32[1] <= Bounds.vector4_f32[1] && V.vector4_f32[1] >= -Bounds.vector4_f32[1]) && (V.vector4_f32[2] <= Bounds.vector4_f32[2] && V.vector4_f32[2] >= -Bounds.vector4_f32[2]) && (V.vector4_f32[3] <= Bounds.vector4_f32[3] && V.vector4_f32[3] >= -Bounds.vector4_f32[3])) @@ -9977,7 +9976,7 @@ XMFINLINE BOOL XMVector4IsInfinite XMFINLINE XMVECTOR XMVector4Dot ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -10008,13 +10007,13 @@ XMFINLINE XMVECTOR XMVector4Dot XMFINLINE XMVECTOR XMVector4Cross ( - FXMVECTOR V1, - FXMVECTOR V2, + FXMVECTOR V1, + FXMVECTOR V2, FXMVECTOR V3 ) { #if defined(_XM_NO_INTRINSICS_) - XMVECTOR Result; + XMVECTOR Result; Result.vector4_f32[0] = (((V2.vector4_f32[2]*V3.vector4_f32[3])-(V2.vector4_f32[3]*V3.vector4_f32[2]))*V1.vector4_f32[1])-(((V2.vector4_f32[1]*V3.vector4_f32[3])-(V2.vector4_f32[3]*V3.vector4_f32[1]))*V1.vector4_f32[2])+(((V2.vector4_f32[1]*V3.vector4_f32[2])-(V2.vector4_f32[2]*V3.vector4_f32[1]))*V1.vector4_f32[3]); Result.vector4_f32[1] = (((V2.vector4_f32[3]*V3.vector4_f32[2])-(V2.vector4_f32[2]*V3.vector4_f32[3]))*V1.vector4_f32[0])-(((V2.vector4_f32[3]*V3.vector4_f32[0])-(V2.vector4_f32[0]*V3.vector4_f32[3]))*V1.vector4_f32[2])+(((V2.vector4_f32[2]*V3.vector4_f32[0])-(V2.vector4_f32[0]*V3.vector4_f32[2]))*V1.vector4_f32[3]); @@ -10201,7 +10200,7 @@ XMFINLINE XMVECTOR XMVector4Length FXMVECTOR V ) { -#if defined(_XM_NO_INTRINSICS_) +#if defined(_XM_NO_INTRINSICS_) XMVECTOR Result; @@ -10290,7 +10289,7 @@ XMFINLINE XMVECTOR XMVector4Normalize if (fLength > 0) { fLength = 1.0f/fLength; } - + vResult.vector4_f32[0] = V.vector4_f32[0]*fLength; vResult.vector4_f32[1] = V.vector4_f32[1]*fLength; vResult.vector4_f32[2] = V.vector4_f32[2]*fLength; @@ -10338,8 +10337,8 @@ XMFINLINE XMVECTOR XMVector4Normalize XMFINLINE XMVECTOR XMVector4ClampLength ( - FXMVECTOR V, - FLOAT LengthMin, + FXMVECTOR V, + FLOAT LengthMin, FLOAT LengthMax ) { @@ -10365,8 +10364,8 @@ XMFINLINE XMVECTOR XMVector4ClampLength XMFINLINE XMVECTOR XMVector4ClampLengthV ( - FXMVECTOR V, - FXMVECTOR LengthMin, + FXMVECTOR V, + FXMVECTOR LengthMin, FXMVECTOR LengthMax ) { @@ -10472,11 +10471,11 @@ XMFINLINE XMVECTOR XMVector4ClampLengthV XMFINLINE XMVECTOR XMVector4Reflect ( - FXMVECTOR Incident, + FXMVECTOR Incident, FXMVECTOR Normal ) { -#if defined(_XM_NO_INTRINSICS_) +#if defined(_XM_NO_INTRINSICS_) XMVECTOR Result; @@ -10502,8 +10501,8 @@ XMFINLINE XMVECTOR XMVector4Reflect XMFINLINE XMVECTOR XMVector4Refract ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FLOAT RefractionIndex ) { @@ -10524,8 +10523,8 @@ XMFINLINE XMVECTOR XMVector4Refract XMFINLINE XMVECTOR XMVector4RefractV ( - FXMVECTOR Incident, - FXMVECTOR Normal, + FXMVECTOR Incident, + FXMVECTOR Normal, FXMVECTOR RefractionIndex ) { @@ -10535,7 +10534,7 @@ XMFINLINE XMVECTOR XMVector4RefractV XMVECTOR R; CONST XMVECTOR Zero = XMVectorZero(); - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) IDotN = XMVector4Dot(Incident, Normal); @@ -10566,7 +10565,7 @@ XMFINLINE XMVECTOR XMVector4RefractV } #elif defined(_XM_SSE_INTRINSICS_) - // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + + // Result = RefractionIndex * Incident - Normal * (RefractionIndex * dot(Incident, Normal) + // sqrt(1 - RefractionIndex * RefractionIndex * (1 - dot(Incident, Normal) * dot(Incident, Normal)))) XMVECTOR IDotN = XMVector4Dot(Incident,Normal); @@ -10629,7 +10628,7 @@ XMFINLINE XMVECTOR XMVector4Orthogonal XMFINLINE XMVECTOR XMVector4AngleBetweenNormalsEst ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -10662,7 +10661,7 @@ XMFINLINE XMVECTOR XMVector4AngleBetweenNormalsEst XMFINLINE XMVECTOR XMVector4AngleBetweenNormals ( - FXMVECTOR N1, + FXMVECTOR N1, FXMVECTOR N2 ) { @@ -10695,7 +10694,7 @@ XMFINLINE XMVECTOR XMVector4AngleBetweenNormals XMFINLINE XMVECTOR XMVector4AngleBetweenVectors ( - FXMVECTOR V1, + FXMVECTOR V1, FXMVECTOR V2 ) { @@ -10749,7 +10748,7 @@ XMFINLINE XMVECTOR XMVector4AngleBetweenVectors XMFINLINE XMVECTOR XMVector4Transform ( - FXMVECTOR V, + FXMVECTOR V, CXMMATRIX M ) { @@ -10790,11 +10789,11 @@ XMFINLINE XMVECTOR XMVector4Transform XMINLINE XMFLOAT4* XMVector4TransformStream ( - XMFLOAT4* pOutputStream, - UINT OutputStride, - CONST XMFLOAT4* pInputStream, - UINT InputStride, - UINT VectorCount, + XMFLOAT4* pOutputStream, + UINT OutputStride, + CONST XMFLOAT4* pInputStream, + UINT InputStride, + UINT VectorCount, CXMMATRIX M ) { @@ -10832,7 +10831,7 @@ XMINLINE XMFLOAT4* XMVector4TransformStream XMStoreFloat4((XMFLOAT4*)pOutputVector, Result); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } @@ -10859,12 +10858,12 @@ XMINLINE XMFLOAT4* XMVector4TransformStream vTempz = _mm_mul_ps(vTempz,M.r[2]); vTempw = _mm_mul_ps(vTempw,M.r[3]); vTempx = _mm_add_ps(vTempx,vTempy); - vTempw = _mm_add_ps(vTempw,vTempz); + vTempw = _mm_add_ps(vTempw,vTempz); vTempw = _mm_add_ps(vTempw,vTempx); // Store the transformed vector _mm_storeu_ps(reinterpret_cast(pOutputVector),vTempw); - pInputVector += InputStride; + pInputVector += InputStride; pOutputVector += OutputStride; } return pOutputStream; diff --git a/gfx/include/userland/LICENCE b/gfx/include/userland/LICENCE index dea4c26015..3f3e5a3142 100644 --- a/gfx/include/userland/LICENCE +++ b/gfx/include/userland/LICENCE @@ -23,4 +23,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/gfx/include/userland/containers/asf/CMakeLists.txt b/gfx/include/userland/containers/asf/CMakeLists.txt index 2cd7ac2372..89288d9aca 100644 --- a/gfx/include/userland/containers/asf/CMakeLists.txt +++ b/gfx/include/userland/containers/asf/CMakeLists.txt @@ -16,4 +16,3 @@ add_library(writer_asf ${LIBRARY_TYPE} asf_writer.c) target_link_libraries(writer_asf containers) install(TARGETS writer_asf DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/asf/asf_writer.c b/gfx/include/userland/containers/asf/asf_writer.c index 60da7ce410..f5f5b2fe12 100644 --- a/gfx/include/userland/containers/asf/asf_writer.c +++ b/gfx/include/userland/containers/asf/asf_writer.c @@ -471,7 +471,7 @@ static VC_CONTAINER_STATUS_T asf_writer_add_track( VC_CONTAINER_T *p_ctx, VC_CON if(!(format->flags & VC_CONTAINER_ES_FORMAT_FLAG_FRAMED)) return VC_CONTAINER_ERROR_UNSUPPORTED_OPERATION; - + /* Allocate and initialise track data */ if(p_ctx->tracks_num >= ASF_TRACKS_MAX) return VC_CONTAINER_ERROR_OUT_OF_RESOURCES; p_ctx->tracks[p_ctx->tracks_num] = track = diff --git a/gfx/include/userland/containers/avi/CMakeLists.txt b/gfx/include/userland/containers/avi/CMakeLists.txt index f8589c1ba5..f6f4b7902e 100644 --- a/gfx/include/userland/containers/avi/CMakeLists.txt +++ b/gfx/include/userland/containers/avi/CMakeLists.txt @@ -16,4 +16,3 @@ add_library(writer_avi ${LIBRARY_TYPE} avi_writer.c) target_link_libraries(writer_avi containers) install(TARGETS writer_avi DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/avi/avi_reader.c b/gfx/include/userland/containers/avi/avi_reader.c index 4c4c3f4dc9..93f321e719 100644 --- a/gfx/include/userland/containers/avi/avi_reader.c +++ b/gfx/include/userland/containers/avi/avi_reader.c @@ -52,7 +52,7 @@ Defines. #define AVI_INDEX_OF_CHUNKS 0x01 #define AVI_INDEX_2FIELD 0x01 #define AVI_INDEX_DELTAFRAME 0x80000000 - + #define AVI_TRACKS_MAX 16 /*< We won't try to handle streams with more tracks than this */ #define AVI_TWOCC(a,b) ((a) | (b << 8)) @@ -68,7 +68,7 @@ Defines. SKIP_BYTES(ctx, size); \ AVI_SYNC_CHUNK(ctx); \ } while(0) - + /****************************************************************************** Type definitions ******************************************************************************/ @@ -101,23 +101,23 @@ typedef struct VC_CONTAINER_TRACK_MODULE_T int64_t time_start; /**< i.e. 'dwStart' in 'strh' (converted to microseconds) */ int64_t duration; /**< i.e. 'dwLength' in 'strh' (converted to microseconds) */ uint32_t time_num; /**< i.e. 'dwScale' in 'strh' */ - uint32_t time_den; /**< i.e. 'dwRate' in 'strh', time_num / time_den = + uint32_t time_den; /**< i.e. 'dwRate' in 'strh', time_num / time_den = samples (or frames) / second for audio (or video) */ uint32_t sample_size; /**< i.e. 'dwSampleSize' in 'strh' */ - uint64_t index_offset; /**< Offset to the start of an OpenDML index i.e. 'indx' + uint64_t index_offset; /**< Offset to the start of an OpenDML index i.e. 'indx' (if available) */ uint32_t index_size; /**< Size of the OpenDML index chunk */ AVI_TRACK_CHUNK_STATE_T chunk; } VC_CONTAINER_TRACK_MODULE_T; typedef struct VC_CONTAINER_MODULE_T -{ +{ VC_CONTAINER_TRACK_T *tracks[AVI_TRACKS_MAX]; - uint64_t data_offset; /**< Offset to the start of data packets i.e. + uint64_t data_offset; /**< Offset to the start of data packets i.e. the data in the 'movi' list */ uint64_t data_size; /**< Size of the chunk containing data packets */ - uint64_t index_offset; /**< Offset to the start of index data e.g. + uint64_t index_offset; /**< Offset to the start of index data e.g. the data in a 'idx1' list */ uint32_t index_size; /**< Size of the chunk containing index data */ AVI_TRACK_STREAM_STATE_T state; @@ -143,7 +143,7 @@ static VC_CONTAINER_STATUS_T avi_find_chunk(VC_CONTAINER_T *p_ctx, VC_CONTAINER_ chunk_size = READ_U32(p_ctx, "Chunk size"); if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - if(chunk_id == id) + if(chunk_id == id) { *size = chunk_size; return VC_CONTAINER_SUCCESS; @@ -161,13 +161,13 @@ static VC_CONTAINER_STATUS_T avi_find_list(VC_CONTAINER_T *p_ctx, VC_CONTAINER_F VC_CONTAINER_FOURCC_T chunk_id; uint32_t chunk_size; uint32_t peek_buf[1]; - + do { chunk_id = READ_FOURCC(p_ctx, "Chunk ID"); chunk_size = READ_U32(p_ctx, "Chunk size"); if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - if(chunk_id == VC_FOURCC('L','I','S','T')) + if(chunk_id == VC_FOURCC('L','I','S','T')) { if (PEEK_BYTES(p_ctx, (uint8_t*)peek_buf, 4) != 4) return VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; @@ -197,7 +197,7 @@ static int64_t avi_calculate_chunk_time(VC_CONTAINER_TRACK_MODULE_T *track_modul if (track_module->sample_size == 0) return track_module->time_start + avi_stream_ticks_to_us(track_module, track_module->chunk.index); else - return track_module->time_start + avi_stream_ticks_to_us(track_module, + return track_module->time_start + avi_stream_ticks_to_us(track_module, ((track_module->chunk.offs + (track_module->sample_size >> 1)) / track_module->sample_size)); } @@ -209,8 +209,8 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, uint32_t list_size, chunk_id, chunk_size; int stream_header_chunk_read = 0, stream_format_chunk_read = 0; - - /* Look for a 'strl' LIST (sub)chunk */ + + /* Look for a 'strl' LIST (sub)chunk */ status = avi_find_list(p_ctx, VC_FOURCC('s','t','r','l'), &chunk_size); if (status != VC_CONTAINER_SUCCESS) { @@ -235,14 +235,14 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, { VC_CONTAINER_FOURCC_T fourcc_type, fourcc_handler; uint32_t flags, scale, rate, div, start, length, sample_size; - + /* We won't accept more than one 'strh' per stream */ if (stream_header_chunk_read) { LOG_DEBUG(p_ctx, "rejecting invalid 'strl', found more than one 'strh'"); return VC_CONTAINER_ERROR_FORMAT_INVALID; } - + fourcc_type = READ_FOURCC(p_ctx, "fccType"); fourcc_handler = READ_FOURCC(p_ctx, "fccHandler"); flags = READ_U32(p_ctx, "dwFlags"); @@ -270,7 +270,7 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, } div = vc_container_maths_gcd((int64_t)scale, (int64_t)rate); - scale = scale / div; + scale = scale / div; rate = rate / div; track->format->flags |= VC_CONTAINER_ES_FORMAT_FLAG_FRAMED; @@ -279,7 +279,7 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, track->format->es_type = VC_CONTAINER_ES_TYPE_VIDEO; track->format->type->video.frame_rate_num = rate; track->format->type->video.frame_rate_den = scale; - + if (sample_size != 0) { LOG_DEBUG(p_ctx, "ignoring dwSampleSize (%d) for video stream", sample_size); @@ -294,32 +294,32 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, } else if(fourcc_type == VC_FOURCC('t','x','t','s')) track->format->es_type = VC_CONTAINER_ES_TYPE_SUBPICTURE; - - /* Don't overwrite any existing value (i.e. in the unlikely case where we + + /* Don't overwrite any existing value (i.e. in the unlikely case where we see 'strf' before 'strh') */ if(!track->format->codec) track->format->codec = vfw_fourcc_to_codec(fourcc_handler); - + /* FIXME: enable this once read_media does the right thing */ if (!(flags & AVISF_DISABLED) || 1) track->is_enabled = 1; - + track_module->time_num = scale; track_module->time_den = rate; track_module->time_start = avi_stream_ticks_to_us(track_module, (uint64_t)start); track_module->duration = avi_stream_ticks_to_us(track_module, (uint64_t)length); track_module->sample_size = sample_size; - + p_ctx->duration = MAX(p_ctx->duration, track_module->duration); - + stream_header_chunk_read = 1; } - else if(chunk_id == VC_FOURCC('s','t','r','f')) + else if(chunk_id == VC_FOURCC('s','t','r','f')) { uint8_t *buffer; unsigned extra_offset = 0, extra_size = 0; /* We won't accept more than one 'strf' per stream */ - if (stream_format_chunk_read) + if (stream_format_chunk_read) { LOG_DEBUG(p_ctx, "rejecting invalid 'strl', found more than one 'strf'"); return VC_CONTAINER_ERROR_FORMAT_INVALID; @@ -331,12 +331,12 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, LOG_DEBUG(p_ctx, "failed to allocate memory for 'strf' (%d bytes)", chunk_size); return status; } - + buffer = track->priv->extradata; - if(READ_BYTES(p_ctx, buffer, chunk_size) != chunk_size) + if(READ_BYTES(p_ctx, buffer, chunk_size) != chunk_size) return VC_CONTAINER_ERROR_FORMAT_INVALID; AVI_SYNC_CHUNK(p_ctx); - + if(track->format->es_type == VC_CONTAINER_ES_TYPE_VIDEO) { status = vc_container_bitmapinfoheader_to_es_format(buffer, chunk_size, &extra_offset, &extra_size, track->format); @@ -346,9 +346,9 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, status = vc_container_waveformatex_to_es_format(buffer, chunk_size, &extra_offset, &extra_size, track->format); if (track_module->sample_size != 0 && track_module->sample_size != track->format->type->audio.block_align) { - LOG_DEBUG(p_ctx, "invalid dwSampleSize (%d), should match nBlockAlign (%d) for audio streams.", + LOG_DEBUG(p_ctx, "invalid dwSampleSize (%d), should match nBlockAlign (%d) for audio streams.", track_module->sample_size, track->format->type->audio.block_align); - + /* Note that if nBlockAlign really is 0, strf is seriously broken... */ if (track->format->type->audio.block_align != 0) track_module->sample_size = track->format->type->audio.block_align; @@ -356,13 +356,13 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, else { /* Flawed muxers might only set nBlockAlign (i.e. not set dwSampleSize correctly). */ - if (track->format->type->audio.block_align == 1) + if (track->format->type->audio.block_align == 1) track_module->sample_size = 1; } } if (status != VC_CONTAINER_SUCCESS) return status; - + if (extra_size) { track->format->extradata = buffer + extra_offset; @@ -394,25 +394,25 @@ static VC_CONTAINER_STATUS_T avi_read_stream_header_list(VC_CONTAINER_T *p_ctx, } else if(chunk_id == VC_FOURCC('s','t','r','d')) { - /* The data in a 'strd' chunk is either codec configuration data or DRM information, - we can safely assume it might be either as long as we don't overwrite any config + /* The data in a 'strd' chunk is either codec configuration data or DRM information, + we can safely assume it might be either as long as we don't overwrite any config data read previously from a 'strf' chunk */ if ((status = vc_container_track_allocate_drmdata(p_ctx, track, chunk_size)) != VC_CONTAINER_SUCCESS) { LOG_DEBUG(p_ctx, "failed to allocate memory for 'strd' (%d bytes)", chunk_size); return status; } - - if(READ_BYTES(p_ctx, track->priv->drmdata, chunk_size) != chunk_size) + + if(READ_BYTES(p_ctx, track->priv->drmdata, chunk_size) != chunk_size) return VC_CONTAINER_ERROR_FORMAT_INVALID; AVI_SYNC_CHUNK(p_ctx); - + if (!track->format->extradata) { if (vc_container_track_allocate_extradata(p_ctx, track, chunk_size) == VC_CONTAINER_SUCCESS) { memcpy(track->format->extradata, track->priv->drmdata, chunk_size); - + track->format->extradata = track->priv->extradata; track->format->extradata_size = chunk_size; } @@ -461,7 +461,7 @@ static VC_CONTAINER_STATUS_T avi_find_next_data_chunk(VC_CONTAINER_T *p_ctx, uin break; /* Check if this is a 'rec ' or a 'movi' LIST instead of a plain data chunk */ - if(chunk_id == VC_FOURCC('L','I','S','T')) + if(chunk_id == VC_FOURCC('L','I','S','T')) { if (PEEK_BYTES(p_ctx, (uint8_t*)peek_buf, 4) != 4) return VC_CONTAINER_ERROR_EOS; @@ -516,7 +516,7 @@ static void avi_track_from_chunk_id(VC_CONTAINER_FOURCC_T chunk_id, uint16_t *da static VC_CONTAINER_STATUS_T avi_check_track(VC_CONTAINER_T *p_ctx, uint16_t data_type, uint16_t track_num) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; - + if (track_num < p_ctx->tracks_num) { if (data_type == AVI_TWOCC('w','b') && p_ctx->tracks[track_num]->format->es_type != VC_CONTAINER_ES_TYPE_AUDIO) @@ -542,26 +542,26 @@ static VC_CONTAINER_STATUS_T avi_check_track(VC_CONTAINER_T *p_ctx, uint16_t dat } else { - LOG_DEBUG(p_ctx, "invalid track number %d (no more than %d tracks expected)", + LOG_DEBUG(p_ctx, "invalid track number %d (no more than %d tracks expected)", track_num, p_ctx->tracks_num); - status = VC_CONTAINER_ERROR_FAILED; + status = VC_CONTAINER_ERROR_FAILED; } - + return status; } -static int avi_compare_seek_time(int64_t chunk_time, int64_t seek_time, +static int avi_compare_seek_time(int64_t chunk_time, int64_t seek_time, int chunk_is_keyframe, VC_CONTAINER_SEEK_FLAGS_T seek_flags) { if (chunk_time == seek_time && chunk_is_keyframe && !(seek_flags & VC_CONTAINER_SEEK_FLAG_FORWARD)) return 0; - + if (chunk_time > seek_time && chunk_is_keyframe && (seek_flags & VC_CONTAINER_SEEK_FLAG_FORWARD)) return 0; if (chunk_time > seek_time && !(seek_flags & VC_CONTAINER_SEEK_FLAG_FORWARD)) return 1; /* Chunk time is past seek time, caller should use the previous keyframe */ - + return -1; } @@ -594,8 +594,8 @@ static VC_CONTAINER_STATUS_T avi_scan_legacy_index_chunk(VC_CONTAINER_T *p_ctx, size = READ_U32(p_ctx, "dwSize"); if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) break; - - /* Although it's rare, the offsets might be given from the start of the file + + /* Although it's rare, the offsets might be given from the start of the file instead of the data chunk, we have to handle both cases. */ if (first_chunk_offset) { @@ -603,10 +603,10 @@ static VC_CONTAINER_STATUS_T avi_scan_legacy_index_chunk(VC_CONTAINER_T *p_ctx, selected_chunk_offset = base_offset + 4; first_chunk_offset = 0; } - + avi_track_from_chunk_id(chunk_id, &data_type, &track_num); LOG_DEBUG(p_ctx, "reading track %"PRIu16, track_num); - + if (avi_check_track(p_ctx, data_type, track_num) != VC_CONTAINER_SUCCESS) { LOG_DEBUG(p_ctx, "skipping index entry for track %d/%d", track_num, p_ctx->tracks_num); @@ -625,14 +625,14 @@ static VC_CONTAINER_STATUS_T avi_scan_legacy_index_chunk(VC_CONTAINER_T *p_ctx, /* If this entry does not affect timing, skip it */ if ((chunk_flags & (AVIIF_LIST | AVIIF_NOTIME)) || data_type == AVI_TWOCC('d','d')) continue; - + position = base_offset + offset + extra_offset; extra_offset = INT64_C(0); /* Check validity of position */ if (position <= module->data_offset /* || (*pos > module->data_offset + module->data_size*/) return VC_CONTAINER_ERROR_FORMAT_INVALID; - + if (track_num == seek_track_num) { bool is_keyframe = true; @@ -685,12 +685,12 @@ static VC_CONTAINER_STATUS_T avi_scan_legacy_index_chunk(VC_CONTAINER_T *p_ctx, return VC_CONTAINER_ERROR_NOT_FOUND; } -static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx, uint64_t index_offset, - unsigned seek_track_num, int64_t *time, VC_CONTAINER_SEEK_FLAGS_T flags, uint64_t *pos) +static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx, uint64_t index_offset, + unsigned seek_track_num, int64_t *time, VC_CONTAINER_SEEK_FLAGS_T flags, uint64_t *pos) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_ERROR_NOT_FOUND; VC_CONTAINER_TRACK_MODULE_T *track_module = NULL; - VC_CONTAINER_FOURCC_T chunk_id; + VC_CONTAINER_FOURCC_T chunk_id; uint32_t chunk_size; uint16_t data_type, track_num; uint8_t index_type, index_sub_type; @@ -717,7 +717,7 @@ static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - avi_track_from_chunk_id(chunk_id, &data_type, &track_num); + avi_track_from_chunk_id(chunk_id, &data_type, &track_num); status = avi_check_track(p_ctx, data_type, track_num); if (status || chunk_size < 24 || track_num != seek_track_num) return VC_CONTAINER_ERROR_FORMAT_INVALID; @@ -733,16 +733,16 @@ static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx { uint32_t chunk_offset; int key_frame = 0; - + chunk_offset = READ_U32(p_ctx, "dwOffset"); chunk_size = READ_U32(p_ctx, "dwSize"); - + if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) break; status = VC_CONTAINER_ERROR_NOT_FOUND; - if (!(chunk_size & AVI_INDEX_DELTAFRAME)) + if (!(chunk_size & AVI_INDEX_DELTAFRAME)) key_frame = 1; chunk_size &= ~AVI_INDEX_DELTAFRAME; @@ -777,7 +777,7 @@ static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx } break; } - + if (key_frame) { prev_keyframe_offs = position; @@ -787,7 +787,7 @@ static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx else { /* Not seeking to a time position, but scanning - track chunk state up to a certain file position + track chunk state up to a certain file position instead */ if (position >= *pos) { @@ -804,7 +804,7 @@ static VC_CONTAINER_STATUS_T avi_scan_standard_index_chunk(VC_CONTAINER_T *p_ctx return status; } -static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, unsigned index_track_num, +static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, unsigned index_track_num, int64_t *time, VC_CONTAINER_SEEK_FLAGS_T flags, uint64_t *pos) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_ERROR_NOT_FOUND; @@ -813,14 +813,14 @@ static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, u uint32_t index_size; uint16_t data_type, track_num; uint32_t entry, entry_count; - uint16_t entry_size; + uint16_t entry_size; uint8_t index_sub_type, index_type; - + index_offset = p_ctx->tracks[index_track_num]->priv->module->index_offset; index_size = p_ctx->tracks[index_track_num]->priv->module->index_size; - + SEEK(p_ctx, index_offset); - + entry_size = READ_U16(p_ctx, "wLongsPerEntry"); index_sub_type = READ_U8(p_ctx, "bIndexSubType"); index_type = READ_U8(p_ctx, "bIndexType"); @@ -832,17 +832,17 @@ static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, u if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - + if (index_type == AVI_INDEX_OF_INDEXES) { avi_track_from_chunk_id(chunk_id, &data_type, &track_num); status = avi_check_track(p_ctx, data_type, track_num); if (status || index_size < 24 || track_num != index_track_num) return VC_CONTAINER_ERROR_FORMAT_INVALID; - + /* FIXME: We should probably support AVI_INDEX_2FIELD as well */ if (entry_size != 4 || index_sub_type != 0) return VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; - + entry_count = MIN(entry_count, (index_size - 24) / entry_size); for (entry = 0; entry < entry_count; ++entry) @@ -851,9 +851,9 @@ static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, u standard_index_offset = READ_U64(p_ctx, "qwOffset"); SKIP_U32(p_ctx, "dwSize"); SKIP_U32(p_ctx, "dwDuration"); - - if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) - break; + + if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) + break; if (standard_index_offset == UINT64_C(0)) { @@ -876,7 +876,7 @@ static VC_CONTAINER_STATUS_T avi_scan_super_index_chunk(VC_CONTAINER_T *p_ctx, u { status = VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; } - + return status; } @@ -938,7 +938,7 @@ static VC_CONTAINER_STATUS_T avi_reader_read( VC_CONTAINER_T *p_ctx, VC_CONTAINER_FOURCC_T chunk_id; uint32_t chunk_size; uint16_t data_type, track_num; - + if ((status = avi_find_next_data_chunk(p_ctx, &chunk_id, &chunk_size)) != VC_CONTAINER_SUCCESS) { LOG_DEBUG(p_ctx, "unable to find the next data chunk %d", status); @@ -1071,7 +1071,7 @@ static VC_CONTAINER_STATUS_T avi_reader_read( VC_CONTAINER_T *p_ctx, if (track_module->sample_size == 0) p_packet->flags |= VC_CONTAINER_PACKET_FLAG_FRAME_END; } - + p_packet->dts = VC_CONTAINER_TIME_UNKNOWN; } @@ -1091,14 +1091,14 @@ static VC_CONTAINER_STATUS_T avi_reader_read( VC_CONTAINER_T *p_ctx, return VC_CONTAINER_SUCCESS; } - + if (p_packet) { uint8_t *data = p_packet->data; uint32_t buffer_size = p_packet->buffer_size; uint32_t size = 0; - uint32_t len; - + uint32_t len; + /* See if we need to insert extra data */ if (p_state->extra_chunk_data_len) { @@ -1155,7 +1155,7 @@ static VC_CONTAINER_STATUS_T avi_reader_seek( VC_CONTAINER_T *p_ctx, int64_t *p_ LOG_DEBUG(p_ctx, "AVI seeking to %"PRIi64"us", *p_offset); - /* Save current position and chunk state so we can restore it if we + /* Save current position and chunk state so we can restore it if we hit an error whilst scanning index data */ position = STREAM_POSITION(p_ctx); for(i = 0; i < p_ctx->tracks_num; i++) @@ -1315,7 +1315,7 @@ error: /*****************************************************************************/ static VC_CONTAINER_STATUS_T avi_reader_close( VC_CONTAINER_T *p_ctx ) { - VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; + VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; unsigned int i; for(i = 0; i < p_ctx->tracks_num; i++) @@ -1323,7 +1323,7 @@ static VC_CONTAINER_STATUS_T avi_reader_close( VC_CONTAINER_T *p_ctx ) p_ctx->tracks = NULL; p_ctx->tracks_num = 0; free(module); - p_ctx->priv->module = 0; + p_ctx->priv->module = 0; return VC_CONTAINER_SUCCESS; } @@ -1353,7 +1353,7 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) SKIP_U32(p_ctx, "fileSize"); SKIP_FOURCC(p_ctx, "fileType"); - /* Look for the 'hdrl' LIST (sub)chunk */ + /* Look for the 'hdrl' LIST (sub)chunk */ status = avi_find_list(p_ctx, VC_FOURCC('h','d','r','l'), &chunk_size); if (status != VC_CONTAINER_SUCCESS) { @@ -1392,7 +1392,7 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) /* Allocate our context and tracks */ if ((module = malloc(sizeof(*module))) == NULL) - return VC_CONTAINER_ERROR_OUT_OF_MEMORY; + return VC_CONTAINER_ERROR_OUT_OF_MEMORY; memset(module, 0, sizeof(*module)); p_ctx->priv->module = module; p_ctx->tracks = module->tracks; @@ -1400,7 +1400,7 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) if (num_streams > AVI_TRACKS_MAX) { LOG_DEBUG(p_ctx, "cannot handle %u tracks, restricted to %d", num_streams, AVI_TRACKS_MAX); - num_streams = AVI_TRACKS_MAX; + num_streams = AVI_TRACKS_MAX; } for (p_ctx->tracks_num = 0; p_ctx->tracks_num != num_streams; p_ctx->tracks_num++) @@ -1426,7 +1426,7 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) status = VC_CONTAINER_ERROR_FORMAT_INVALID; goto error; } - + /* Store offset to the start and size of data (the 'movi' LIST) */ module->data_offset = STREAM_POSITION(p_ctx); module->data_size = chunk_size; @@ -1440,11 +1440,11 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) LOG_DEBUG(p_ctx, "AVIF_MUSTUSEINDEX not supported, playback might not work properly"); } - /* If the stream is seekable, see if we can find an index (for at - least one of the tracks); even if we cannot find an index now, + /* If the stream is seekable, see if we can find an index (for at + least one of the tracks); even if we cannot find an index now, one might become available later (e.g. when the stream grows - run-time), in that case we might want to report that we can seek - and re-search for the index again if or when we're requested to + run-time), in that case we might want to report that we can seek + and re-search for the index again if or when we're requested to seek. */ if(STREAM_SEEKABLE(p_ctx)) { @@ -1475,7 +1475,7 @@ VC_CONTAINER_STATUS_T avi_reader_open( VC_CONTAINER_T *p_ctx ) p_ctx->capabilities |= VC_CONTAINER_CAPS_HAS_INDEX; p_ctx->capabilities |= VC_CONTAINER_CAPS_DATA_HAS_KEYFRAME_FLAG; } - + /* Seek back to the start of the data */ SEEK(p_ctx, module->data_offset); } diff --git a/gfx/include/userland/containers/avi/avi_writer.c b/gfx/include/userland/containers/avi/avi_writer.c index 589ee13ec7..a849259e2f 100644 --- a/gfx/include/userland/containers/avi/avi_writer.c +++ b/gfx/include/userland/containers/avi/avi_writer.c @@ -48,7 +48,7 @@ VC_CONTAINER_STATUS_T avi_writer_open( VC_CONTAINER_T *p_ctx ); Defines. ******************************************************************************/ #define AVISF_DISABLED 0x00000001 /*< If set stream should not be enabled by default. */ -#define AVIF_HASINDEX 0x00000010 +#define AVIF_HASINDEX 0x00000010 #define AVIF_TRUSTCKTYPE 0x00000800 #define AVIIF_KEYFRAME 0x00000010 @@ -80,11 +80,11 @@ Type definitions. typedef struct VC_CONTAINER_TRACK_MODULE_T { uint32_t chunk_index; /**< index of current chunk */ - uint32_t chunk_offs; /**< current offset into bytestream consisting of all + uint32_t chunk_offs; /**< current offset into bytestream consisting of all chunks for this track */ uint32_t sample_size; /**< i.e. 'dwSampleSize' in 'strh' */ uint32_t max_chunk_size; /**< largest chunk written so far */ - uint64_t index_offset; /**< Offset to the start of an OpenDML index for this track + uint64_t index_offset; /**< Offset to the start of an OpenDML index for this track i.e. 'indx' */ uint32_t index_size; /**< Size of the OpenDML index for this track i.e. 'indx' */ } VC_CONTAINER_TRACK_MODULE_T; @@ -98,11 +98,11 @@ typedef struct VC_CONTAINER_MODULE_T uint32_t header_list_offset; /**< Offset to the header list chunk ('hdrl') */ uint32_t header_list_size; /**< Size of the header list chunk ('hdrl') */ - uint32_t data_offset; /**< Offset to the start of data packets i.e. + uint32_t data_offset; /**< Offset to the start of data packets i.e. the data in the AVI RIFF 'movi' list */ uint64_t data_size; /**< Size of the chunk containing data packets */ - uint32_t index_offset; /**< Offset to the start of index data e.g. - the data in an 'idx1' list */ + uint32_t index_offset; /**< Offset to the start of index data e.g. + the data in an 'idx1' list */ unsigned current_track_num; /**< Number of track currently being written */ uint32_t chunk_size; /**< Final size of the current chunk being written (if known) */ uint32_t chunk_data_written; /**< Data written to the current chunk so far */ @@ -115,7 +115,7 @@ typedef struct VC_CONTAINER_MODULE_T /****************************************************************************** Local Functions ******************************************************************************/ -static void avi_chunk_id_from_track_num( VC_CONTAINER_T *p_ctx, +static void avi_chunk_id_from_track_num( VC_CONTAINER_T *p_ctx, VC_CONTAINER_FOURCC_T *p_chunk_id, unsigned int track_num ) { VC_CONTAINER_TRACK_T *track = p_ctx->tracks[track_num]; @@ -128,7 +128,7 @@ static void avi_chunk_id_from_track_num( VC_CONTAINER_T *p_ctx, chunk_id = VC_FOURCC('0','0','w','b'); else { - /* Note that avi_writer_add_track should ensure this + /* Note that avi_writer_add_track should ensure this can't happen */ *p_chunk_id = VC_FOURCC('J','U','N','K'); return; } @@ -140,7 +140,7 @@ static void avi_chunk_id_from_track_num( VC_CONTAINER_T *p_ctx, } /*****************************************************************************/ -static void avi_index_chunk_id_from_track_num(VC_CONTAINER_FOURCC_T *p_chunk_id, +static void avi_index_chunk_id_from_track_num(VC_CONTAINER_FOURCC_T *p_chunk_id, unsigned int track_num ) { VC_CONTAINER_FOURCC_T chunk_id = 0; @@ -169,7 +169,7 @@ static uint32_t avi_num_chunks( VC_CONTAINER_T *p_ctx ) static VC_CONTAINER_STATUS_T avi_finish_data_chunk( VC_CONTAINER_T *p_ctx, uint32_t chunk_size ) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; - + if (chunk_size) { /* Rewrite the chunk size, this won't be efficient if it happens often */ @@ -185,7 +185,7 @@ static VC_CONTAINER_STATUS_T avi_finish_data_chunk( VC_CONTAINER_T *p_ctx, uint3 status = VC_CONTAINER_ERROR_FAILED; } } - + AVI_END_CHUNK(p_ctx); if (status != VC_CONTAINER_SUCCESS) status = STREAM_STATUS(p_ctx); @@ -194,7 +194,7 @@ static VC_CONTAINER_STATUS_T avi_finish_data_chunk( VC_CONTAINER_T *p_ctx, uint3 } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T avi_write_index_entry( VC_CONTAINER_T *p_ctx, uint8_t track_num, +static VC_CONTAINER_STATUS_T avi_write_index_entry( VC_CONTAINER_T *p_ctx, uint8_t track_num, uint32_t chunk_size, int keyframe ) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; @@ -219,13 +219,13 @@ static VC_CONTAINER_STATUS_T avi_read_index_entry( VC_CONTAINER_T *p_ctx, VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; uint32_t chunk_size; uint8_t track_num; - + track_num = vc_container_io_read_uint8(module->temp_io.io); chunk_size = vc_container_io_read_be_uint32(module->temp_io.io); /* This shouldn't really happen if the temporary I/O is reliable */ if (track_num >= p_ctx->tracks_num) return VC_CONTAINER_ERROR_FAILED; - + *p_track_num = track_num; *p_chunk_size = chunk_size; @@ -233,16 +233,16 @@ static VC_CONTAINER_STATUS_T avi_read_index_entry( VC_CONTAINER_T *p_ctx, } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T avi_write_stream_format_chunk(VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T avi_write_stream_format_chunk(VC_CONTAINER_T *p_ctx, VC_CONTAINER_TRACK_T *track, uint32_t chunk_size) { VC_CONTAINER_STATUS_T status; - + WRITE_FOURCC(p_ctx, VC_FOURCC('s','t','r','f'), "Chunk ID"); WRITE_U32(p_ctx, chunk_size, "Chunk Size"); - + if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - + if(track->format->es_type == VC_CONTAINER_ES_TYPE_VIDEO) status = vc_container_write_bitmapinfoheader(p_ctx, track->format); else if(track->format->es_type == VC_CONTAINER_ES_TYPE_AUDIO) @@ -251,19 +251,19 @@ static VC_CONTAINER_STATUS_T avi_write_stream_format_chunk(VC_CONTAINER_T *p_ctx if (status != VC_CONTAINER_SUCCESS) return status; AVI_END_CHUNK(p_ctx); - + return STREAM_STATUS(p_ctx); } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T avi_write_stream_header_chunk(VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T avi_write_stream_header_chunk(VC_CONTAINER_T *p_ctx, VC_CONTAINER_TRACK_T *track) { VC_CONTAINER_FOURCC_T fourcc_type = 0, fourcc_handler = 0; uint32_t flags, scale = 0, rate = 0, div, start = 0, sample_size = 0; uint16_t left = 0, right = 0, top = 0, bottom = 0; uint32_t max_chunk_size, length = 0; - + WRITE_FOURCC(p_ctx, VC_FOURCC('s','t','r','h'), "Chunk ID"); WRITE_U32(p_ctx, 56, "Chunk Size"); @@ -296,13 +296,13 @@ static VC_CONTAINER_STATUS_T avi_write_stream_header_chunk(VC_CONTAINER_T *p_ctx sample_size = track->format->type->audio.block_align; scale = 1; - if (track->format->type->audio.block_align) + if (track->format->type->audio.block_align) rate = (track->format->bitrate / track->format->type->audio.block_align) >> 3; if (rate == 0) { rate = track->format->type->audio.sample_rate ? track->format->type->audio.sample_rate : 32000; - LOG_DEBUG(p_ctx, "invalid audio rate, using %d (playback timing will almost certainly be incorrect)", + LOG_DEBUG(p_ctx, "invalid audio rate, using %d (playback timing will almost certainly be incorrect)", rate); } } @@ -311,7 +311,7 @@ static VC_CONTAINER_STATUS_T avi_write_stream_header_chunk(VC_CONTAINER_T *p_ctx /* avi_writer_add_track should ensure this can't happen */ vc_container_assert(0); } - + fourcc_handler = codec_to_vfw_fourcc(track->format->codec); div = vc_container_maths_gcd((int64_t)scale, (int64_t)rate); @@ -339,7 +339,7 @@ static VC_CONTAINER_STATUS_T avi_write_stream_header_chunk(VC_CONTAINER_T *p_ctx WRITE_U16(p_ctx, top, "rcFrame.top"); WRITE_U16(p_ctx, right, "rcFrame.right"); WRITE_U16(p_ctx, bottom, "rcFrame.bottom"); - + return STREAM_STATUS(p_ctx); } @@ -349,7 +349,7 @@ static VC_CONTAINER_STATUS_T avi_write_super_index_chunk(VC_CONTAINER_T *p_ctx, { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; VC_CONTAINER_TRACK_MODULE_T *track_module = p_ctx->tracks[index_track_num]->priv->module; - VC_CONTAINER_FOURCC_T chunk_id; + VC_CONTAINER_FOURCC_T chunk_id; uint32_t num_indices = 1; /* FIXME: support for multiple RIFF chunks (AVIX) */ unsigned int i; @@ -359,15 +359,15 @@ static VC_CONTAINER_STATUS_T avi_write_super_index_chunk(VC_CONTAINER_T *p_ctx, WRITE_BYTES(p_ctx, NULL, 8 + 24 + num_indices * (int64_t)AVI_SUPER_INDEX_ENTRY_SIZE); return STREAM_STATUS(p_ctx); } - + if (track_module->index_offset) WRITE_FOURCC(p_ctx, VC_FOURCC('i','n','d','x'), "Chunk ID"); else WRITE_FOURCC(p_ctx, VC_FOURCC('J','U','N','K'), "Chunk ID"); - + WRITE_U32(p_ctx, index_size, "Chunk Size"); - - avi_chunk_id_from_track_num(p_ctx, &chunk_id, index_track_num); + + avi_chunk_id_from_track_num(p_ctx, &chunk_id, index_track_num); WRITE_U16(p_ctx, 4, "wLongsPerEntry"); WRITE_U8(p_ctx, 0, "bIndexSubType"); WRITE_U8(p_ctx, AVI_INDEX_OF_INDEXES, "bIndexType"); @@ -376,12 +376,12 @@ static VC_CONTAINER_STATUS_T avi_write_super_index_chunk(VC_CONTAINER_T *p_ctx, WRITE_U32(p_ctx, 0, "dwReserved0"); WRITE_U32(p_ctx, 0, "dwReserved1"); WRITE_U32(p_ctx, 0, "dwReserved2"); - + for (i = 0; i < num_indices; ++i) - { + { uint64_t index_offset = track_module->index_offset; - uint32_t chunk_size = track_module->index_size; - uint32_t length = track_module->sample_size ? + uint32_t chunk_size = track_module->index_size; + uint32_t length = track_module->sample_size ? track_module->chunk_offs : track_module->chunk_index; WRITE_U64(p_ctx, index_offset, "qwOffset"); WRITE_U32(p_ctx, chunk_size, "dwSize"); @@ -394,7 +394,7 @@ static VC_CONTAINER_STATUS_T avi_write_super_index_chunk(VC_CONTAINER_T *p_ctx, } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T avi_write_stream_header_list(VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T avi_write_stream_header_list(VC_CONTAINER_T *p_ctx, unsigned int track_num, uint32_t list_size) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; @@ -419,7 +419,7 @@ static VC_CONTAINER_STATUS_T avi_write_stream_header_list(VC_CONTAINER_T *p_ctx, chunk_size = STREAM_POSITION(p_ctx) - 8; } vc_container_writer_extraio_disable(p_ctx, &module->null_io); - + status = avi_write_stream_format_chunk(p_ctx, track, chunk_size); if (status != VC_CONTAINER_SUCCESS) return status; @@ -441,10 +441,10 @@ static VC_CONTAINER_STATUS_T avi_write_stream_header_list(VC_CONTAINER_T *p_ctx, chunk_size = STREAM_POSITION(p_ctx) - 8; } vc_container_writer_extraio_disable(p_ctx, &module->null_io); - + status = avi_write_super_index_chunk(p_ctx, track_num, chunk_size); if (status != VC_CONTAINER_SUCCESS) return status; - + AVI_END_CHUNK(p_ctx); return STREAM_STATUS(p_ctx); @@ -468,7 +468,7 @@ static VC_CONTAINER_STATUS_T avi_write_avi_header_chunk(VC_CONTAINER_T *p_ctx) width = track->format->type->video.width; height = track->format->type->video.height; if (track->format->type->video.frame_rate_num) - frame_interval = track->format->type->video.frame_rate_den * UINT64_C(1000000) / + frame_interval = track->format->type->video.frame_rate_den * UINT64_C(1000000) / track->format->type->video.frame_rate_num; num_chunks = track_module->chunk_index; max_video_chunk_size = track_module->max_chunk_size; @@ -476,7 +476,7 @@ static VC_CONTAINER_STATUS_T avi_write_avi_header_chunk(VC_CONTAINER_T *p_ctx) } } - flags = (module->index_offset && module->index_status == VC_CONTAINER_SUCCESS) ? + flags = (module->index_offset && module->index_status == VC_CONTAINER_SUCCESS) ? (AVIF_HASINDEX | AVIF_TRUSTCKTYPE) : 0; WRITE_FOURCC(p_ctx, VC_FOURCC('a','v','i','h'), "Chunk ID"); @@ -505,7 +505,7 @@ static VC_CONTAINER_STATUS_T avi_write_header_list( VC_CONTAINER_T *p_ctx, uint3 VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; VC_CONTAINER_STATUS_T status; unsigned int i; - + WRITE_FOURCC(p_ctx, VC_FOURCC('L','I','S','T'), "Chunk ID"); WRITE_U32(p_ctx, header_list_size, "LIST Size"); WRITE_FOURCC(p_ctx, VC_FOURCC('h','d','r','l'), "Chunk ID"); @@ -518,7 +518,7 @@ static VC_CONTAINER_STATUS_T avi_write_header_list( VC_CONTAINER_T *p_ctx, uint3 for (i = 0; i < p_ctx->tracks_num; i++) { uint32_t list_size = 0; - + /* Write a stream header list chunk ('strl') */ if(!vc_container_writer_extraio_enable(p_ctx, &module->null_io)) { @@ -527,7 +527,7 @@ static VC_CONTAINER_STATUS_T avi_write_header_list( VC_CONTAINER_T *p_ctx, uint3 list_size = STREAM_POSITION(p_ctx) - 8; } vc_container_writer_extraio_disable(p_ctx, &module->null_io); - + status = avi_write_stream_header_list(p_ctx, i, list_size); if (status != VC_CONTAINER_SUCCESS) return status; } @@ -558,7 +558,7 @@ static VC_CONTAINER_STATUS_T avi_write_headers( VC_CONTAINER_T *p_ctx ) module->header_list_offset = header_list_offset; module->header_list_size = header_list_size; } - + return status; } @@ -574,40 +574,40 @@ static VC_CONTAINER_STATUS_T avi_write_legacy_index_chunk( VC_CONTAINER_T *p_ctx if(module->null_io.refcount) { - /* Assume that we're not actually writing the data, + /* Assume that we're not actually writing the data, just want know the index size */ WRITE_BYTES(p_ctx, NULL, 8 + avi_num_chunks(p_ctx) * (int64_t)AVI_INDEX_ENTRY_SIZE); return STREAM_STATUS(p_ctx); } - + module->index_offset = STREAM_POSITION(p_ctx); - + WRITE_FOURCC(p_ctx, VC_FOURCC('i','d','x','1'), "Chunk ID"); WRITE_U32(p_ctx, index_size, "Chunk Size"); /* Scan through all written entries, convert to appropriate index format */ vc_container_io_seek(module->temp_io.io, INT64_C(0)); - + while((status = STREAM_STATUS(p_ctx)) == VC_CONTAINER_SUCCESS) - { + { VC_CONTAINER_FOURCC_T chunk_id; uint32_t chunk_size, flags; - + status = avi_read_index_entry(p_ctx, &track_num, &chunk_size); if (status != VC_CONTAINER_SUCCESS) break; avi_chunk_id_from_track_num(p_ctx, &chunk_id, track_num); flags = (chunk_size & AVI_INDEX_DELTAFRAME) ? 0 : AVIIF_KEYFRAME; chunk_size &= ~AVI_INDEX_DELTAFRAME; - + WRITE_FOURCC(p_ctx, chunk_id, "Chunk ID"); WRITE_U32(p_ctx, flags, "dwFlags"); WRITE_U32(p_ctx, chunk_offset, "dwOffset"); WRITE_U32(p_ctx, chunk_size, "dwSize"); - + chunk_offset += ((chunk_size + 1) & ~1) + 8; } - + AVI_END_CHUNK(p_ctx); /* Note that currently, we might write a partial index but still set AVIF_HASINDEX */ @@ -617,13 +617,13 @@ static VC_CONTAINER_STATUS_T avi_write_legacy_index_chunk( VC_CONTAINER_T *p_ctx } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T avi_write_standard_index_chunk( VC_CONTAINER_T *p_ctx, unsigned int index_track_num, +static VC_CONTAINER_STATUS_T avi_write_standard_index_chunk( VC_CONTAINER_T *p_ctx, unsigned int index_track_num, uint32_t index_size ) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; VC_CONTAINER_TRACK_MODULE_T *track_module = p_ctx->tracks[index_track_num]->priv->module; VC_CONTAINER_STATUS_T status; - VC_CONTAINER_FOURCC_T chunk_id; + VC_CONTAINER_FOURCC_T chunk_id; int64_t base_offset = module->data_offset + 12; uint32_t num_chunks = track_module->chunk_index; uint32_t chunk_offset = 4; @@ -655,23 +655,23 @@ static VC_CONTAINER_STATUS_T avi_write_standard_index_chunk( VC_CONTAINER_T *p_c /* Scan through all written entries, convert to appropriate index format */ vc_container_io_seek(module->temp_io.io, INT64_C(0)); - + while(STREAM_STATUS(p_ctx) == VC_CONTAINER_SUCCESS) - { + { uint32_t chunk_size; unsigned int track_num; - + status = avi_read_index_entry(p_ctx, &track_num, &chunk_size); if (status != VC_CONTAINER_SUCCESS) break; - + if(track_num != index_track_num) continue; - + WRITE_U32(p_ctx, chunk_offset, "dwOffset"); WRITE_U32(p_ctx, chunk_size, "dwSize"); chunk_offset += ((chunk_size + 1) & ~(1 | AVI_INDEX_DELTAFRAME)) + 12; } - + AVI_END_CHUNK(p_ctx); return STREAM_STATUS(p_ctx); @@ -681,7 +681,7 @@ static VC_CONTAINER_STATUS_T avi_write_standard_index_chunk( VC_CONTAINER_T *p_c static VC_CONTAINER_STATUS_T avi_write_legacy_index_data( VC_CONTAINER_T *p_ctx ) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; - VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; + VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; uint32_t chunk_size = 0; /* Write the legacy index chunk ('idx1') */ @@ -693,7 +693,7 @@ static VC_CONTAINER_STATUS_T avi_write_legacy_index_data( VC_CONTAINER_T *p_ctx } vc_container_writer_extraio_disable(p_ctx, &module->null_io); - status = avi_write_legacy_index_chunk(p_ctx, chunk_size); + status = avi_write_legacy_index_chunk(p_ctx, chunk_size); return status; } @@ -715,16 +715,16 @@ static VC_CONTAINER_STATUS_T avi_write_standard_index_data( VC_CONTAINER_T *p_ct chunk_size = STREAM_POSITION(p_ctx) - 8; } vc_container_writer_extraio_disable(p_ctx, &module->null_io); - + status = avi_write_standard_index_chunk(p_ctx, i, chunk_size); if (status != VC_CONTAINER_SUCCESS) return status; } - + return status; } /*****************************************************************************/ -static int64_t avi_calculate_file_size( VC_CONTAINER_T *p_ctx, +static int64_t avi_calculate_file_size( VC_CONTAINER_T *p_ctx, VC_CONTAINER_PACKET_T *p_packet ) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; @@ -736,7 +736,7 @@ static int64_t avi_calculate_file_size( VC_CONTAINER_T *p_ctx, filesize = STREAM_POSITION(p_ctx); refcount = vc_container_writer_extraio_enable(p_ctx, &module->null_io); - vc_container_assert(refcount == 0); /* Although perfectly harmless, we should + vc_container_assert(refcount == 0); /* Although perfectly harmless, we should not be called with the null i/o enabled. */ VC_CONTAINER_PARAM_UNUSED(refcount); @@ -745,18 +745,18 @@ static int64_t avi_calculate_file_size( VC_CONTAINER_T *p_ctx, we can use that here to avoid writing a partial final packet */ WRITE_BYTES(p_ctx, NULL, p_packet->frame_size ? p_packet->frame_size : p_packet->size); AVI_END_CHUNK(p_ctx); - + /* Index entries for the chunk */ WRITE_BYTES(p_ctx, NULL, AVI_INDEX_ENTRY_SIZE + AVI_STD_INDEX_ENTRY_SIZE); - + /* Current standard index data */ if (avi_write_standard_index_data(p_ctx) != VC_CONTAINER_SUCCESS) break; - + /* Current legacy index data */ status = avi_write_legacy_index_data(p_ctx); if (status != VC_CONTAINER_SUCCESS) break; } while(0); - + filesize += STREAM_POSITION(p_ctx); vc_container_writer_extraio_disable(p_ctx, &module->null_io); @@ -767,7 +767,7 @@ static int64_t avi_calculate_file_size( VC_CONTAINER_T *p_ctx, /***************************************************************************** Functions exported as part of the Container Module API *****************************************************************************/ - + static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, VC_CONTAINER_PACKET_T *p_packet ) { @@ -795,8 +795,8 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; } - /* If the container is passing in a frame from a new track but we - arent't finished with a chunk from another track we need to finish + /* If the container is passing in a frame from a new track but we + arent't finished with a chunk from another track we need to finish that chunk first */ if (module->chunk_data_written && p_packet->track != module->current_track_num) { @@ -821,7 +821,7 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, /* FIXME: are we expected to handle this case or should it be picked up by the above layer? */ vc_container_assert(!(module->chunk_data_written && (p_packet->flags & VC_CONTAINER_PACKET_FLAG_FRAME_START))); - + track = p_ctx->tracks[p_packet->track]; track_module = p_ctx->tracks[p_packet->track]->priv->module; module->current_track_num = p_packet->track; @@ -860,10 +860,10 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, return VC_CONTAINER_ERROR_OUT_OF_RESOURCES; module->frame_packet = *p_packet; module->frame_packet.data = module->avi_frame_buffer; - memcpy(module->frame_packet.data, + memcpy(module->frame_packet.data, p_packet->data, module->frame_packet.size); } - + module->chunk_data_written = p_packet->size; } else @@ -874,7 +874,7 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, { if(module->frame_packet.size + p_packet->size > AVI_FRAME_BUFFER_SIZE) return VC_CONTAINER_ERROR_OUT_OF_RESOURCES; - memcpy(module->frame_packet.data + module->frame_packet.size, + memcpy(module->frame_packet.data + module->frame_packet.size, p_packet->data, p_packet->size); module->frame_packet.size += p_packet->size; } @@ -886,11 +886,11 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, module->chunk_data_written += p_packet->size; } - if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) + if ((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) return status; if ((p_packet->flags & VC_CONTAINER_PACKET_FLAG_FRAME_END) || - (track->format->es_type == VC_CONTAINER_ES_TYPE_AUDIO && + (track->format->es_type == VC_CONTAINER_ES_TYPE_AUDIO && track->format->type->audio.block_align && module->chunk_data_written > AVI_AUDIO_CHUNK_SIZE_LIMIT)) { @@ -901,7 +901,7 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, p_packet->size = module->frame_packet.size; module->frame_packet.size = 0; } - + if (!module->chunk_size && module->chunk_data_written > p_packet->size) { /* The chunk size needs to be rewritten */ @@ -932,7 +932,6 @@ static VC_CONTAINER_STATUS_T avi_writer_write( VC_CONTAINER_T *p_ctx, if (status != VC_CONTAINER_SUCCESS) return status; } - return STREAM_STATUS(p_ctx); } @@ -949,9 +948,9 @@ static VC_CONTAINER_STATUS_T avi_writer_close( VC_CONTAINER_T *p_ctx ) VC_CONTAINER_TRACK_MODULE_T *track_module = p_ctx->tracks[module->current_track_num]->priv->module; status = avi_finish_data_chunk(p_ctx, module->chunk_data_written); if (status != VC_CONTAINER_SUCCESS) - { + { LOG_DEBUG(p_ctx, "warning, writing failed, last chunk truncated"); - } + } avi_write_index_entry(p_ctx, module->current_track_num, module->chunk_data_written, 0); track_module->chunk_index++; track_module->chunk_offs += module->chunk_data_written; @@ -992,7 +991,7 @@ static VC_CONTAINER_STATUS_T avi_writer_close( VC_CONTAINER_T *p_ctx ) if(STREAM_STATUS(p_ctx) != VC_CONTAINER_SUCCESS) { LOG_DEBUG(p_ctx, "warning, rewriting 'fileSize' failed, file will be malformed"); - } + } /* Rewrite the header list chunk ('hdrl') */ SEEK(p_ctx, module->header_list_offset); @@ -1070,7 +1069,7 @@ static VC_CONTAINER_STATUS_T avi_writer_control( VC_CONTAINER_T *p_ctx, VC_CONTA { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; VC_CONTAINER_STATUS_T status; - + switch(operation) { case VC_CONTAINER_CONTROL_TRACK_ADD: @@ -1142,7 +1141,7 @@ VC_CONTAINER_STATUS_T avi_writer_open( VC_CONTAINER_T *p_ctx ) WRITE_FOURCC(p_ctx, VC_FOURCC('R','I','F','F'), "RIFF ID"); WRITE_U32(p_ctx, 0, "fileSize"); WRITE_FOURCC(p_ctx, VC_FOURCC('A','V','I',' '), "fileType"); - + if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) goto error; p_ctx->priv->pf_close = avi_writer_close; diff --git a/gfx/include/userland/containers/binary/CMakeLists.txt b/gfx/include/userland/containers/binary/CMakeLists.txt index c159b4051c..9b9519c46f 100644 --- a/gfx/include/userland/containers/binary/CMakeLists.txt +++ b/gfx/include/userland/containers/binary/CMakeLists.txt @@ -16,4 +16,3 @@ add_library(writer_binary ${LIBRARY_TYPE} binary_writer.c) target_link_libraries(writer_binary containers) install(TARGETS writer_binary DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/binary/binary_reader.c b/gfx/include/userland/containers/binary/binary_reader.c index 0bcf389ec5..7aa9cd0dfa 100644 --- a/gfx/include/userland/containers/binary/binary_reader.c +++ b/gfx/include/userland/containers/binary/binary_reader.c @@ -84,7 +84,7 @@ static struct {"mvc", VC_CONTAINER_ES_TYPE_VIDEO, VC_CONTAINER_CODEC_MVC}, {"vc1l", VC_CONTAINER_ES_TYPE_VIDEO, VC_CONTAINER_CODEC_WVC1}, - /* Image */ + /* Image */ {"gif", VC_CONTAINER_ES_TYPE_VIDEO, VC_CONTAINER_CODEC_GIF}, {"jpg", VC_CONTAINER_ES_TYPE_VIDEO, VC_CONTAINER_CODEC_JPEG}, {"jpeg", VC_CONTAINER_ES_TYPE_VIDEO, VC_CONTAINER_CODEC_JPEG}, diff --git a/gfx/include/userland/containers/containers.h b/gfx/include/userland/containers/containers.h index 4b090c9e4a..a66622c215 100644 --- a/gfx/include/userland/containers/containers.h +++ b/gfx/include/userland/containers/containers.h @@ -144,7 +144,7 @@ typedef struct VC_CONTAINER_METADATA_T * We need an encoding conversion library! */ char *value; - /** Size of the memory area reserved for metadata value (including any + /** Size of the memory area reserved for metadata value (including any * terminating characters). */ unsigned int size; } VC_CONTAINER_METADATA_T; @@ -597,7 +597,6 @@ typedef struct VC_CONTAINER_WRITE_STATS_T /** This logs the length of time that we wait for a flush command to complete. */ VC_CONTAINER_STATS_T flush; } VC_CONTAINER_WRITE_STATS_T; - /** Control operations which can be done on containers. */ typedef enum @@ -697,7 +696,7 @@ typedef enum /** Arguments:\n * arg1= void *: metadata buffer - * arg2= unsigned long: length of metadata in bytes */ + * arg2= unsigned long: length of metadata in bytes */ VC_CONTAINER_CONTROL_GET_DRM_METADATA, /** Arguments:\n diff --git a/gfx/include/userland/containers/core/containers.c b/gfx/include/userland/containers/core/containers.c index 3693e354cd..0ff4347f0a 100644 --- a/gfx/include/userland/containers/core/containers.c +++ b/gfx/include/userland/containers/core/containers.c @@ -79,8 +79,8 @@ VC_CONTAINER_T *vc_container_open_reader_with_io( struct VC_CONTAINER_IO_T *io, if (status != VC_CONTAINER_SUCCESS) goto error; - p_ctx->priv->drm_filter = vc_container_filter_open(VC_FOURCC('d','r','m',' '), - VC_FOURCC('u','n','k','n'), p_ctx, &status); + p_ctx->priv->drm_filter = vc_container_filter_open(VC_FOURCC('d','r','m',' '), + VC_FOURCC('u','n','k','n'), p_ctx, &status); if (status != VC_CONTAINER_SUCCESS) { /* Some other problem occurred aside from the filter not being appropriate or @@ -348,7 +348,7 @@ VC_CONTAINER_STATUS_T vc_container_write( VC_CONTAINER_T *p_ctx, VC_CONTAINER_PA uint32_t metadata_length = 0; /* TODO: check other similar argument errors and non-stateless errors */ - if (!p_packet || !p_packet->data || p_packet->track >= p_ctx->tracks_num) + if (!p_packet || !p_packet->data || p_packet->track >= p_ctx->tracks_num) return VC_CONTAINER_ERROR_INVALID_ARGUMENT; /* Check for a previous error */ @@ -372,20 +372,20 @@ VC_CONTAINER_STATUS_T vc_container_write( VC_CONTAINER_T *p_ctx, VC_CONTAINER_PA if(status == VC_CONTAINER_SUCCESS) { /* Get the encryption metadata and send it to the output first. */ - if(vc_container_control(p_ctx, VC_CONTAINER_CONTROL_GET_DRM_METADATA, + if(vc_container_control(p_ctx, VC_CONTAINER_CONTROL_GET_DRM_METADATA, &p_metadata_buffer, &metadata_length) == VC_CONTAINER_SUCCESS && metadata_length > 0) { /* Make a packet up with the metadata in the payload and write it. */ VC_CONTAINER_PACKET_T metadata_packet; metadata_packet.data = p_metadata_buffer; - metadata_packet.buffer_size = metadata_length; - metadata_packet.size = metadata_length; - metadata_packet.frame_size = p_packet->frame_size + metadata_length; + metadata_packet.buffer_size = metadata_length; + metadata_packet.size = metadata_length; + metadata_packet.frame_size = p_packet->frame_size + metadata_length; metadata_packet.pts = p_packet->pts; metadata_packet.dts = p_packet->dts; - metadata_packet.num = p_packet->num; + metadata_packet.num = p_packet->num; metadata_packet.track = p_packet->track; - /* As this packet is written first, we must transfer any frame start + /* As this packet is written first, we must transfer any frame start flag from the following packet. Also, this packet can never have the end flag set. */ metadata_packet.flags = p_packet->flags & ~VC_CONTAINER_PACKET_FLAG_FRAME_END; @@ -401,7 +401,7 @@ VC_CONTAINER_STATUS_T vc_container_write( VC_CONTAINER_T *p_ctx, VC_CONTAINER_PA goto end; } } - + status = p_ctx->priv->pf_write(p_ctx, p_packet); end: @@ -469,10 +469,10 @@ VC_CONTAINER_STATUS_T vc_container_control( VC_CONTAINER_T *p_ctx, VC_CONTAINER_ memcpy(p_track->priv->drmdata, p_drm_data, drm_data_size); /* Track encryption enabled and no filter - create one now. */ - p_ctx->priv->drm_filter = vc_container_filter_open(VC_FOURCC('d','r','m',' '), type, p_ctx, &status); + p_ctx->priv->drm_filter = vc_container_filter_open(VC_FOURCC('d','r','m',' '), type, p_ctx, &status); if(status != VC_CONTAINER_SUCCESS) goto end; - + status = vc_container_filter_control(p_ctx->priv->drm_filter, operation, track_num); } } @@ -480,7 +480,7 @@ VC_CONTAINER_STATUS_T vc_container_control( VC_CONTAINER_T *p_ctx, VC_CONTAINER_ { void *p_drm_data = va_arg(args, void *); int *drm_data_size = va_arg(args, int *); - status = vc_container_filter_control(p_ctx->priv->drm_filter, operation, p_drm_data, drm_data_size); + status = vc_container_filter_control(p_ctx->priv->drm_filter, operation, p_drm_data, drm_data_size); } if(status == VC_CONTAINER_ERROR_UNSUPPORTED_OPERATION && p_ctx->priv->pf_control) diff --git a/gfx/include/userland/containers/core/containers_bits.c b/gfx/include/userland/containers/core/containers_bits.c index 30f8650180..cdd88abc80 100644 --- a/gfx/include/userland/containers/core/containers_bits.c +++ b/gfx/include/userland/containers/core/containers_bits.c @@ -158,7 +158,7 @@ static uint32_t vc_container_bits_get_leading_zero_bits( VC_CONTAINER_BITS_T *bi /* Return cached value of bits to the stream */ bit_stream->bits = bits; - + return leading_zero_bits; } diff --git a/gfx/include/userland/containers/core/containers_filters.c b/gfx/include/userland/containers/core/containers_filters.c index a5bc0b7c12..4db98465bf 100644 --- a/gfx/include/userland/containers/core/containers_filters.c +++ b/gfx/include/userland/containers/core/containers_filters.c @@ -39,13 +39,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define DL_SUFFIX VCOS_SO_EXT #ifndef DL_PATH_PREFIX #define DL_PATH_PREFIX "" - #endif + #endif #endif typedef struct VC_CONTAINER_FILTER_PRIVATE_T { /** Pointer to the container filter code and symbols */ - void *handle; + void *handle; } VC_CONTAINER_FILTER_PRIVATE_T; typedef VC_CONTAINER_STATUS_T (*VC_CONTAINER_FILTER_OPEN_FUNC_T)(VC_CONTAINER_FILTER_T*, VC_CONTAINER_FOURCC_T); @@ -63,7 +63,7 @@ static struct { {0, NULL} }; -static VC_CONTAINER_STATUS_T vc_container_filter_load(VC_CONTAINER_FILTER_T *p_ctx, +static VC_CONTAINER_STATUS_T vc_container_filter_load(VC_CONTAINER_FILTER_T *p_ctx, VC_CONTAINER_FOURCC_T filter, VC_CONTAINER_FOURCC_T type) { @@ -71,8 +71,8 @@ static VC_CONTAINER_STATUS_T vc_container_filter_load(VC_CONTAINER_FILTER_T *p_c VC_CONTAINER_FILTER_OPEN_FUNC_T func; VC_CONTAINER_STATUS_T status = VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; unsigned int i; - - for(i = 0; filter_to_name_table[i].filter; ++i) + + for(i = 0; filter_to_name_table[i].filter; ++i) { if (filter_to_name_table[i].filter == filter) { @@ -85,7 +85,7 @@ static VC_CONTAINER_STATUS_T vc_container_filter_load(VC_CONTAINER_FILTER_T *p_c } } } - + p_ctx->priv->handle = handle; return status; } @@ -97,9 +97,9 @@ static void vc_container_filter_unload(VC_CONTAINER_FILTER_T *p_ctx) } /*****************************************************************************/ -VC_CONTAINER_FILTER_T *vc_container_filter_open(VC_CONTAINER_FOURCC_T filter, +VC_CONTAINER_FILTER_T *vc_container_filter_open(VC_CONTAINER_FOURCC_T filter, VC_CONTAINER_FOURCC_T type, - VC_CONTAINER_T *p_container, + VC_CONTAINER_T *p_container, VC_CONTAINER_STATUS_T *p_status ) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_ERROR_NOT_FOUND; @@ -112,10 +112,10 @@ VC_CONTAINER_FILTER_T *vc_container_filter_open(VC_CONTAINER_FOURCC_T filter, memset(p_ctx, 0, sizeof(*p_ctx) + sizeof(*priv)); p_ctx->priv = priv = (VC_CONTAINER_FILTER_PRIVATE_T *)&p_ctx[1]; p_ctx->container = p_container; - + status = vc_container_filter_load(p_ctx, filter, type); if(status != VC_CONTAINER_SUCCESS) goto error; - + end: if(p_status) *p_status = status; return p_ctx; @@ -160,7 +160,7 @@ VC_CONTAINER_STATUS_T vc_container_filter_control(VC_CONTAINER_FILTER_T *p_ctx, } static VC_CONTAINER_FILTER_OPEN_FUNC_T load_library(void **handle, VC_CONTAINER_FOURCC_T filter, const char *name) -{ +{ VC_CONTAINER_FILTER_OPEN_FUNC_T func = NULL; #ifdef ENABLE_CONTAINERS_STANDALONE VC_CONTAINER_PARAM_UNUSED(handle); @@ -177,7 +177,7 @@ static VC_CONTAINER_FILTER_OPEN_FUNC_T load_library(void **handle, VC_CONTAINER_ snprintf(filter_, sizeof(filter_), "%4.4s", (const char*)&filter); ptr = strchr(filter_, '\0'); while (ptr > filter_ && isspace(*--ptr)) *ptr = '\0'; - strncat(filter_, "_", 1); + strncat(filter_, "_", 1); dl_name_len = strlen(DL_PATH_PREFIX) + strlen(filter_) + strlen(name) + strlen(DL_SUFFIX) + 1; dl_name = malloc(dl_name_len); @@ -203,7 +203,7 @@ static VC_CONTAINER_FILTER_OPEN_FUNC_T load_library(void **handle, VC_CONTAINER_ if (func) *handle = dl_handle; else - vcos_dlclose(dl_handle); + vcos_dlclose(dl_handle); } free(dl_name); @@ -211,7 +211,7 @@ static VC_CONTAINER_FILTER_OPEN_FUNC_T load_library(void **handle, VC_CONTAINER_ #endif return func; } - + static void unload_library(void *handle) { #ifdef ENABLE_CONTAINERS_STANDALONE diff --git a/gfx/include/userland/containers/core/containers_filters.h b/gfx/include/userland/containers/core/containers_filters.h index 9026274e4f..bc205697de 100644 --- a/gfx/include/userland/containers/core/containers_filters.h +++ b/gfx/include/userland/containers/core/containers_filters.h @@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** Container Filter Context. * This structure defines the context for a container filter instance */ typedef struct VC_CONTAINER_FILTER_T -{ +{ /** Pointer to container instance */ struct VC_CONTAINER_T *container; /** Pointer to information private to the container filter instance */ @@ -49,7 +49,7 @@ typedef struct VC_CONTAINER_FILTER_T struct VC_CONTAINER_FILTER_MODULE_T *module; /** \note the following list of function pointers should not be used directly. - * They defines the interface for implementing container filter modules and are + * They defines the interface for implementing container filter modules and are * filled in by the container filter modules themselves. */ /** \private @@ -78,7 +78,7 @@ typedef struct VC_CONTAINER_FILTER_T * of the container filter. Returns NULL on failure. */ VC_CONTAINER_FILTER_T *vc_container_filter_open(VC_CONTAINER_FOURCC_T filter, - VC_CONTAINER_FOURCC_T type, + VC_CONTAINER_FOURCC_T type, VC_CONTAINER_T *container, VC_CONTAINER_STATUS_T *status ); @@ -94,7 +94,7 @@ VC_CONTAINER_STATUS_T vc_container_filter_close( VC_CONTAINER_FILTER_T *context * \return the status of the operation */ VC_CONTAINER_STATUS_T vc_container_filter_process(VC_CONTAINER_FILTER_T *context, VC_CONTAINER_PACKET_T *p_packet); - + /** Extensible control function for container filter modules. * This function takes a variable number of arguments which will depend on the specific operation. * @@ -102,7 +102,7 @@ VC_CONTAINER_STATUS_T vc_container_filter_process(VC_CONTAINER_FILTER_T *context * \param operation The requested operation * \param args Arguments for the operation * \return the status of the operation -*/ +*/ VC_CONTAINER_STATUS_T vc_container_filter_control(VC_CONTAINER_FILTER_T *context, VC_CONTAINER_CONTROL_T operation, ... ); /* @} */ diff --git a/gfx/include/userland/containers/core/containers_index.c b/gfx/include/userland/containers/core/containers_index.c index 7edebfa20f..c9c0319f72 100644 --- a/gfx/include/userland/containers/core/containers_index.c +++ b/gfx/include/userland/containers/core/containers_index.c @@ -44,7 +44,7 @@ struct VC_CONTAINER_INDEX_T { int count; // number of calls to index_add since last entry added int max_count; // log2 of the number of calls to discard between each entry added int64_t max_time; // time of the latest entry - VC_CONTAINER_INDEX_POS_T entry[0]; // array of position/time pairs + VC_CONTAINER_INDEX_POS_T entry[0]; // array of position/time pairs }; // We have a fixed length list, and when it is full we want to discard half the entries. @@ -58,7 +58,7 @@ struct VC_CONTAINER_INDEX_T { // when this is full we change to mgap=2, gap=1, so we iterate this way: // |o|S|S| [0 2 4 6] [1 3 5 7] // when this is full we change to mgap=1, gap=2 -// |o|o|S| [0 4] [1 5] [2 6] [3 7] +// |o|o|S| [0 4] [1 5] [2 6] [3 7] // when this is full we change to this, which is equivalent to where we started // |o|o|o| [0] [1] [2] [3] [4] [5] [6] [7] @@ -77,7 +77,7 @@ VC_CONTAINER_STATUS_T vc_container_index_create( VC_CONTAINER_INDEX_T **index, i id = malloc(sizeof(VC_CONTAINER_INDEX_T) + (sizeof(VC_CONTAINER_INDEX_POS_T)<len = id->mgap = len; @@ -189,4 +189,3 @@ VC_CONTAINER_STATUS_T vc_container_index_get( VC_CONTAINER_INDEX_T *index, int l return VC_CONTAINER_SUCCESS; } - diff --git a/gfx/include/userland/containers/core/containers_index.h b/gfx/include/userland/containers/core/containers_index.h index f0c49c3d92..04c47efa1d 100644 --- a/gfx/include/userland/containers/core/containers_index.h +++ b/gfx/include/userland/containers/core/containers_index.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * that don't include an index. */ -#include "containers/containers.h" +#include "containers/containers.h" struct VC_CONTAINER_INDEX_T; typedef struct VC_CONTAINER_INDEX_T VC_CONTAINER_INDEX_T; @@ -47,7 +47,6 @@ typedef struct VC_CONTAINER_INDEX_T VC_CONTAINER_INDEX_T; */ VC_CONTAINER_STATUS_T vc_container_index_create( VC_CONTAINER_INDEX_T **index, int length ); - /** * Frees an index. * @param index Pointer to valid index. @@ -55,7 +54,6 @@ VC_CONTAINER_STATUS_T vc_container_index_create( VC_CONTAINER_INDEX_T **index, i */ VC_CONTAINER_STATUS_T vc_container_index_free( VC_CONTAINER_INDEX_T *index ); - /** * Adds an entry to the index. If the index is full then some stored records will be * discarded. @@ -66,11 +64,10 @@ VC_CONTAINER_STATUS_T vc_container_index_free( VC_CONTAINER_INDEX_T *index ); */ VC_CONTAINER_STATUS_T vc_container_index_add( VC_CONTAINER_INDEX_T *index, int64_t time, int64_t file_offset ); - /** * Retrieves the best entry for the supplied time offset. * @param index Pointer to valid index. - * @param later If true, the selected entry is the earliest retained entry with a greater or equal timestamp. + * @param later If true, the selected entry is the earliest retained entry with a greater or equal timestamp. * If false, the selected entry is the latest retained entry with an earlier or equal timestamp. * @param time The requested time. On success, this is filled in with the time of the selected entry. * @param file_offset On success, this is filled in with the file offset of the selected entry. diff --git a/gfx/include/userland/containers/core/containers_io.c b/gfx/include/userland/containers/core/containers_io.c index 907a2a06d4..e0811bc0ce 100644 --- a/gfx/include/userland/containers/core/containers_io.c +++ b/gfx/include/userland/containers/core/containers_io.c @@ -186,7 +186,7 @@ static VC_CONTAINER_IO_T *vc_container_io_open_core( const char *uri, VC_CONTAIN cache->io = p_ctx; cache->mem = malloc(p_ctx->priv->caches.mem_size); if(cache->mem) - { + { cache->buffer = cache->mem; cache->buffer_end = cache->mem + cache->mem_size; p_ctx->priv->caches_num = 1; @@ -196,7 +196,6 @@ static VC_CONTAINER_IO_T *vc_container_io_open_core( const char *uri, VC_CONTAIN if(p_ctx->priv->caches_num) p_ctx->priv->cache = &p_ctx->priv->caches; - /* Try to start an asynchronous io if we're in write mode and we've got at least 2 cache memory areas */ if(mode == VC_CONTAINER_IO_MODE_WRITE && p_ctx->priv->cache && num_areas >= 2) p_ctx->priv->async_io = async_io_start( p_ctx, num_areas, 0 ); @@ -241,7 +240,7 @@ VC_CONTAINER_STATUS_T vc_container_io_close( VC_CONTAINER_IO_T *p_ctx ) if(p_ctx->priv->caches.dirty) vc_container_io_cache_flush( p_ctx, &p_ctx->priv->caches, 1 ); } - + if(p_ctx->priv->async_io) async_io_stop( p_ctx->priv->async_io ); else if(p_ctx->priv->caches_num) @@ -249,7 +248,7 @@ VC_CONTAINER_STATUS_T vc_container_io_close( VC_CONTAINER_IO_T *p_ctx ) for(i = 0; i < p_ctx->priv->cached_areas_num; i++) free(p_ctx->priv->cached_areas[i].mem); - + if(p_ctx->pf_close) p_ctx->pf_close(p_ctx); } @@ -769,7 +768,7 @@ static void stats_add_value(VC_CONTAINER_STATS_T *st, uint32_t count, uint32_t n uint32_t numpc; int i, j; - if(count == 0) + if(count == 0) return; numpc = NUMPC(count, num, st->shift); @@ -958,7 +957,7 @@ static VC_CONTAINER_STATUS_T async_io_wait_complete( struct VC_CONTAINER_IO_ASYN vcos_semaphore_wait(&ctx->spare_sema); vcos_semaphore_post(&ctx->spare_sema); } - + if(ctx->stats_enable) stats_add_value(&ctx->stats.flush, 1, vcos_getmicrosecs() - time); @@ -1084,5 +1083,4 @@ static void async_io_stats_get( struct VC_CONTAINER_IO_ASYNC_T *ctx, VC_CONTAINE VC_CONTAINER_PARAM_UNUSED(stats); } - #endif diff --git a/gfx/include/userland/containers/core/containers_io.h b/gfx/include/userland/containers/core/containers_io.h index 8cd4407d58..fee6fbb9e7 100644 --- a/gfx/include/userland/containers/core/containers_io.h +++ b/gfx/include/userland/containers/core/containers_io.h @@ -118,7 +118,7 @@ struct VC_CONTAINER_IO_T /** \private * Function pointer to perform a control operation on a container io module */ - VC_CONTAINER_STATUS_T (*pf_control)(struct VC_CONTAINER_IO_T *io, + VC_CONTAINER_STATUS_T (*pf_control)(struct VC_CONTAINER_IO_T *io, VC_CONTAINER_CONTROL_T operation, va_list args); }; @@ -200,7 +200,7 @@ VC_CONTAINER_STATUS_T vc_container_io_seek(VC_CONTAINER_IO_T *context, int64_t o * \param args Additional arguments for the operation * \return Status of the operation */ -VC_CONTAINER_STATUS_T vc_container_io_control_list(VC_CONTAINER_IO_T *context, +VC_CONTAINER_STATUS_T vc_container_io_control_list(VC_CONTAINER_IO_T *context, VC_CONTAINER_CONTROL_T operation, va_list args); /** Perform control operation on an i/o stream (varargs). @@ -209,7 +209,7 @@ VC_CONTAINER_STATUS_T vc_container_io_control_list(VC_CONTAINER_IO_T *context, * \param ... Additional arguments for the operation * \return Status of the operation */ -VC_CONTAINER_STATUS_T vc_container_io_control(VC_CONTAINER_IO_T *context, +VC_CONTAINER_STATUS_T vc_container_io_control(VC_CONTAINER_IO_T *context, VC_CONTAINER_CONTROL_T operation, ...); /** Cache the pointed region of the i/o stream (from current position). diff --git a/gfx/include/userland/containers/core/containers_io_helpers.c b/gfx/include/userland/containers/core/containers_io_helpers.c index 88e08cc7ca..32f0491605 100644 --- a/gfx/include/userland/containers/core/containers_io_helpers.c +++ b/gfx/include/userland/containers/core/containers_io_helpers.c @@ -202,7 +202,7 @@ VC_CONTAINER_STATUS_T vc_container_helper_write_debug(VC_CONTAINER_T *ctx, int t else if(type == LOG_FORMAT_TYPE_FOURCC) { status = vc_container_io_write_fourcc(ctx->priv->io, (uint32_t)value); - } + } else if(type == LOG_FORMAT_TYPE_GUID) { value = vc_container_io_write(ctx->priv->io, buffer, 16); diff --git a/gfx/include/userland/containers/core/containers_list.h b/gfx/include/userland/containers/core/containers_list.h index 5b089976a5..cddd81fbec 100644 --- a/gfx/include/userland/containers/core/containers_list.h +++ b/gfx/include/userland/containers/core/containers_list.h @@ -49,7 +49,6 @@ typedef struct vc_containers_list_tag /** Macro to generate a static, read-only list from an array and comparator */ #define VC_CONTAINERS_STATIC_LIST(L, A, C) static VC_CONTAINERS_LIST_T L = { countof(A), 0, sizeof(*(A)), (VC_CONTAINERS_LIST_COMPARATOR_T)(C), A } - /** Create an empty list. * The list is created based on the details provided, minimum capacity one entry. * diff --git a/gfx/include/userland/containers/core/containers_loader.c b/gfx/include/userland/containers/core/containers_loader.c index b59730119a..a52ac63b89 100644 --- a/gfx/include/userland/containers/core/containers_loader.c +++ b/gfx/include/userland/containers/core/containers_loader.c @@ -177,14 +177,14 @@ VC_CONTAINER_STATUS_T vc_container_load_reader(VC_CONTAINER_T *p_ctx, const char VC_CONTAINER_STATUS_T status; unsigned int i; int64_t offset; - + vc_container_assert(p_ctx && !p_ctx->priv->module_handle); /* FIXME: the missing part here is code that reads a configuration or searches the filesystem for container libraries. Instead, we currently rely on static arrays i.e. 'readers', 'writers', etc. */ - /* Before trying proper container readers, iterate through metadata + /* Before trying proper container readers, iterate through metadata readers to parse tags concatenated to start/end of stream */ for(i = 0; metadata_readers[i]; i++) { @@ -203,7 +203,7 @@ VC_CONTAINER_STATUS_T vc_container_load_reader(VC_CONTAINER_T *p_ctx, const char at the start, and the IO layer can cope with the seek */ offset = p_ctx->priv->io->offset; - /* Now move to containers, try to find a readers using the file extension to name + /* Now move to containers, try to find a readers using the file extension to name mapping first */ if (fileext && (name = container_for_fileext(fileext)) != NULL && (func = load_reader(&handle, name)) != NULL) { @@ -248,9 +248,9 @@ VC_CONTAINER_STATUS_T vc_container_load_writer(VC_CONTAINER_T *p_ctx, const char VC_CONTAINER_WRITER_OPEN_FUNC_T func; VC_CONTAINER_STATUS_T status = VC_CONTAINER_ERROR_FAILED; unsigned int i; - + vc_container_assert(p_ctx && !p_ctx->priv->module_handle); - + /* Do we have a container mapping for this file extension? */ if ((name = container_for_fileext(fileext)) != NULL && (func = load_writer(&handle, name)) != NULL) { @@ -296,7 +296,7 @@ Local Functions static void reset_context(VC_CONTAINER_T *p_ctx) { vc_container_assert(p_ctx); - + p_ctx->capabilities = 0; p_ctx->tracks = NULL; p_ctx->tracks_num = 0; @@ -342,9 +342,9 @@ static VC_CONTAINER_READER_OPEN_FUNC_T load_library(void **handle, const char *n void *dl_handle; VC_CONTAINER_READER_OPEN_FUNC_T func = NULL; unsigned dl_size, ep_size, name_len = strlen(name) + (ext ? strlen(ext) : 0); - + vc_container_assert(read == 0 || read == 1); - + dl_size = strlen(DL_PATH_PREFIX) + MAX(strlen(DL_PREFIX_RD), strlen(DL_PREFIX_WR)) + name_len + strlen(DL_SUFFIX) + 1; if ((dl_name = malloc(dl_size)) == NULL) return NULL; @@ -358,7 +358,7 @@ static VC_CONTAINER_READER_OPEN_FUNC_T load_library(void **handle, const char *n snprintf(dl_name, dl_size, "%s%s%s%s%s", DL_PATH_PREFIX, read ? DL_PREFIX_RD : DL_PREFIX_WR, ext ? ext : "", name, DL_SUFFIX); snprintf(entrypt_name, ep_size, "%s_%s%s", name, ext ? ext : "", read ? entrypt_read : entrypt_write); - + if ( (dl_handle = vcos_dlopen(dl_name, VCOS_DL_NOW)) != NULL ) { /* Try generic entrypoint name before the mangled, full name */ @@ -372,9 +372,9 @@ static VC_CONTAINER_READER_OPEN_FUNC_T load_library(void **handle, const char *n else vcos_dlclose(dl_handle); } - + free(entrypt_name); - free(dl_name); + free(dl_name); return func; } @@ -398,7 +398,7 @@ static VC_CONTAINER_READER_OPEN_FUNC_T load_library(void **handle, const char *n for (i = 0; reader_entry_points[i].name; i++) if (!strcasecmp(reader_entry_points[i].name, name)) return reader_entry_points[i].func; - + for (i = 0; metadata_reader_entry_points[i].name; i++) if (!strcasecmp(metadata_reader_entry_points[i].name, name)) return metadata_reader_entry_points[i].func; diff --git a/gfx/include/userland/containers/core/containers_loader.h b/gfx/include/userland/containers/core/containers_loader.h index 946eaf62a8..cab4f93989 100644 --- a/gfx/include/userland/containers/core/containers_loader.h +++ b/gfx/include/userland/containers/core/containers_loader.h @@ -28,11 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef VC_CONTAINERS_LOADER_H #define VC_CONTAINERS_LOADER_H -/** Find and attempt to load & open reader, 'fileext' is a hint that can be used +/** Find and attempt to load & open reader, 'fileext' is a hint that can be used to speed up loading. */ VC_CONTAINER_STATUS_T vc_container_load_reader(VC_CONTAINER_T *p_ctx, const char *fileext); -/** Find and attempt to load & open writer, 'fileext' is a hint used to help in +/** Find and attempt to load & open writer, 'fileext' is a hint used to help in selecting the appropriate container format. */ VC_CONTAINER_STATUS_T vc_container_load_writer(VC_CONTAINER_T *p_ctx, const char *fileext); diff --git a/gfx/include/userland/containers/core/containers_private.h b/gfx/include/userland/containers/core/containers_private.h index 8c379c6735..758fc1a323 100644 --- a/gfx/include/userland/containers/core/containers_private.h +++ b/gfx/include/userland/containers/core/containers_private.h @@ -177,7 +177,7 @@ VC_CONTAINER_STATUS_T vc_container_track_allocate_extradata( VC_CONTAINER_T *con VC_CONTAINER_TRACK_T *p_track, unsigned int extra_size ); VC_CONTAINER_STATUS_T vc_container_track_allocate_drmdata( VC_CONTAINER_T *context, VC_CONTAINER_TRACK_T *p_track, unsigned int size ); - + /* @} */ #endif /* VC_CONTAINERS_PRIVATE_H */ diff --git a/gfx/include/userland/containers/core/containers_uri.c b/gfx/include/userland/containers/core/containers_uri.c index b0d3c59af9..d71d202c4b 100644 --- a/gfx/include/userland/containers/core/containers_uri.c +++ b/gfx/include/userland/containers/core/containers_uri.c @@ -459,7 +459,7 @@ static bool parse_query( VC_URI_PARTS_T *p_uri, const char *str, uint32_t str_le /* Take first '=' as break between name and value */ if (c == '=' && !equals_ptr) equals_ptr = str; - + /* If at the end of the name or name/value pair */ if (c == '&' || c ==';') { diff --git a/gfx/include/userland/containers/core/containers_uri.h b/gfx/include/userland/containers/core/containers_uri.h index 77a06e7f4e..07b53f16d7 100644 --- a/gfx/include/userland/containers/core/containers_uri.h +++ b/gfx/include/userland/containers/core/containers_uri.h @@ -64,7 +64,7 @@ void vc_uri_clear( VC_URI_PARTS_T *p_uri ); bool vc_uri_parse( VC_URI_PARTS_T *p_uri, const char *uri ); /** Builds the URI component parts into a URI string. - * If buffer is NULL, or buffer_size is too small, nothing is written to the + * If buffer is NULL, or buffer_size is too small, nothing is written to the * buffer but the required string length is still returned. buffer_size must be * at least one more than the value returned. * diff --git a/gfx/include/userland/containers/core/containers_utils.c b/gfx/include/userland/containers/core/containers_utils.c index 477093ff37..d91ca2cb60 100644 --- a/gfx/include/userland/containers/core/containers_utils.c +++ b/gfx/include/userland/containers/core/containers_utils.c @@ -288,26 +288,26 @@ unsigned int vc_container_es_format_to_bitmapinfoheader(VC_CONTAINER_ES_FORMAT_T /*****************************************************************************/ VC_CONTAINER_STATUS_T vc_container_bitmapinfoheader_to_es_format(uint8_t *p, - unsigned int buffer_size, unsigned int *extra_offset, unsigned int *extra_size, + unsigned int buffer_size, unsigned int *extra_offset, unsigned int *extra_size, VC_CONTAINER_ES_FORMAT_T *format) { VC_CONTAINER_FOURCC_T fourcc; - + if(!p || buffer_size < BITMAPINFOHEADER_SIZE_MAX) return VC_CONTAINER_ERROR_INVALID_ARGUMENT; /* size = (p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]; */ format->type->video.width = (p[7] << 24) | (p[6] << 16) | (p[5] << 8) | p[4]; format->type->video.height = (p[11] << 24) | (p[10] << 16) | (p[9] << 8) | p[8]; memcpy(&fourcc, p + 16, 4); - + format->es_type = VC_CONTAINER_ES_TYPE_VIDEO; format->codec = vfw_fourcc_to_codec(fourcc); - + /* If no mapping is found from vfw, try a more generic one */ if (format->codec == fourcc && (fourcc = fourcc_to_codec(fourcc)) != VC_CONTAINER_CODEC_UNKNOWN) format->codec = fourcc; if(extra_offset) *extra_offset = BITMAPINFOHEADER_SIZE_MAX; - if(extra_size) + if(extra_size) { if (buffer_size > BITMAPINFOHEADER_SIZE_MAX) *extra_size = buffer_size - BITMAPINFOHEADER_SIZE_MAX; @@ -315,7 +315,7 @@ VC_CONTAINER_STATUS_T vc_container_bitmapinfoheader_to_es_format(uint8_t *p, *extra_size = 0; } - return VC_CONTAINER_SUCCESS; + return VC_CONTAINER_SUCCESS; } /*****************************************************************************/ diff --git a/gfx/include/userland/containers/core/containers_utils.h b/gfx/include/userland/containers/core/containers_utils.h index 22349ef7a4..1911b80ca0 100644 --- a/gfx/include/userland/containers/core/containers_utils.h +++ b/gfx/include/userland/containers/core/containers_utils.h @@ -64,7 +64,7 @@ VC_CONTAINER_STATUS_T vc_container_waveformatex_to_es_format(uint8_t *p, unsigned int buffer_size, unsigned int *extra_offset, unsigned int *extra_size, VC_CONTAINER_ES_FORMAT_T *format); VC_CONTAINER_STATUS_T vc_container_bitmapinfoheader_to_es_format(uint8_t *p, - unsigned int buffer_size, unsigned int *extra_offset, unsigned int *extra_size, + unsigned int buffer_size, unsigned int *extra_offset, unsigned int *extra_size, VC_CONTAINER_ES_FORMAT_T *format); /** Find the greatest common denominator of 2 numbers. diff --git a/gfx/include/userland/containers/core/containers_writer_utils.h b/gfx/include/userland/containers/core/containers_writer_utils.h index e2ccf9e938..b55d58252d 100644 --- a/gfx/include/userland/containers/core/containers_writer_utils.h +++ b/gfx/include/userland/containers/core/containers_writer_utils.h @@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Helper functions and macros for container writers */ -#include "containers/containers.h" +#include "containers/containers.h" #include "containers/containers_codecs.h" #include "containers/core/containers_io_helpers.h" diff --git a/gfx/include/userland/containers/flash/CMakeLists.txt b/gfx/include/userland/containers/flash/CMakeLists.txt index bf5393597d..5a20bce6a1 100644 --- a/gfx/include/userland/containers/flash/CMakeLists.txt +++ b/gfx/include/userland/containers/flash/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_flv ${LIBRARY_TYPE} flv_reader.c) target_link_libraries(reader_flv containers) install(TARGETS reader_flv DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/io/io_file.c b/gfx/include/userland/containers/io/io_file.c index ea4b945d9b..a55e0e9e16 100644 --- a/gfx/include/userland/containers/io/io_file.c +++ b/gfx/include/userland/containers/io/io_file.c @@ -91,7 +91,7 @@ static VC_CONTAINER_STATUS_T io_file_seek(VC_CONTAINER_IO_T *p_ctx, int64_t offs return VC_CONTAINER_ERROR_EOS; } ret = fseek(p_ctx->module->stream, (long)offset, SEEK_SET); -#endif +#endif if(ret) { if( feof(p_ctx->module->stream) ) status = VC_CONTAINER_ERROR_EOS; diff --git a/gfx/include/userland/containers/io/io_http.c b/gfx/include/userland/containers/io/io_http.c index 48d86619c0..85334caaa6 100644 --- a/gfx/include/userland/containers/io/io_http.c +++ b/gfx/include/userland/containers/io/io_http.c @@ -97,7 +97,6 @@ typedef struct http_header_tag { char *value; } HTTP_HEADER_T; - /****************************************************************************** Type definitions ******************************************************************************/ diff --git a/gfx/include/userland/containers/io/io_net.c b/gfx/include/userland/containers/io/io_net.c index a1912e52e3..bc7eb34595 100644 --- a/gfx/include/userland/containers/io/io_net.c +++ b/gfx/include/userland/containers/io/io_net.c @@ -269,7 +269,7 @@ static size_t io_net_write(VC_CONTAINER_IO_T *p_ctx, const void *buffer, size_t } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T io_net_control(struct VC_CONTAINER_IO_T *p_ctx, +static VC_CONTAINER_STATUS_T io_net_control(struct VC_CONTAINER_IO_T *p_ctx, VC_CONTAINER_CONTROL_T operation, va_list args) { diff --git a/gfx/include/userland/containers/io/io_pktfile.c b/gfx/include/userland/containers/io/io_pktfile.c index 7f4defbbcb..c68a2b840e 100644 --- a/gfx/include/userland/containers/io/io_pktfile.c +++ b/gfx/include/userland/containers/io/io_pktfile.c @@ -94,7 +94,7 @@ static size_t io_pktfile_read(VC_CONTAINER_IO_T *p_ctx, void *buffer, size_t siz VC_CONTAINER_IO_MODULE_T *module = p_ctx->module; uint32_t length = 0; size_t ret; - + ret = fread(&length, 1, sizeof(length), module->stream); if (ret != sizeof(length)) { @@ -136,7 +136,7 @@ static size_t io_pktfile_write(VC_CONTAINER_IO_T *p_ctx, const void *buffer, siz { uint32_t size_word; size_t ret; - + if (size >= 0xFFFFFFFFUL) size_word = 0xFFFFFFFFUL; else @@ -154,7 +154,7 @@ static size_t io_pktfile_write(VC_CONTAINER_IO_T *p_ctx, const void *buffer, siz p_ctx->status = VC_CONTAINER_ERROR_FAILED; if (fflush(p_ctx->module->stream) != 0) p_ctx->status = VC_CONTAINER_ERROR_FAILED; - + return ret; } diff --git a/gfx/include/userland/containers/metadata/id3/CMakeLists.txt b/gfx/include/userland/containers/metadata/id3/CMakeLists.txt index 30178f8f64..d471f2d257 100644 --- a/gfx/include/userland/containers/metadata/id3/CMakeLists.txt +++ b/gfx/include/userland/containers/metadata/id3/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_metadata_id3 ${LIBRARY_TYPE} id3_metadata_reader.c) target_link_libraries(reader_metadata_id3 containers) install(TARGETS reader_metadata_id3 DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/metadata/id3/id3_metadata_reader.c b/gfx/include/userland/containers/metadata/id3/id3_metadata_reader.c index 549273b8bb..1929e861ac 100644 --- a/gfx/include/userland/containers/metadata/id3/id3_metadata_reader.c +++ b/gfx/include/userland/containers/metadata/id3/id3_metadata_reader.c @@ -44,7 +44,7 @@ Defines ******************************************************************************/ #define ID3_SYNC_SAFE(x) ((((x >> 24) & 0x7f) << 21) | (((x >> 16) & 0x7f) << 14) | \ (((x >> 8) & 0x7f) << 7) | (((x >> 0) & 0x7f) << 0)) - + /****************************************************************************** Type definitions ******************************************************************************/ @@ -63,15 +63,15 @@ static VC_CONTAINER_METADATA_T *id3_metadata_append( VC_CONTAINER_T *p_ctx, { VC_CONTAINER_METADATA_T *meta, **p_meta; unsigned int i; - + for (i = 0; i != p_ctx->meta_num; ++i) { if (key == p_ctx->meta[i]->key) break; } - + /* Avoid duplicate entries for now */ if (i < p_ctx->meta_num) return NULL; - + /* Sanity check size, truncate if necessary */ size = MIN(size, 512); @@ -80,7 +80,7 @@ static VC_CONTAINER_METADATA_T *id3_metadata_append( VC_CONTAINER_T *p_ctx, return NULL; /* We need to grow the array holding the metadata entries somehow, ideally, - we'd like to use a linked structure of some sort but realloc is probably + we'd like to use a linked structure of some sort but realloc is probably okay in this case */ if((p_meta = realloc(p_ctx->meta, sizeof(VC_CONTAINER_METADATA_T *) * (p_ctx->meta_num + 1))) == NULL) { @@ -95,21 +95,21 @@ static VC_CONTAINER_METADATA_T *id3_metadata_append( VC_CONTAINER_T *p_ctx, meta->value = (char *)&meta[1]; meta->size = size; p_ctx->meta_num++; - + return meta; } /*****************************************************************************/ -static VC_CONTAINER_METADATA_T *id3_read_metadata_entry( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_METADATA_T *id3_read_metadata_entry( VC_CONTAINER_T *p_ctx, VC_CONTAINER_METADATA_KEY_T key, unsigned int len ) { VC_CONTAINER_METADATA_T *meta; - + if ((meta = id3_metadata_append(p_ctx, key, len + 1)) != NULL) { unsigned int size = meta->size - 1; READ_BYTES(p_ctx, meta->value, size); - + if (len > size) { LOG_DEBUG(p_ctx, "metadata value truncated (%d characters lost)", len - size); @@ -120,20 +120,20 @@ static VC_CONTAINER_METADATA_T *id3_read_metadata_entry( VC_CONTAINER_T *p_ctx, { SKIP_BYTES(p_ctx, len); } - + return meta; } /*****************************************************************************/ -static VC_CONTAINER_METADATA_T *id3_read_metadata_entry_ex( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_METADATA_T *id3_read_metadata_entry_ex( VC_CONTAINER_T *p_ctx, VC_CONTAINER_METADATA_KEY_T key, unsigned int len, const char *encoding ) { VC_CONTAINER_METADATA_T *meta; - + if ((meta = id3_metadata_append(p_ctx, key, encoding ? len + 2 : len + 1)) != NULL) { unsigned int size; - + if (encoding) { size = meta->size - 2; @@ -151,12 +151,12 @@ static VC_CONTAINER_METADATA_T *id3_read_metadata_entry_ex( VC_CONTAINER_T *p_ct SKIP_BYTES(p_ctx, len - size); } } - + return meta; } /*****************************************************************************/ -static VC_CONTAINER_METADATA_T *id3_add_metadata_entry( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_METADATA_T *id3_add_metadata_entry( VC_CONTAINER_T *p_ctx, VC_CONTAINER_METADATA_KEY_T key, const char *value ) { VC_CONTAINER_METADATA_T *meta; @@ -165,12 +165,12 @@ static VC_CONTAINER_METADATA_T *id3_add_metadata_entry( VC_CONTAINER_T *p_ctx, if ((meta = id3_metadata_append(p_ctx, key, len + 1)) != NULL) { unsigned int size = meta->size - 1; - + if (len > size) { LOG_DEBUG(p_ctx, "metadata value truncated (%d characters lost)", len - size); } - + strncpy(meta->value, value, size); } @@ -178,7 +178,7 @@ static VC_CONTAINER_METADATA_T *id3_add_metadata_entry( VC_CONTAINER_T *p_ctx, } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T id3_read_id3v2_frame( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T id3_read_id3v2_frame( VC_CONTAINER_T *p_ctx, VC_CONTAINER_FOURCC_T frame_id, uint32_t frame_size ) { VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; @@ -250,7 +250,7 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) uint8_t maj_version, flags; uint32_t tag_size, size = 0; uint8_t peek_buf[10]; - + SKIP_STRING(p_ctx, 3, "ID3v2 identifier"); maj_version = READ_U8(p_ctx, "ID3v2 version (major)"); SKIP_U8(p_ctx, "ID3v2 version (minor)"); @@ -284,16 +284,16 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) SKIP_BYTES(p_ctx, MIN(tag_size, ext_hdr_size)); size += ext_hdr_size; } - + while (PEEK_BYTES(p_ctx, peek_buf, 10) == 10 && size < tag_size) { VC_CONTAINER_FOURCC_T frame_id; uint32_t frame_size; uint8_t format_flags; - + frame_id = READ_FOURCC(p_ctx, "Frame ID"); frame_size = READ_U32(p_ctx, "Frame Size"); - + if (maj_version >= 4) { frame_size = ID3_SYNC_SAFE(frame_size); @@ -305,7 +305,7 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) size += 10; - if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS || !frame_id) + if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS || !frame_id) break; /* Early exit if we detect an invalid tag size */ @@ -314,7 +314,7 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) status = VC_CONTAINER_ERROR_FORMAT_INVALID; break; } - + /* We can't currently handle unsynchronised frames */ if ((format_flags >> 1) & 1) { @@ -322,7 +322,7 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) SKIP_BYTES(p_ctx, frame_size); continue; } - + if ((status = id3_read_id3v2_frame(p_ctx, frame_id, frame_size)) != VC_CONTAINER_SUCCESS) { LOG_DEBUG(p_ctx, "skipping unsupported frame"); @@ -334,7 +334,7 @@ static VC_CONTAINER_STATUS_T id3_read_id3v2_tag( VC_CONTAINER_T *p_ctx ) /* Try to skip to end of tag in case we bailed out early */ if (size < tag_size) SKIP_BYTES(p_ctx, tag_size - size); - + return status; } @@ -396,7 +396,7 @@ VC_CONTAINER_STATUS_T id3_metadata_reader_open( VC_CONTAINER_T *p_ctx ) if (PEEK_BYTES(p_ctx, peek_buf, 10) != 10) return VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; - + /* Initial ID3v2 tag(s), variable size */ while ((peek_buf[0] == 'I') && (peek_buf[1] == 'D') && (peek_buf[2] == '3')) { @@ -415,7 +415,7 @@ VC_CONTAINER_STATUS_T id3_metadata_reader_open( VC_CONTAINER_T *p_ctx ) { SEEK(p_ctx, p_ctx->priv->io->size - INT64_C(128)); if (PEEK_BYTES(p_ctx, peek_buf, 3) != 3) goto end; - + if ((peek_buf[0] == 'T') && (peek_buf[1] == 'A') && (peek_buf[2] == 'G')) { if ((status = id3_read_id3v1_tag(p_ctx)) != VC_CONTAINER_SUCCESS) @@ -432,8 +432,8 @@ end: p_ctx->priv->pf_close = id3_metadata_reader_close; - if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) goto error; - + if((status = STREAM_STATUS(p_ctx)) != VC_CONTAINER_SUCCESS) goto error; + return VC_CONTAINER_SUCCESS; error: diff --git a/gfx/include/userland/containers/mkv/CMakeLists.txt b/gfx/include/userland/containers/mkv/CMakeLists.txt index 0c31a30c04..dc45ae9fe4 100644 --- a/gfx/include/userland/containers/mkv/CMakeLists.txt +++ b/gfx/include/userland/containers/mkv/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_mkv ${LIBRARY_TYPE} matroska_reader.c) target_link_libraries(reader_mkv containers) install(TARGETS reader_mkv DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/mkv/matroska_reader.c b/gfx/include/userland/containers/mkv/matroska_reader.c index 8625d0ce01..995d44b38c 100644 --- a/gfx/include/userland/containers/mkv/matroska_reader.c +++ b/gfx/include/userland/containers/mkv/matroska_reader.c @@ -1205,7 +1205,7 @@ static VC_CONTAINER_STATUS_T mkv_read_element_track_entry( VC_CONTAINER_T *p_ctx { unsigned int sync_extension_type = 0x2B7; samplerate = track_module->es_type.audio.output_sampling_frequency; - for(samplerate_idx = 0; samplerate_idx < 13; samplerate_idx++) + for(samplerate_idx = 0; samplerate_idx < 13; samplerate_idx++) if(sample_rates[samplerate_idx] == samplerate) break; extra[2] = (sync_extension_type >> 3) & 0xFF; extra[3] = ((sync_extension_type & 0x7) << 5) | 5; @@ -1411,7 +1411,7 @@ static VC_CONTAINER_STATUS_T mkv_read_subelements_audio( VC_CONTAINER_T *p_ctx, if(id == MKV_ELEMENT_ID_OUTPUT_SAMPLING_FREQUENCY) track_module->es_type.audio.output_sampling_frequency = fvalue; - + return status; } diff --git a/gfx/include/userland/containers/mp4/CMakeLists.txt b/gfx/include/userland/containers/mp4/CMakeLists.txt index 87892c2b7a..9ab8c4a4f4 100644 --- a/gfx/include/userland/containers/mp4/CMakeLists.txt +++ b/gfx/include/userland/containers/mp4/CMakeLists.txt @@ -16,4 +16,3 @@ add_library(writer_mp4 ${LIBRARY_TYPE} mp4_writer.c) target_link_libraries(writer_mp4 containers) install(TARGETS writer_mp4 DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/mp4/mp4_reader.c b/gfx/include/userland/containers/mp4/mp4_reader.c index 08341f551e..962cf9c959 100644 --- a/gfx/include/userland/containers/mp4/mp4_reader.c +++ b/gfx/include/userland/containers/mp4/mp4_reader.c @@ -1413,7 +1413,7 @@ static VC_CONTAINER_STATUS_T mp4_read_sample_header( VC_CONTAINER_T *p_ctx, uint state->status = VC_CONTAINER_SUCCESS; /* This isn't a critical error */ } - state->keyframe = + state->keyframe = track_module->sample_table[MP4_SAMPLE_TABLE_STSS].entries && state->sample == state->next_sync_sample; if(state->keyframe) diff --git a/gfx/include/userland/containers/mpeg/CMakeLists.txt b/gfx/include/userland/containers/mpeg/CMakeLists.txt index 5afe585f58..a8d164b81f 100644 --- a/gfx/include/userland/containers/mpeg/CMakeLists.txt +++ b/gfx/include/userland/containers/mpeg/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_ps ${LIBRARY_TYPE} ps_reader.c) target_link_libraries(reader_ps containers) install(TARGETS reader_ps DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/mpeg/ps_reader.c b/gfx/include/userland/containers/mpeg/ps_reader.c index 13943008c3..d7084dc4ed 100644 --- a/gfx/include/userland/containers/mpeg/ps_reader.c +++ b/gfx/include/userland/containers/mpeg/ps_reader.c @@ -62,10 +62,10 @@ typedef struct VC_CONTAINER_TRACK_MODULE_T /** Sub-stream id (for private_stream_1 only) */ uint32_t substream_id; - + /** PES packet payload offset (for private_stream_1) */ unsigned int payload_offset; - + uint8_t extradata[PS_EXTRADATA_MAX]; } VC_CONTAINER_TRACK_MODULE_T; @@ -74,7 +74,7 @@ typedef struct VC_CONTAINER_MODULE_T { /** Logging indentation level */ uint32_t level; - + /** Track data */ int tracks_num; VC_CONTAINER_TRACK_T *tracks[PS_TRACKS_MAX]; @@ -91,11 +91,11 @@ typedef struct VC_CONTAINER_MODULE_T /** The first system_clock_reference value we've seen, in (27MHz ticks) */ int64_t scr_offset; - + /** Most recent system_clock_reference value we've seen, in (27MHz ticks) */ int64_t scr; - /** Global offset we add to PES timestamps to make them zero based and + /** Global offset we add to PES timestamps to make them zero based and to work around discontinuity in the system_clock_reference */ int64_t scr_bias; @@ -104,10 +104,10 @@ typedef struct VC_CONTAINER_MODULE_T /** Offset to the most recent pack start code we've seen */ uint64_t pack_offset; - - /** Program stream mux rate is often incorrect or fixed to 25200 (10.08 + + /** Program stream mux rate is often incorrect or fixed to 25200 (10.08 Mbit/s) which yields inaccurate duration estimate for most files. We - maintain a moving average data rate (in units of bytes/second) based + maintain a moving average data rate (in units of bytes/second) based on the system_clock_reference to give better estimates. */ int64_t data_rate; @@ -117,7 +117,7 @@ typedef struct VC_CONTAINER_MODULE_T int64_t packet_pts; int64_t packet_dts; int packet_track; - + } VC_CONTAINER_MODULE_T; /****************************************************************************** @@ -142,7 +142,7 @@ static VC_CONTAINER_TRACK_T *ps_find_track( VC_CONTAINER_T *ctx, uint32_t stream unsigned int i; for(i = 0; i < ctx->tracks_num; i++) - if(ctx->tracks[i]->priv->module->stream_id == stream_id && + if(ctx->tracks[i]->priv->module->stream_id == stream_id && ctx->tracks[i]->priv->module->substream_id == substream_id) break; if(i < ctx->tracks_num) /* We found it */ @@ -178,7 +178,7 @@ STATIC_INLINE VC_CONTAINER_STATUS_T ps_find_start_code( VC_CONTAINER_T *ctx, uin if(PEEK_BYTES(ctx, buffer, 4) < 4) return VC_CONTAINER_ERROR_EOS; - if(buffer[0] == 0x0 && buffer[1] == 0x0 && buffer[2] == 0x1 && buffer[3] >= 0xB9) + if(buffer[0] == 0x0 && buffer[1] == 0x0 && buffer[2] == 0x1 && buffer[3] >= 0xB9) break; if (SKIP_BYTES(ctx, 1) != 1) @@ -190,7 +190,7 @@ STATIC_INLINE VC_CONTAINER_STATUS_T ps_find_start_code( VC_CONTAINER_T *ctx, uin if (buffer[3] == 0xB9) /* MPEG_program_end_code */ return VC_CONTAINER_ERROR_EOS; - + return VC_CONTAINER_SUCCESS; } @@ -250,7 +250,7 @@ static VC_CONTAINER_STATUS_T ps_read_pack_header( VC_CONTAINER_T *ctx ) if(_READ_U32(ctx) != 0x1BA) return VC_CONTAINER_ERROR_CORRUPTED; LOG_FORMAT(ctx, "pack_header"); - + module->level++; if (PEEK_U8(ctx) & 0x40) /* program stream */ @@ -292,7 +292,7 @@ static VC_CONTAINER_STATUS_T ps_read_pack_header( VC_CONTAINER_T *ctx ) } if ((status = STREAM_STATUS(ctx)) != VC_CONTAINER_SUCCESS) return status; - + module->level--; /* Set or update system_clock_reference, adjust bias if necessary */ @@ -339,7 +339,7 @@ static VC_CONTAINER_STATUS_T ps_read_pack_header( VC_CONTAINER_T *ctx ) } /*****************************************************************************/ -static void ps_get_stream_coding( VC_CONTAINER_T *ctx, unsigned int stream_id, +static void ps_get_stream_coding( VC_CONTAINER_T *ctx, unsigned int stream_id, VC_CONTAINER_ES_TYPE_T *p_type, VC_CONTAINER_FOURCC_T *p_codec, VC_CONTAINER_FOURCC_T *p_variant) { @@ -364,10 +364,10 @@ static void ps_get_stream_coding( VC_CONTAINER_T *ctx, unsigned int stream_id, type = VC_CONTAINER_ES_TYPE_AUDIO; codec = VC_CONTAINER_CODEC_MPGA; variant = VC_CONTAINER_VARIANT_MPGA_L2; - } + } /* FIXME: PRIVATE_EVOB_PES_PACKET with stream_id 0xFD ? */ - + *p_type = type; *p_codec = codec; *p_variant = variant; @@ -377,7 +377,7 @@ static void ps_get_stream_coding( VC_CONTAINER_T *ctx, unsigned int stream_id, static int64_t ps_pes_time_to_us( VC_CONTAINER_T *ctx, int64_t time ) { VC_CONTAINER_MODULE_T *module = ctx->priv->module; - + if (time == VC_CONTAINER_TIME_UNKNOWN) return VC_CONTAINER_TIME_UNKNOWN; @@ -387,7 +387,7 @@ static int64_t ps_pes_time_to_us( VC_CONTAINER_T *ctx, int64_t time ) /* Can't have valid bias without known system_clock_reference */ vc_container_assert(module->scr != VC_CONTAINER_TIME_UNKNOWN); - + /* 90kHz (PES) clock --> (zero based) 27MHz system clock --> microseconds */ return (INT64_C(300) * time + module->scr_bias) / INT64_C(27); } @@ -443,7 +443,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_time( VC_CONTAINER_T *ctx, if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; pts |= BITS_READ_U32(ctx, &bits, 15, "PTS [14..0]"); if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; - + /* DTS */ if(BITS_READ_U32(ctx, &bits, 4, "'0001' marker bits") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; dts = BITS_READ_U32(ctx, &bits, 3, "DTS [32..30]") << 30; @@ -463,9 +463,9 @@ static VC_CONTAINER_STATUS_T ps_read_pes_time( VC_CONTAINER_T *ctx, { status = VC_CONTAINER_ERROR_NOT_FOUND; } - + *p_length = *p_length - length; - + return status; } @@ -493,14 +493,14 @@ static VC_CONTAINER_STATUS_T ps_read_pes_extension( VC_CONTAINER_T *ctx, extension2 = BITS_READ_U32(ctx, &bits, 1, "PES_extension_flag_2"); length -= 1; - if (pes_private_data) + if (pes_private_data) { if(length < 16) return VC_CONTAINER_ERROR_CORRUPTED; SKIP_BYTES(ctx, 16); /* PES_private_data */ length -= 16; } - if (pack_header) + if (pack_header) { unsigned int pack_field_len; if(length < 1) return VC_CONTAINER_ERROR_CORRUPTED; @@ -525,7 +525,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_extension( VC_CONTAINER_T *ctx, length -= 2; } - if (pstd_buffer) + if (pstd_buffer) { if(length < 2) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 2) != 2) return VC_CONTAINER_ERROR_EOS; @@ -540,16 +540,16 @@ static VC_CONTAINER_STATUS_T ps_read_pes_extension( VC_CONTAINER_T *ctx, if (extension2) { uint8_t ext_field_len; - + if(length < 1) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, &ext_field_len, 1) != 1) return VC_CONTAINER_ERROR_EOS; length -= 1; if((ext_field_len & 0x80) != 0x80) return VC_CONTAINER_ERROR_CORRUPTED; /* marker_bit */ - ext_field_len &= ~0x80; + ext_field_len &= ~0x80; LOG_FORMAT(ctx, "PES_extension_field_length %d", ext_field_len); - for (i = 0; i < ext_field_len; i++) + for (i = 0; i < ext_field_len; i++) { SKIP_U8(ctx, "reserved"); length--; @@ -557,7 +557,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_extension( VC_CONTAINER_T *ctx, } ctx->priv->module->level--; - + *p_length = *p_length - length; /* Number of bytes read from stream */ return VC_CONTAINER_SUCCESS; @@ -572,17 +572,17 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, uint32_t size, length = *p_length; unsigned int pts_dts; uint8_t header[10]; - + if(length < 3) return VC_CONTAINER_ERROR_CORRUPTED; - + if ((PEEK_U8(ctx) & 0xC0) == 0x80) /* program stream */ { unsigned int escr, es_rate, dsm_trick_mode, additional_copy_info, pes_crc, pes_extension; unsigned int header_length; - + if(READ_BYTES(ctx, header, 3) != 3) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 3); - + if (BITS_READ_U32(ctx, &bits, 2, "'10' marker bits") != 0x2) return VC_CONTAINER_ERROR_CORRUPTED; BITS_SKIP(ctx, &bits, 2, "PES_scrambling_control"); BITS_SKIP(ctx, &bits, 1, "PES_priority"); @@ -609,12 +609,12 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, { /* Elementary stream clock reference */ int64_t escr; - + ctx->priv->module->level++; if(length < 6) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 6) != 6) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 6); - + BITS_SKIP(ctx, &bits, 2, "reserved_bits"); escr = BITS_READ_U32(ctx, &bits, 3, "ESCR_base [32..30]") << 30; if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; @@ -624,35 +624,35 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; BITS_READ_U32(ctx, &bits, 9, "ESCR_extension"); if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; - + LOG_FORMAT(ctx, "ESCR_base %"PRId64, escr); length -= 6; header_length -= 6; ctx->priv->module->level--; } - - if (es_rate) + + if (es_rate) { /* Elementary stream rate */ if(length < 3) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 3) != 3) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 3); - + if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; BITS_READ_U32(ctx, &bits, 22, "ES_rate"); if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; length -= 3; header_length -= 3; } - + if (dsm_trick_mode) { unsigned int trick_mode; - + if(length < 1) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 1) != 1) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 1); - + trick_mode = BITS_READ_U32(ctx, &bits, 3, "trick_mode_control"); if (trick_mode == 0x0 /* fast_forward */) { @@ -660,7 +660,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, BITS_SKIP(ctx, &bits, 1, "intra_slice_refresh"); BITS_SKIP(ctx, &bits, 2, "frequency_truncation"); } - else if (trick_mode == 0x1 /* slow_motion */) + else if (trick_mode == 0x1 /* slow_motion */) { BITS_SKIP(ctx, &bits, 5, "rep_cntrl"); } @@ -679,31 +679,31 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, BITS_SKIP(ctx, &bits, 5, "rep_cntrl"); else BITS_SKIP(ctx, &bits, 5, "5 reserved_bits"); - + length -= 1; header_length -= 1; } - + if (additional_copy_info) { if(length < 1) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 1) != 1) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 1); - + if(BITS_READ_U32(ctx, &bits, 1, "marker_bit") != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; BITS_SKIP(ctx, &bits, 7, "additional_copy_info"); - + length -= 1; header_length -= 1; } - - if (pes_crc) + + if (pes_crc) { SKIP_U16(ctx, "previous_PES_packet_CRC"); length -= 2; header_length -= 2; } - + if (pes_extension) { size = length; @@ -711,7 +711,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, length -= size; header_length -= size; } - + if (header_length <= length) { SKIP_BYTES(ctx, header_length); /* header stuffing */ @@ -727,7 +727,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, SKIP_U8(ctx, "stuffing"); length--; } - + if (length == 0) return VC_CONTAINER_ERROR_CORRUPTED; if ((PEEK_U8(ctx) & 0xC0) == 0x40) @@ -741,7 +741,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet_header( VC_CONTAINER_T *ctx, pts_dts = (PEEK_U8(ctx) & 0x30) >> 4; size = length; status = ps_read_pes_time(ctx, &size, pts_dts, p_pts, p_dts); - if (status && status != VC_CONTAINER_ERROR_NOT_FOUND) + if (status && status != VC_CONTAINER_ERROR_NOT_FOUND) return status; length -= size; @@ -766,7 +766,7 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_coding( VC_CONTAINER_T *ct VC_CONTAINER_FOURCC_T codec = VC_CONTAINER_CODEC_UNKNOWN; uint32_t length; uint8_t id = 0; - + length = *p_length; if(length < 1) return VC_CONTAINER_ERROR_CORRUPTED; @@ -779,18 +779,18 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_coding( VC_CONTAINER_T *ct { type = VC_CONTAINER_ES_TYPE_SUBPICTURE; codec = VC_CONTAINER_CODEC_UNKNOWN; - } - else if ((id >= 0x80 && id <= 0x87) || (id >= 0xC0 && id <= 0xCF)) + } + else if ((id >= 0x80 && id <= 0x87) || (id >= 0xC0 && id <= 0xCF)) { type = VC_CONTAINER_ES_TYPE_AUDIO; codec = VC_CONTAINER_CODEC_AC3; - } - else if ((id >= 0x88 && id <= 0x8F) || (id >= 0x98 && id <= 0x9F)) + } + else if ((id >= 0x88 && id <= 0x8F) || (id >= 0x98 && id <= 0x9F)) { type = VC_CONTAINER_ES_TYPE_AUDIO; codec = VC_CONTAINER_CODEC_DTS; - } - else if (id >= 0xA0 && id <= 0xBF) + } + else if (id >= 0xA0 && id <= 0xBF) { type = VC_CONTAINER_ES_TYPE_AUDIO; codec = VC_CONTAINER_CODEC_PCM_SIGNED; @@ -799,12 +799,12 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_coding( VC_CONTAINER_T *ct { LOG_FORMAT(ctx, "Unknown private_stream_1 byte: 0x%x (%u)", id, id); } - + *substream_id = id; *p_type = type; *p_codec = codec; *p_length = length; - + return VC_CONTAINER_SUCCESS; } @@ -819,13 +819,13 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_format( VC_CONTAINER_T *ct { static const unsigned fs_tab[4] = { 48000, 96000, 44100, 32000 }; static const unsigned bps_tab[] = {16, 20, 24, 0}; - + unsigned fs, bps, nchan; - + if(*length < 6) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 6) != 6) return VC_CONTAINER_ERROR_EOS; BITS_INIT(ctx, &bits, header, 6); - + BITS_SKIP(ctx, &bits, 8, "???"); BITS_SKIP(ctx, &bits, 8, "???"); BITS_SKIP(ctx, &bits, 8, "???"); @@ -838,11 +838,11 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_format( VC_CONTAINER_T *ct BITS_SKIP(ctx, &bits, 1, "reserved"); nchan = BITS_READ_U32(ctx, &bits, 3, "channels"); *length -= 6; - + format->type->audio.sample_rate = fs_tab[fs]; format->type->audio.bits_per_sample = bps_tab[bps]; format->type->audio.channels = nchan + 1; - format->type->audio.block_align = + format->type->audio.block_align = (format->type->audio.channels * format->type->audio.bits_per_sample + 7 ) / 8; } else @@ -853,7 +853,7 @@ static VC_CONTAINER_STATUS_T ps_read_private_stream_1_format( VC_CONTAINER_T *ct SKIP_U8(ctx, "start pos lo"); *length -= 3; } - + return STREAM_STATUS(ctx); } @@ -869,7 +869,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet( VC_CONTAINER_T *ctx ) VC_CONTAINER_FOURCC_T codec, variant = 0; VC_CONTAINER_TRACK_T *track; int64_t pts, dts; - + if(_READ_U24(ctx) != 0x1) return VC_CONTAINER_ERROR_CORRUPTED; if(READ_BYTES(ctx, header, 3) != 3) return VC_CONTAINER_ERROR_EOS; LOG_FORMAT(ctx, "pes_packet_header"); @@ -888,7 +888,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet( VC_CONTAINER_T *ctx ) goto skip; /* Parse PES packet header */ - if ((status = ps_read_pes_packet_header(ctx, &length, &pts, &dts)) != VC_CONTAINER_SUCCESS) + if ((status = ps_read_pes_packet_header(ctx, &length, &pts, &dts)) != VC_CONTAINER_SUCCESS) return status; /* For private_stream_1, encoding format is stored in the payload */ @@ -903,7 +903,7 @@ static VC_CONTAINER_STATUS_T ps_read_pes_packet( VC_CONTAINER_T *ctx ) /* Check that we know what to do with this track */ if(type == VC_CONTAINER_ES_TYPE_UNKNOWN || codec == VC_CONTAINER_CODEC_UNKNOWN) goto skip; - + track = ps_find_track(ctx, stream_id, substream_id, module->searching_tracks); if(!track) goto skip; @@ -1049,7 +1049,7 @@ error: ctx->priv->module->scr = VC_CONTAINER_TIME_UNKNOWN; ctx->priv->module->scr_bias = -module->scr_offset; } - + return status; } @@ -1061,7 +1061,7 @@ static VC_CONTAINER_STATUS_T ps_reader_seek( VC_CONTAINER_T *ctx, VC_CONTAINER_STATUS_T status = VC_CONTAINER_SUCCESS; uint64_t seekpos, position; int64_t scr; - + VC_CONTAINER_PARAM_UNUSED(flags); if (mode != VC_CONTAINER_SEEK_MODE_TIME || !STREAM_SEEKABLE(ctx)) @@ -1203,7 +1203,7 @@ resync: { if(ps_find_start_code(ctx, buffer) != VC_CONTAINER_SUCCESS) break; - + if (buffer[3] == 0xBA) { if (ps_read_pack_header(ctx) == VC_CONTAINER_SUCCESS) @@ -1221,11 +1221,11 @@ resync: } ctx->duration = (INT64_C(1000000) * module->data_size) / (module->data_rate); - + if (module->scr > module->scr_offset) { int64_t delta = (module->scr - module->scr_offset) / INT64_C(27); - + if (delta > ctx->duration) ctx->duration = delta; } diff --git a/gfx/include/userland/containers/mpga/CMakeLists.txt b/gfx/include/userland/containers/mpga/CMakeLists.txt index 79cf39a344..6b3cae93e8 100644 --- a/gfx/include/userland/containers/mpga/CMakeLists.txt +++ b/gfx/include/userland/containers/mpga/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_mpga ${LIBRARY_TYPE} mpga_reader.c) target_link_libraries(reader_mpga containers) install(TARGETS reader_mpga DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/mpga/mpga_reader.c b/gfx/include/userland/containers/mpga/mpga_reader.c index da5df83c69..9e0dd55b3d 100644 --- a/gfx/include/userland/containers/mpga/mpga_reader.c +++ b/gfx/include/userland/containers/mpga/mpga_reader.c @@ -46,8 +46,8 @@ Defines and constants. #define MPGA_XING_HAS_QUALITY 0x00000008 #define MPGA_MAX_BAD_FRAMES 4096 /*< Maximum number of failed byte-wise syncs, - should be at least 2881+4 to cover the largest - frame size (MPEG2.5 Layer 2, 160kbit/s 8kHz) + should be at least 2881+4 to cover the largest + frame size (MPEG2.5 Layer 2, 160kbit/s 8kHz) + next frame header */ static const unsigned int mpga_sample_rate_adts[16] = @@ -60,7 +60,7 @@ static const GUID_T asf_guid_header = Type definitions ******************************************************************************/ typedef struct VC_CONTAINER_MODULE_T -{ +{ VC_CONTAINER_TRACK_T *track; uint64_t data_offset; uint64_t data_size; @@ -73,11 +73,11 @@ typedef struct VC_CONTAINER_MODULE_T /* MPEG audio header information */ unsigned int version; /**< 1 for MPEG1, 2 for MPEG2, etc. */ unsigned int layer; - + /* VBR header information */ uint8_t xing_toc[100]; int xing_toc_valid; - + /* Per-frame state (updated upon a read or a seek) */ unsigned int frame_size; unsigned int frame_data_left; @@ -109,12 +109,12 @@ static uint32_t PEEK_BYTES_AT( VC_CONTAINER_T *p_ctx, int64_t offset, uint8_t *b int64_t current_position = STREAM_POSITION(p_ctx); SEEK(p_ctx, current_position + offset); ret = PEEK_BYTES(p_ctx, buffer, size); - SEEK(p_ctx, current_position); + SEEK(p_ctx, current_position); return ret; } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T mpga_check_frame_header( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T mpga_check_frame_header( VC_CONTAINER_T *p_ctx, VC_CONTAINER_MODULE_T *module, uint8_t frame_header[MPGA_HEADER_SIZE] ) { VC_CONTAINER_PARAM_UNUSED(p_ctx); @@ -199,7 +199,7 @@ static int64_t mpga_calculate_frame_time( VC_CONTAINER_T *p_ctx ) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; int64_t time; - time = INT64_C(1000000) * module->frame_index * + time = INT64_C(1000000) * module->frame_index * module->frame_size_samples / module->sample_rate; return time; } @@ -216,15 +216,15 @@ static VC_CONTAINER_STATUS_T mpga_read_vbr_headers( VC_CONTAINER_T *p_ctx ) /* Look for XING header (immediately after layer 3 side information) */ offset = (module->version == 1) ? ((module->channels == 1) ? INT64_C(21) : INT64_C(36)) : ((module->channels == 1) ? INT64_C(13) : INT64_C(21)); - + if (PEEK_BYTES_AT(p_ctx, offset, (uint8_t*)peek_buf, 4) != 4) return VC_CONTAINER_ERROR_FORMAT_INVALID; /* File would be way too small */ - if (peek_buf[0] == VC_FOURCC('X','i','n','g') || peek_buf[0] == VC_FOURCC('I','n','f','o')) + if (peek_buf[0] == VC_FOURCC('X','i','n','g') || peek_buf[0] == VC_FOURCC('I','n','f','o')) { uint32_t flags = 0, num_frames = 0, data_size = 0; - /* If the first frame has a XING header then we know it's a valid (but empty) audio + /* If the first frame has a XING header then we know it's a valid (but empty) audio frame so we safely parse the header whilst skipping to the next frame */ SKIP_BYTES(p_ctx, offset); /* FIXME: we don't care about layer 3 side information? */ @@ -236,7 +236,7 @@ static VC_CONTAINER_STATUS_T mpga_read_vbr_headers( VC_CONTAINER_T *p_ctx ) if (flags & MPGA_XING_HAS_BYTES) data_size = READ_U32(p_ctx, "XING bytes"); - + if (flags & MPGA_XING_HAS_TOC) { READ_BYTES(p_ctx, module->xing_toc, sizeof(module->xing_toc)); @@ -245,22 +245,22 @@ static VC_CONTAINER_STATUS_T mpga_read_vbr_headers( VC_CONTAINER_T *p_ctx ) /* Ensure time zero points to first frame even if TOC is broken */ module->xing_toc[0] = 0; } - + if (flags & MPGA_XING_HAS_QUALITY) SKIP_U32(p_ctx, "XING quality"); module->data_size = data_size; module->num_frames = num_frames; - + if (module->num_frames && module->data_size) { /* We can calculate average bitrate */ module->bitrate = module->data_size * module->sample_rate * 8 / (module->num_frames * module->frame_size_samples); } - + p_ctx->duration = (module->num_frames * module->frame_size_samples * 1000000LL) / module->sample_rate; - + /* Look for additional LAME header (follows XING) */ if (PEEK_BYTES(p_ctx, (uint8_t*)peek_buf, 4) != 4) return VC_CONTAINER_ERROR_FORMAT_INVALID; /* File would still be way too small */ @@ -288,13 +288,13 @@ static VC_CONTAINER_STATUS_T mpga_read_vbr_headers( VC_CONTAINER_T *p_ctx ) track->format->type->audio.gap_delay = (encoder_delay >> 12) + module->frame_size_samples; track->format->type->audio.gap_padding = encoder_delay & 0xfff; } - + SEEK(p_ctx, start); status = VC_CONTAINER_SUCCESS; } - + /* FIXME: if not success, try to read 'VBRI' header */ - + return status; } @@ -375,17 +375,17 @@ static VC_CONTAINER_STATUS_T mpga_reader_read( VC_CONTAINER_T *p_ctx, p_ctx->duration = MAX(p_ctx->duration, mpga_calculate_frame_time(p_ctx)); #endif } - + return status == VC_CONTAINER_SUCCESS ? STREAM_STATUS(p_ctx) : status; - + error: return status; } /*****************************************************************************/ -static VC_CONTAINER_STATUS_T mpga_reader_seek( VC_CONTAINER_T *p_ctx, +static VC_CONTAINER_STATUS_T mpga_reader_seek( VC_CONTAINER_T *p_ctx, int64_t *p_offset, - VC_CONTAINER_SEEK_MODE_T mode, + VC_CONTAINER_SEEK_MODE_T mode, VC_CONTAINER_SEEK_FLAGS_T flags) { VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; @@ -405,17 +405,17 @@ static VC_CONTAINER_STATUS_T mpga_reader_seek( VC_CONTAINER_T *p_ctx, { int64_t ppm; int percent, lower, upper, delta; - + ppm = (*p_offset * module->sample_rate) / (module->num_frames * module->frame_size_samples); ppm = MIN(ppm, INT64_C(999999)); - + percent = ppm / 10000; delta = ppm % 10000; - + lower = module->xing_toc[percent]; upper = percent < 99 ? module->xing_toc[percent + 1] : 256; - - seekpos = module->data_offset + + + seekpos = module->data_offset + (((module->data_size * lower) + (module->data_size * (upper - lower) * delta) / 10000) >> 8); } else @@ -431,12 +431,12 @@ static VC_CONTAINER_STATUS_T mpga_reader_seek( VC_CONTAINER_T *p_ctx, SEEK(p_ctx, seekpos); status = mpga_sync(p_ctx); - if (status && status != VC_CONTAINER_ERROR_EOS) + if (status && status != VC_CONTAINER_ERROR_EOS) goto error; - + module->frame_index = (*p_offset * module->num_frames + (p_ctx->duration >> 1)) / p_ctx->duration; module->frame_offset = STREAM_POSITION(p_ctx) - module->data_offset; - + *p_offset = module->frame_time_pos = mpga_calculate_frame_time(p_ctx); return STREAM_STATUS(p_ctx); @@ -456,7 +456,7 @@ static VC_CONTAINER_STATUS_T mpga_reader_close( VC_CONTAINER_T *p_ctx ) p_ctx->tracks = NULL; p_ctx->tracks_num = 0; free(module); - p_ctx->priv->module = 0; + p_ctx->priv->module = 0; return VC_CONTAINER_SUCCESS; } @@ -491,19 +491,19 @@ VC_CONTAINER_STATUS_T mpga_reader_open( VC_CONTAINER_T *p_ctx ) /* Allocate our context */ if ((module = malloc(sizeof(*module))) == NULL) { - status = VC_CONTAINER_ERROR_OUT_OF_MEMORY; - goto error; + status = VC_CONTAINER_ERROR_OUT_OF_MEMORY; + goto error; } memset(module, 0, sizeof(*module)); p_ctx->priv->module = module; p_ctx->tracks = &module->track; - + p_ctx->tracks[0] = vc_container_allocate_track(p_ctx, 0); if(!p_ctx->tracks[0]) { - status = VC_CONTAINER_ERROR_OUT_OF_MEMORY; - goto error; + status = VC_CONTAINER_ERROR_OUT_OF_MEMORY; + goto error; } p_ctx->tracks_num = 1; @@ -546,8 +546,8 @@ VC_CONTAINER_STATUS_T mpga_reader_open( VC_CONTAINER_T *p_ctx ) /* Look for VBR headers within the first frame */ status = mpga_read_vbr_headers(p_ctx); if (status && status != VC_CONTAINER_ERROR_NOT_FOUND) goto error; - - /* If we couldn't get this information from VBR headers, try to determine + + /* If we couldn't get this information from VBR headers, try to determine file size, bitrate, number of frames and duration */ if (!module->data_size) module->data_size = MAX(p_ctx->priv->io->size - module->data_offset, INT64_C(0)); @@ -556,10 +556,10 @@ VC_CONTAINER_STATUS_T mpga_reader_open( VC_CONTAINER_T *p_ctx ) { if (STREAM_SEEKABLE(p_ctx)) { - /* Scan past a few hundred frames (audio will often have + /* Scan past a few hundred frames (audio will often have silence in the beginning so we need to see more than just a few frames) and estimate bitrate */ - for (i = 0; i < 256; ++i) + for (i = 0; i < 256; ++i) if (mpga_reader_read(p_ctx, NULL, VC_CONTAINER_READ_FLAG_SKIP)) break; /* Seek back to start of data */ SEEK(p_ctx, module->data_offset); @@ -575,7 +575,7 @@ VC_CONTAINER_STATUS_T mpga_reader_open( VC_CONTAINER_T *p_ctx ) } track->format->bitrate = module->bitrate; - + if (!module->num_frames) { module->num_frames = (module->data_size * module->sample_rate * 8LL) / @@ -597,7 +597,7 @@ VC_CONTAINER_STATUS_T mpga_reader_open( VC_CONTAINER_T *p_ctx ) return VC_CONTAINER_SUCCESS; error: - if(status == VC_CONTAINER_SUCCESS || status == VC_CONTAINER_ERROR_EOS) + if(status == VC_CONTAINER_SUCCESS || status == VC_CONTAINER_ERROR_EOS) status = VC_CONTAINER_ERROR_FORMAT_INVALID; LOG_DEBUG(p_ctx, "error opening stream (%i)", status); if (p_ctx->tracks_num != 0) diff --git a/gfx/include/userland/containers/net/net_sockets.h b/gfx/include/userland/containers/net/net_sockets.h index e5a97a2cdd..58e05b263f 100644 --- a/gfx/include/userland/containers/net/net_sockets.h +++ b/gfx/include/userland/containers/net/net_sockets.h @@ -99,7 +99,6 @@ typedef uint32_t vc_container_net_open_flags_t; * Used with the VC_CONTAINER_NET_CONTROL_SET_READ_TIMEOUT_MS control operation. */ #define INFINITE_TIMEOUT_MS 0xFFFFFFFFUL - /** Opens a network socket instance. * The network address can be a host name, dotted IP4, hex IP6 address or NULL. Passing NULL * signifies the socket is either to be used as a datagram receiver or a stream server, @@ -206,7 +205,7 @@ size_t vc_container_net_maximum_datagram_size( VC_CONTAINER_NET_T *p_ctx ); * terminating NUL character. * Calling this function on a non-stream server instance, or one that is not * connected to a client, will result in an error status. - * + * * \param p_ctx The socket instance. * \param name Pointer where the name should be written. * \param name_len Maximum number of characters to write to name. @@ -217,7 +216,7 @@ vc_container_net_status_t vc_container_net_get_client_name( VC_CONTAINER_NET_T * * The port is written to the address in host order. * Calling this function on a non-stream server instance, or one that is not * connected to a client, will result in an error status. - * + * * \param p_ctx The socket instance. * \param port Pointer where the port should be written. * \return The status of the socket. */ @@ -225,7 +224,7 @@ vc_container_net_status_t vc_container_net_get_client_port( VC_CONTAINER_NET_T * /** Perform a control operation on the socket. * See vc_container_net_control_t for more details. - * + * * \param p_ctx The socket instance. * \param operation The control operation to perform. * \param args Variable list of additional arguments to the operation. diff --git a/gfx/include/userland/containers/net/net_sockets_common.c b/gfx/include/userland/containers/net/net_sockets_common.c index b3815f350a..3da3077f28 100644 --- a/gfx/include/userland/containers/net/net_sockets_common.c +++ b/gfx/include/userland/containers/net/net_sockets_common.c @@ -212,7 +212,7 @@ VC_CONTAINER_NET_T *vc_container_net_open( const char *address, const char *port { case STREAM_CLIENT: /* Simply connect to the given address/port */ - if (connect(sock, p->ai_addr, p->ai_addrlen) == SOCKET_ERROR) + if (connect(sock, p->ai_addr, p->ai_addrlen) == SOCKET_ERROR) status = vc_container_net_private_last_error(); break; diff --git a/gfx/include/userland/containers/net/net_sockets_priv.h b/gfx/include/userland/containers/net/net_sockets_priv.h index 41860836b6..a6a92a7fb5 100644 --- a/gfx/include/userland/containers/net/net_sockets_priv.h +++ b/gfx/include/userland/containers/net/net_sockets_priv.h @@ -48,7 +48,6 @@ typedef enum DATAGRAM_RECEIVER /**< UDP receiver */ } vc_container_net_type_t; - /** Perform implementation-specific per-socket initialization. * * \return VC_CONTAINER_NET_SUCCESS or one of the error codes on failure. */ diff --git a/gfx/include/userland/containers/qsynth/CMakeLists.txt b/gfx/include/userland/containers/qsynth/CMakeLists.txt index b188e50697..0823f4fcd5 100644 --- a/gfx/include/userland/containers/qsynth/CMakeLists.txt +++ b/gfx/include/userland/containers/qsynth/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_qsynth ${LIBRARY_TYPE} qsynth_reader.c) target_link_libraries(reader_qsynth containers) install(TARGETS reader_qsynth DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/qsynth/qsynth_reader.c b/gfx/include/userland/containers/qsynth/qsynth_reader.c index 06a9d54ec1..b44d51c06f 100644 --- a/gfx/include/userland/containers/qsynth/qsynth_reader.c +++ b/gfx/include/userland/containers/qsynth/qsynth_reader.c @@ -180,7 +180,7 @@ static VC_CONTAINER_STATUS_T qsynth_read_track(QSYNTH_SEGMENT_T *seg, uint32_t total_ticks = 0; uint32_t used = 8; uint8_t last = 0; - + *time = 0LL; *tempo_ticks = 0; @@ -200,11 +200,11 @@ static VC_CONTAINER_STATUS_T qsynth_read_track(QSYNTH_SEGMENT_T *seg, *us_perclock = new_tempo; *tempo_ticks = total_ticks; } - + if(end) break; } - + *ticks = total_ticks; return VC_CONTAINER_SUCCESS; } @@ -256,9 +256,9 @@ static VC_CONTAINER_STATUS_T qsynth_get_duration(VC_CONTAINER_T *p_ctx) if(READ_BYTES(p_ctx, dummy, sizeof(dummy)) != sizeof(dummy) || dummy[0] != 'M' || dummy[1] != 'T' || dummy[2] != 'r' || dummy[3] != 'k') return VC_CONTAINER_ERROR_FORMAT_INVALID; - + len = BI32(dummy+4); - + // impose a 1mb limit on track size if(len > (1<<20) || (*seg = malloc(sizeof(QSYNTH_SEGMENT_T) + 8 + len)) == NULL) return VC_CONTAINER_ERROR_OUT_OF_MEMORY; @@ -273,7 +273,7 @@ static VC_CONTAINER_STATUS_T qsynth_get_duration(VC_CONTAINER_T *p_ctx) return VC_CONTAINER_ERROR_FORMAT_INVALID; if((status = qsynth_read_track(*seg, &ticks, &time, &us_perclock, &tempo_ticks)) != VC_CONTAINER_SUCCESS) - return status; + return status; if(end_uspc == 0) { @@ -299,7 +299,6 @@ static VC_CONTAINER_STATUS_T qsynth_get_duration(VC_CONTAINER_T *p_ctx) return VC_CONTAINER_SUCCESS; } - /***************************************************************************** Functions exported as part of the Container Module API *****************************************************************************/ @@ -339,7 +338,7 @@ static VC_CONTAINER_STATUS_T qsynth_reader_read( VC_CONTAINER_T *p_ctx, // if we're playing then we can't really skip, but have to simulate a seek instead module->seek = 1; module->timestamp += 40; - } + } return VC_CONTAINER_SUCCESS; } @@ -383,7 +382,7 @@ static VC_CONTAINER_STATUS_T qsynth_reader_read( VC_CONTAINER_T *p_ctx, packet->data[1] = 0; packet->data[2] = 0; packet->data[3] = 0; - packet->data[4] = 40; + packet->data[4] = 40; module->timestamp += 40 * 1000; } } diff --git a/gfx/include/userland/containers/rcv/CMakeLists.txt b/gfx/include/userland/containers/rcv/CMakeLists.txt index 9407f582bc..d954c81173 100644 --- a/gfx/include/userland/containers/rcv/CMakeLists.txt +++ b/gfx/include/userland/containers/rcv/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_rcv ${LIBRARY_TYPE} rcv_reader.c) target_link_libraries(reader_rcv containers) install(TARGETS reader_rcv DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/rcv/rcv_reader.c b/gfx/include/userland/containers/rcv/rcv_reader.c index 4d4db27c7f..a940343c2e 100644 --- a/gfx/include/userland/containers/rcv/rcv_reader.c +++ b/gfx/include/userland/containers/rcv/rcv_reader.c @@ -43,7 +43,7 @@ Defines. /****************************************************************************** Type definitions ******************************************************************************/ -typedef struct { +typedef struct { unsigned int num_frames : 24; unsigned int constant_c5 : 8; int constant_4; @@ -93,7 +93,7 @@ static VC_CONTAINER_STATUS_T rcv_read_header(VC_CONTAINER_T *p_ctx) header.num_frames = LI24(dummy); header.constant_c5 = dummy[3]; header.constant_4 = LI32(dummy+4); - + // extradata is just struct_c from the header memcpy(module->extradata, dummy+8, 4); module->track->format->extradata = module->extradata; @@ -101,11 +101,11 @@ static VC_CONTAINER_STATUS_T rcv_read_header(VC_CONTAINER_T *p_ctx) module->track->format->type->video.height = LI32(dummy+12); module->track->format->type->video.width = LI32(dummy+16); - + header.constant_c = LI32(dummy+20); memcpy(header.struct_b, dummy+24, 8); header.framerate = LI32(dummy+32); - + if(header.constant_c5 != 0xc5 || header.constant_4 != 0x4 || header.constant_c != 0xc) return VC_CONTAINER_ERROR_FORMAT_NOT_SUPPORTED; @@ -238,7 +238,7 @@ static VC_CONTAINER_STATUS_T rcv_reader_read( VC_CONTAINER_T *p_ctx, { module->frame_read = 0; module->mid_frame = 0; - } + } return STREAM_STATUS(p_ctx); } @@ -252,7 +252,7 @@ static VC_CONTAINER_STATUS_T rcv_reader_read( VC_CONTAINER_T *p_ctx, module->frame_read = 0; module->mid_frame = 0; packet->flags |= VC_CONTAINER_PACKET_FLAG_FRAME_END; - } + } packet->size = size; return size ? VC_CONTAINER_SUCCESS : STREAM_STATUS(p_ctx); diff --git a/gfx/include/userland/containers/rtp/CMakeLists.txt b/gfx/include/userland/containers/rtp/CMakeLists.txt index e6ba3a95cb..61b7900bd6 100644 --- a/gfx/include/userland/containers/rtp/CMakeLists.txt +++ b/gfx/include/userland/containers/rtp/CMakeLists.txt @@ -14,4 +14,3 @@ add_library(reader_rtp ${LIBRARY_TYPE} ${rtp_SRCS}) target_link_libraries(reader_rtp containers) install(TARGETS reader_rtp DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/rtp/rtp_h264.c b/gfx/include/userland/containers/rtp/rtp_h264.c index e7f0f8320e..f7472208b8 100644 --- a/gfx/include/userland/containers/rtp/rtp_h264.c +++ b/gfx/include/userland/containers/rtp/rtp_h264.c @@ -800,4 +800,3 @@ VC_CONTAINER_STATUS_T h264_parameter_handler(VC_CONTAINER_T *p_ctx, return status; } - diff --git a/gfx/include/userland/containers/rtp/rtp_priv.h b/gfx/include/userland/containers/rtp/rtp_priv.h index c54bfe8f7e..e0703e1d29 100644 --- a/gfx/include/userland/containers/rtp/rtp_priv.h +++ b/gfx/include/userland/containers/rtp/rtp_priv.h @@ -91,7 +91,6 @@ typedef struct VC_CONTAINER_TRACK_MODULE_T #define BIT_IS_CLEAR(V, B) (!((V) & (1 << (B)))) /* }@ */ - /** Get a parameter's value as a decimal number. * * \param param_list The list of parameter name/value pairs. diff --git a/gfx/include/userland/containers/rtp/rtp_reader.c b/gfx/include/userland/containers/rtp/rtp_reader.c index 9ce4a595c5..65d05dcd0e 100644 --- a/gfx/include/userland/containers/rtp/rtp_reader.c +++ b/gfx/include/userland/containers/rtp/rtp_reader.c @@ -820,7 +820,6 @@ static VC_CONTAINER_STATUS_T l16_payload_handler(VC_CONTAINER_T *p_ctx, return status; } - /***************************************************************************** Utility functions for use by RTP payload handlers *****************************************************************************/ diff --git a/gfx/include/userland/containers/rtsp/CMakeLists.txt b/gfx/include/userland/containers/rtsp/CMakeLists.txt index 5c386f663b..483e3f36ee 100644 --- a/gfx/include/userland/containers/rtsp/CMakeLists.txt +++ b/gfx/include/userland/containers/rtsp/CMakeLists.txt @@ -11,4 +11,3 @@ add_library(reader_rtsp ${LIBRARY_TYPE} ${rtsp_SRCS}) target_link_libraries(reader_rtsp containers) install(TARGETS reader_rtsp DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/rv9/CMakeLists.txt b/gfx/include/userland/containers/rv9/CMakeLists.txt index f65a7af3e9..cc43712c71 100644 --- a/gfx/include/userland/containers/rv9/CMakeLists.txt +++ b/gfx/include/userland/containers/rv9/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_rv9 ${LIBRARY_TYPE} rv9_reader.c) target_link_libraries(reader_rv9 containers) install(TARGETS reader_rv9 DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/containers/rv9/rv9_reader.c b/gfx/include/userland/containers/rv9/rv9_reader.c index cb4ca4000b..01e383d6f8 100644 --- a/gfx/include/userland/containers/rv9/rv9_reader.c +++ b/gfx/include/userland/containers/rv9/rv9_reader.c @@ -145,16 +145,16 @@ static VC_CONTAINER_STATUS_T rv9_read_frame_header(VC_CONTAINER_T *p_ctx) { uint32_t valid_seg; uint32_t offset; - + valid_seg = BI32(buffer); offset = BI32(buffer+4); - + if (valid_seg && seg_offset > offset) seg_offset = offset; - + // this boolean field should have only 0 or 1 values if(valid_seg > 1) return VC_CONTAINER_ERROR_FORMAT_INVALID; - + buffer += 8; } } @@ -177,7 +177,7 @@ static uint32_t rv9_get_frame_data(VC_CONTAINER_T *p_ctx, uint32_t len, uint8_t VC_CONTAINER_MODULE_T *module = p_ctx->priv->module; uint32_t ret = 0; - // we may have read some data before into the data array, so + // we may have read some data before into the data array, so // check whether we've copied all this data out first. if(module->frame_read < module->data_len) { @@ -198,8 +198,8 @@ static uint32_t rv9_get_frame_data(VC_CONTAINER_T *p_ctx, uint32_t len, uint8_t ret += READ_BYTES(p_ctx, dest, len); else ret += SKIP_BYTES(p_ctx, len); - } - + } + module->frame_read += ret; return ret; } @@ -218,7 +218,7 @@ static VC_CONTAINER_STATUS_T rv9_reader_read( VC_CONTAINER_T *p_ctx, if(!module->mid_frame) { if((status = rv9_read_frame_header(p_ctx)) != VC_CONTAINER_SUCCESS) return status; - + module->mid_frame = 1; module->frame_read = 0; } @@ -238,7 +238,7 @@ static VC_CONTAINER_STATUS_T rv9_reader_read( VC_CONTAINER_T *p_ctx, { module->frame_read = 0; module->mid_frame = 0; - } + } return STREAM_STATUS(p_ctx); } @@ -252,7 +252,7 @@ static VC_CONTAINER_STATUS_T rv9_reader_read( VC_CONTAINER_T *p_ctx, module->frame_read = 0; module->mid_frame = 0; packet->flags |= VC_CONTAINER_PACKET_FLAG_FRAME_END; - } + } packet->size = size; return size ? VC_CONTAINER_SUCCESS : STREAM_STATUS(p_ctx); diff --git a/gfx/include/userland/containers/test/check_frame_int.c b/gfx/include/userland/containers/test/check_frame_int.c index 1819c47092..3cb4266f70 100644 --- a/gfx/include/userland/containers/test/check_frame_int.c +++ b/gfx/include/userland/containers/test/check_frame_int.c @@ -106,7 +106,6 @@ int main(int argc, char **argv) track->is_enabled = (track->format->es_type == VC_CONTAINER_ES_TYPE_VIDEO); } - LOG_DEBUG(0, "TEST start reading"); for(i = 0; !packets_num || (long)i < packets_num; i++) { @@ -345,4 +344,3 @@ static int container_test_info(VC_CONTAINER_T *ctx, bool b_reader) return 0; } - diff --git a/gfx/include/userland/containers/test/rtp_decoder.c b/gfx/include/userland/containers/test/rtp_decoder.c index c089576070..539bbd691f 100644 --- a/gfx/include/userland/containers/test/rtp_decoder.c +++ b/gfx/include/userland/containers/test/rtp_decoder.c @@ -116,7 +116,7 @@ static void dump_bytes(const uint8_t *buffer, size_t buffer_len) in_row = 0; } } - + if (in_row) { LOG_INFO(NULL, dump_str); @@ -131,13 +131,13 @@ static bool decode_packet(const uint8_t *buffer, size_t buffer_len) uint32_t timestamp; uint32_t ssrc; uint32_t csrc_count; - + if (buffer_len < 12) { LOG_ERROR(NULL, "Packet too small: basic header missing"); return false; } - + flags = buffer[0]; payload_type = buffer[1]; seq_num = network_to_host_16(buffer + 2); @@ -176,7 +176,7 @@ static bool decode_packet(const uint8_t *buffer, size_t buffer_len) if (csrc_count) { uint32_t ii; - + if (buffer_len < (csrc_count * 4)) { LOG_ERROR(NULL, "Packet too small: CSRCs missing"); @@ -204,20 +204,20 @@ static bool decode_packet(const uint8_t *buffer, size_t buffer_len) LOG_ERROR(NULL, "Packet too small: extension header missing"); return false; } - + extension_hdr = network_to_host_32(buffer); buffer += 4; buffer_len -= 4; - + extension_len = (size_t)(extension_hdr & EXTENSION_LENGTH_MASK); extension_id = extension_hdr >> EXTENSION_ID_SHIFT; - + if (buffer_len < extension_len) { LOG_ERROR(NULL, "Packet too small: extension content missing"); return false; } - + LOG_INFO(NULL, "Extension: 0x%4.4X (%u bytes)", extension_id, (unsigned)extension_len); dump_bytes(buffer, extension_len); buffer += extension_len; @@ -421,7 +421,7 @@ int main(int argc, char **argv) if (nb_char_available()) { - if (nb_get_char() == ESCAPE_CHARACTER) + if (nb_get_char() == ESCAPE_CHARACTER) ready = false; } diff --git a/gfx/include/userland/containers/test/stream_client.c b/gfx/include/userland/containers/test/stream_client.c index b1c015e9de..f2ec610bfa 100644 --- a/gfx/include/userland/containers/test/stream_client.c +++ b/gfx/include/userland/containers/test/stream_client.c @@ -38,7 +38,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Time in milliseconds to yield when nothing is happening */ #define YIELD_PERIOD_MS 33 - static vc_container_net_status_t local_net_control(VC_CONTAINER_NET_T *sock, vc_container_net_control_t operation, ...) { diff --git a/gfx/include/userland/containers/test/test_bits.c b/gfx/include/userland/containers/test/test_bits.c index 7ce1651dca..081ad7b0ad 100644 --- a/gfx/include/userland/containers/test/test_bits.c +++ b/gfx/include/userland/containers/test/test_bits.c @@ -62,7 +62,6 @@ static uint8_t exp_golomb_oversize[] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80 }; - static const char *plural_ext(uint32_t val) { return (val == 1) ? "" : "s"; diff --git a/gfx/include/userland/containers/test/test_uri.c b/gfx/include/userland/containers/test/test_uri.c index 05861826bb..ac0ae6f1a1 100644 --- a/gfx/include/userland/containers/test/test_uri.c +++ b/gfx/include/userland/containers/test/test_uri.c @@ -291,7 +291,6 @@ MERGE_URI_T test_merge_uris[] = { { "http:?q#f", "./", "http:" }, }; - /** Dump a URI structure to the log. * * \param uri URI structure to be dumped. */ diff --git a/gfx/include/userland/containers/wav/CMakeLists.txt b/gfx/include/userland/containers/wav/CMakeLists.txt index aed61c6815..52d79d3ae1 100644 --- a/gfx/include/userland/containers/wav/CMakeLists.txt +++ b/gfx/include/userland/containers/wav/CMakeLists.txt @@ -10,4 +10,3 @@ add_library(reader_wav ${LIBRARY_TYPE} wav_reader.c) target_link_libraries(reader_wav containers) install(TARGETS reader_wav DESTINATION ${VMCS_PLUGIN_DIR}) - diff --git a/gfx/include/userland/helpers/dtoverlay/dtoverlay.h b/gfx/include/userland/helpers/dtoverlay/dtoverlay.h index e26208f089..5363805036 100644 --- a/gfx/include/userland/helpers/dtoverlay/dtoverlay.h +++ b/gfx/include/userland/helpers/dtoverlay/dtoverlay.h @@ -71,7 +71,6 @@ typedef struct dtblob_struct int trailer_len; } DTBLOB_T; - typedef void DTOVERLAY_LOGGING_FUNC(dtoverlay_logging_type_t type, const char *fmt, va_list args); diff --git a/gfx/include/userland/helpers/vc_image/metadata_fourcc.h b/gfx/include/userland/helpers/vc_image/metadata_fourcc.h index 64bccf7631..888c0f7003 100644 --- a/gfx/include/userland/helpers/vc_image/metadata_fourcc.h +++ b/gfx/include/userland/helpers/vc_image/metadata_fourcc.h @@ -29,22 +29,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define _METADATA_FOURCC_H /****************************************************************************** -Definition of 4CCs assigned to metadata items. This list acts more as a -central repository of 4CCs for different metadata items so as to avoid clashes. +Definition of 4CCs assigned to metadata items. This list acts more as a +central repository of 4CCs for different metadata items so as to avoid clashes. They are not otherwise necessary for library to function correctly. ******************************************************************************/ /* - Note: Multi-character constants are not valid C and although supported by - some compilers such as Metaware, they are ambiguous in how they should be - packed into a long due to endian-ness (and also due to size for 2 and 3 + Note: Multi-character constants are not valid C and although supported by + some compilers such as Metaware, they are ambiguous in how they should be + packed into a long due to endian-ness (and also due to size for 2 and 3 character constants). */ typedef enum { - METADATA_CDI = ('C'<<24)+('D'<<16)+('M'<<8)+('D'), // 'CDMD' struct CDI_METADATA_T in /middleware/camplus/cdi/cdi.h - METADATA_CAM_CAL = ('C'<<24)+('C'<<16)+('A'<<8)+('L'), // 'CCAL' struct CAMERA_CALIBRATION_METADATA_T in /middleware/camplus/cdi/cdi.h + METADATA_CDI = ('C'<<24)+('D'<<16)+('M'<<8)+('D'), // 'CDMD' struct CDI_METADATA_T in /middleware/camplus/cdi/cdi.h + METADATA_CAM_CAL = ('C'<<24)+('C'<<16)+('A'<<8)+('L'), // 'CCAL' struct CAMERA_CALIBRATION_METADATA_T in /middleware/camplus/cdi/cdi.h METADATA_TIMING = ('T'<<24)+('I'<<16)+('M'<<8)+('E'), // 'TIME' struct TIMING_METADATA_T in /middleware/camplus/cdi/cdi.h METADATA_CDI_FILE = ( 0 <<24)+('C'<<16)+('D'<<8)+('F'), // '\x00CDF' struct CDI_FILE_METADATA_T in /middleware/camplus/cdi/cdi_file.h METADATA_CDI_RAW = ('C'<<24)+('D'<<16)+('R'<<8)+('W'), // 'CDRW' struct CDI_FILE_RAW_METADATA_T in /middleware/camplus/cdi/cdi_file_raw.h @@ -63,7 +63,7 @@ typedef enum { METADATA_ANTISHAKE = ('S'<<24)+('H'<<16)+('A'<<8)+('K'), // 'SHAK' struct SHAKE_METADATA_T defined in /middleware/camplus/sw/shake_metadata.h METADATA_RER = ( 0 <<24)+('R'<<16)+('E'<<8)+('R'), // '\x00RER' struct RER_METADATA_T defined in /middleware/camplus/sw/rer_metadata.h METADATA_SCENEDETECTION = ( 0 <<24)+('A'<<16)+('S'<<8)+('D'), // '\x00ASD' struct ASD_METADATA_T defined in /middleware/camplus/sw/asd_metadata.h - METADATA_TUNER_SYNC = ('S'<<24)+('Y'<<16)+('N'<<8)+('C'), // 'SYNC' NULL data, just adds the item header. + METADATA_TUNER_SYNC = ('S'<<24)+('Y'<<16)+('N'<<8)+('C'), // 'SYNC' NULL data, just adds the item header. METADATA_DARK_FRAME_CORRECT = ('D'<<24)+('F'<<16)+('R'<<8)+('C'), // 'DFRC' 5 byte literal string "dfrc" METADATA_DARK_FRAME_SUB = ('D'<<24)+('F'<<16)+('S'<<8)+('B'), // 'DFSB' 3 byte literal string "on" METADATA_TUNER_DROP_FRAME = ('T'<<24)+('D'<<16)+('R'<<8)+('P'), @@ -76,9 +76,8 @@ typedef enum { METADATA_IL_CAMERA_NAME = ('I'<<24)+('L'<<16)+('C'<<8)+('A'), // 'ILCA' METADATA_IL_CROP_RECTANGLE = ('I'<<24)+('L'<<16)+('C'<<8)+('R'), // 'ILCR' METADATA_IL_PIXEL_ASPECT_RATIO = ('I'<<24)+('L'<<16)+('P'<<8)+('A'), // 'ILPA' - - METADATA_TUNER_FLASH_MONITOR = ('F'<<24)+('L'<<16)+('M'<<8)+('N'), // 'FLMN' Flash monitor - type ISP_TUNER_BRCM_FLASH_MONITOR_T from isp_tuner_brcm.h + METADATA_TUNER_FLASH_MONITOR = ('F'<<24)+('L'<<16)+('M'<<8)+('N'), // 'FLMN' Flash monitor - type ISP_TUNER_BRCM_FLASH_MONITOR_T from isp_tuner_brcm.h // VoWIFI video analysis METADATA_SPATIAL_ACT_A = ( 'S'<<24)+('P'<<16)+('T'<<8)+('A'), // 'SPTA' : SPATIAL_ACTIVITY_METADATA_T defined in /middleware/camplus/sw/perceptual/spatial_activity.h @@ -88,7 +87,7 @@ typedef enum { METADATA_FLAT_AREA_A = ( 'F'<<24)+('L'<<16)+('T'<<8)+('A'), // 'FLTA' : FLAT_AREA_METADATA_T defined in /middleware/camplus/sw/perceptual/flatarea.h METADATA_STILL_AREA_A = ( 'S'<<24)+('T'<<16)+('L'<<8)+('A'), // 'STLA' : FLAT_AREA_METADATA_T defined in /middleware/camplus/sw/perceptual/stillarea.h METADATA_DDITHER_A = ( 'D'<<24)+('D'<<16)+('T'<<8)+('A'), // 'DDTA' : DDITHER_METADATA_T defined in /middleware/camplus/sw/perceptual/... - + METADATA_LINKED_MULTICHANN = ( 'I'<<24)+('L'<<16)+('M'<<8)+('C'), // 'ILMC' : VC_IMAGE_LINKED_MULTICHANN_T defined in /helpers/vc_image/vc_image.h METADATA_HDR = ( 0 <<24)+( 'H'<<16)+('D'<<8)+('R'), // 'HDR' : HDR_METADATA_T defined in /middleware/camplus/sw/hdr/hdr_metadata.h @@ -99,7 +98,7 @@ typedef enum { METADATA_SNAPSHOT_JPEG_QUANTISER = ('S'<<24)+('S'<<16)+('J'<<8) + ('S'), // 'SSJQ' : The size of the snapshot frame when JPEG-encoded. METADATA_SUPPLEMENTARY_INFO = ('S'<<24)+('U'<<16)+('P'<<8) + ('P'), // 'SUPP' : Supplimentary info defined in /codecs/video/hw/enc/venc_supplementary_info.h - + METADATA_UNKNOWN = ('U'<<24)+('N'<<16)+('K'<<8)+('N') // 'UNKN' } METADATA_CODE_T; diff --git a/gfx/include/userland/helpers/vc_image/vc_image.h b/gfx/include/userland/helpers/vc_image/vc_image.h index f566348b0c..d692bbc905 100644 --- a/gfx/include/userland/helpers/vc_image/vc_image.h +++ b/gfx/include/userland/helpers/vc_image/vc_image.h @@ -120,7 +120,6 @@ extern "C" { #define VC_IMAGE_PROPLIST_COUNT(x) (sizeof(x)/sizeof(x[0])) #define VC_IMAGE_PROPLIST_NULL ((VC_IMAGE_PROPLIST_T*)0) - /* Useful bits that can be set, to check validity we'll assume that all other bits should be zero and enforce this in vc_image functions to catch people who aren't initialising the VC_IMAGE_T structure nicely; update when other @@ -152,15 +151,13 @@ extern "C" { && ((y) + (h)) <= ((cont_y) + (cont_h)) \ ) - #if !defined __SYMBIAN32__ - /** * \brief storage for pointers to image headers of the previous and next channel * - * - * When linked-multichannel structure is being used, this structure stores the pointers + * + * When linked-multichannel structure is being used, this structure stores the pointers * necessary to link the current image header in to make represent a multichannel image. */ struct VC_IMAGE_LINKED_MULTICHANN_T { @@ -207,7 +204,6 @@ extern "C" { if (y_offset+height>dest_height) \ height-=y_offset+height-dest_height; \ - /* Publicly exported functions. */ /****************************************************************************** @@ -399,7 +395,6 @@ extern "C" { void vc_image_textrotate(VC_IMAGE_BUF_T *dest, int x_offset, int y_offset, int fg_colour, int bg_colour, const char *text, int rotate); - /* Line drawing. */ void vc_image_line(VC_IMAGE_BUF_T *dest, int x_start, int y_start, int x_end, int y_end, int fg_colour); @@ -608,7 +603,6 @@ extern "C" { void vc_image_decimate_stripe_h(VC_IMAGE_BUF_T *src, int offset, int step); void vc_image_decimate_stripe_v(VC_IMAGE_BUF_T *src, int offset, int step); - extern int vc_image_set_alpha(VC_IMAGE_BUF_T *image, const int x, const int y, @@ -739,7 +733,6 @@ void vc_image_difference( VC_IMAGE_BUF_T * const d, /* in/out * unsigned * const max_y, /* out */ unsigned * const max_uv /* out */ ); - /* ** The h.263 Annex J deblocker. ** ("dest" & "src" may point to the same storage.) @@ -758,7 +751,6 @@ void vc_image_clone_field(VC_IMAGE_T * image, int clone_top_field); #endif - /* RGBA32 colour macros */ #define RGBA_ALPHA_TRANSPARENT 0 #define RGBA_ALPHA_OPAQUE 255 @@ -774,7 +766,6 @@ void vc_image_clone_field(VC_IMAGE_T * image, int clone_top_field); #define RGBA32_PIXEL(r, g, b, a) ((a) >= 255 ? RGBA32_SPIXEL(r, g, b, a) : RGBA32_APIXEL(r, g, b, a)) #define RGBA32_ALPHA(rgba) ((unsigned long)rgba >> 24) - /* RGBA16 colour macros */ #define RGBA16_APIXEL(r, g, b, a) (((r) >> 4 << 12) | ((g) >> 4 << 8) | ((b) >> 4 << 4) | ((a) >> 4 << 0)) #define RGBA16_SPIXEL(r, g, b) (((r) >> 4 << 12) | ((g) >> 4 << 8) | ((b) >> 4 << 4) | 0x000F) diff --git a/gfx/include/userland/helpers/vc_image/vc_image_metadata.h b/gfx/include/userland/helpers/vc_image/vc_image_metadata.h index 9521e49849..e39e9c8b3b 100644 --- a/gfx/include/userland/helpers/vc_image/vc_image_metadata.h +++ b/gfx/include/userland/helpers/vc_image/vc_image_metadata.h @@ -42,11 +42,10 @@ typedef unsigned int VC_METADATA_TYPE_T; Metadata and item headers. ******************************************************************************/ typedef struct vc_metadata_item_s { - VC_METADATA_TYPE_T type; + VC_METADATA_TYPE_T type; int len; } VC_METADATA_ITEM_T; - typedef struct vc_metadata_header_s { int size; #ifdef VCMODS_LCC @@ -58,7 +57,6 @@ typedef struct vc_metadata_header_s { RTOS_LATCH_T latch; } VC_METADATA_HEADER_T; - /****************************************************************************** Public declarations. ******************************************************************************/ diff --git a/gfx/include/userland/host_applications/android/apps/vidtex/launcher.h b/gfx/include/userland/host_applications/android/apps/vidtex/launcher.h index 7169fa6332..af147b9e97 100644 --- a/gfx/include/userland/host_applications/android/apps/vidtex/launcher.h +++ b/gfx/include/userland/host_applications/android/apps/vidtex/launcher.h @@ -50,7 +50,7 @@ public: /** Run a function in a separate thread. * A separate thread is launched to run the function, and a native surface created for - * that application. + * that application. * @param name Application name. * @param run_app_fn Entry point function for application. * @param params Application-specific parameters. This will be bitwise copyable, and diff --git a/gfx/include/userland/host_applications/android/apps/vidtex/launcher_rpi.c b/gfx/include/userland/host_applications/android/apps/vidtex/launcher_rpi.c index f349836593..7b232554b9 100644 --- a/gfx/include/userland/host_applications/android/apps/vidtex/launcher_rpi.c +++ b/gfx/include/userland/host_applications/android/apps/vidtex/launcher_rpi.c @@ -74,7 +74,6 @@ int runApp(const char *name, RUN_APP_FN_T run_app_fn, const void *params, size_t EGL_DISPMANX_WINDOW_T win; (void) param_size; - vcos_log_trace("Initialsing BCM HOST"); bcm_host_init(); @@ -84,4 +83,3 @@ int runApp(const char *name, RUN_APP_FN_T run_app_fn, const void *params, size_t return run_app_fn(params, (EGLNativeWindowType *) &win); } - diff --git a/gfx/include/userland/host_applications/android/apps/vidtex/svp.h b/gfx/include/userland/host_applications/android/apps/vidtex/svp.h index 80c2151aac..a816342b85 100644 --- a/gfx/include/userland/host_applications/android/apps/vidtex/svp.h +++ b/gfx/include/userland/host_applications/android/apps/vidtex/svp.h @@ -138,7 +138,6 @@ void svp_stop(SVP_T *svp); */ void svp_get_stats(SVP_T *svp, SVP_STATS_T *stats); - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/host_applications/android/apps/vidtex/vidtex.c b/gfx/include/userland/host_applications/android/apps/vidtex/vidtex.c index c72a78c668..9ecc322c0b 100644 --- a/gfx/include/userland/host_applications/android/apps/vidtex/vidtex.c +++ b/gfx/include/userland/host_applications/android/apps/vidtex/vidtex.c @@ -431,7 +431,7 @@ static void vidtex_draw(VIDTEX_T *vt, void *video_frame) vcos_log_trace("Created EGL image %p for buf %p", image, video_frame); slot->video_frame = video_frame; slot->image = image; - } + } VIDTEX_CHECK_GL(vt); break; diff --git a/gfx/include/userland/host_applications/framework/common/host_ilcore.h b/gfx/include/userland/host_applications/framework/common/host_ilcore.h index d91a240377..a5a71ca171 100644 --- a/gfx/include/userland/host_applications/framework/common/host_ilcore.h +++ b/gfx/include/userland/host_applications/framework/common/host_ilcore.h @@ -76,4 +76,3 @@ OMX_ERRORTYPE OMX_GetDebugInformation ( #endif // HOST_ILCORE_H - diff --git a/gfx/include/userland/host_applications/framework/common/ilcore.c b/gfx/include/userland/host_applications/framework/common/ilcore.c index ebd13cc686..f75cdbf84c 100644 --- a/gfx/include/userland/host_applications/framework/common/ilcore.c +++ b/gfx/include/userland/host_applications/framework/common/ilcore.c @@ -40,7 +40,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "host_ilcore.h" - #ifdef WANT_OMX_NAME_MANGLE #define OMX_Deinit host_OMX_Deinit #define OMX_Init host_OMX_Init @@ -90,7 +89,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void) vcos_demand(status == VCOS_SUCCESS); vcos_mutex_lock(&lock); - + #ifdef WANT_LOCAL_OMX vc_OMX_Init(); // initialise local core first #endif @@ -153,11 +152,10 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void) #endif vcos_mutex_unlock(&lock); - + return OMX_ErrorNone; } - /* OMX_ComponentNameEnum */ OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( OMX_OUT OMX_STRING cComponentName, @@ -170,7 +168,6 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( return vcil_out_component_name_enum(ilcs_get_common(ilcs_service), cComponentName, nNameLength, nIndex); } - /* OMX_GetHandle */ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( OMX_OUT OMX_HANDLETYPE* pHandle, @@ -216,7 +213,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( if(eError != OMX_ErrorNone && pComp->ComponentDeInit) pComp->ComponentDeInit(hHandle); - } + } if (eError == OMX_ErrorNone) { eError = pComp->SetCallbacks(hHandle,pCallBacks,pAppData); @@ -230,7 +227,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( *pHandle = NULL; free(pComp); } - } + } if (eError == OMX_ErrorNone) { vcos_mutex_lock(&lock); @@ -347,7 +344,4 @@ OMX_ERRORTYPE OMX_GetDebugInformation ( return vcil_out_get_debug_information(ilcs_get_common(ilcs_service), debugInfo, pLen); } - - /* File EOF */ - diff --git a/gfx/include/userland/host_applications/linux/CMakeLists.txt b/gfx/include/userland/host_applications/linux/CMakeLists.txt index 928b637506..7c6c7211bd 100644 --- a/gfx/include/userland/host_applications/linux/CMakeLists.txt +++ b/gfx/include/userland/host_applications/linux/CMakeLists.txt @@ -20,4 +20,3 @@ if(ALL_APPS) add_subdirectory(apps/edid_parser) add_subdirectory(apps/hello_pi) endif() - diff --git a/gfx/include/userland/host_applications/linux/apps/dtoverlay/dtoverlay_main.c b/gfx/include/userland/host_applications/linux/apps/dtoverlay/dtoverlay_main.c index 4d71c351a0..dcfecdc121 100644 --- a/gfx/include/userland/host_applications/linux/apps/dtoverlay/dtoverlay_main.c +++ b/gfx/include/userland/host_applications/linux/apps/dtoverlay/dtoverlay_main.c @@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "dtoverlay.h" #include "utils.h" - #define CFG_DIR_1 "/sys/kernel/config" #define CFG_DIR_2 "/config" #define DT_SUBDIR "/device-tree" @@ -50,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define DTOVERLAY_PATH_MAX 128 #define DIR_MODE 0755 - enum { OPT_ADD, OPT_REMOVE, diff --git a/gfx/include/userland/host_applications/linux/apps/dtoverlay/utils.c b/gfx/include/userland/host_applications/linux/apps/dtoverlay/utils.c index 511efd9585..8cff5e0348 100644 --- a/gfx/include/userland/host_applications/linux/apps/dtoverlay/utils.c +++ b/gfx/include/userland/host_applications/linux/apps/dtoverlay/utils.c @@ -272,7 +272,6 @@ int run_cmd(const char *fmt, ...) return ret; } - /* Not thread safe */ void free_string(const char *string) { diff --git a/gfx/include/userland/host_applications/linux/apps/gencmd/CMakeLists.txt b/gfx/include/userland/host_applications/linux/apps/gencmd/CMakeLists.txt index f95d1a1b7c..68c1f20bb5 100644 --- a/gfx/include/userland/host_applications/linux/apps/gencmd/CMakeLists.txt +++ b/gfx/include/userland/host_applications/linux/apps/gencmd/CMakeLists.txt @@ -7,7 +7,7 @@ else () add_definitions(-Wall -Werror) endif () -include_directories( ../../../.. +include_directories( ../../../.. ../../../../interface/vcos ../../../../interface/vcos/${VCOS_PLATFORM} ) @@ -17,4 +17,3 @@ include_directories( ../../../.. add_executable(vcgencmd gencmd.c) target_link_libraries(vcgencmd vcos vchiq_arm vchostif) install(TARGETS vcgencmd RUNTIME DESTINATION bin) - diff --git a/gfx/include/userland/host_applications/linux/apps/gencmd/gencmd.c b/gfx/include/userland/host_applications/linux/apps/gencmd/gencmd.c index 9b48cf9025..03846331a0 100644 --- a/gfx/include/userland/host_applications/linux/apps/gencmd/gencmd.c +++ b/gfx/include/userland/host_applications/linux/apps/gencmd/gencmd.c @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /* ---- Include Files ---------------------------------------------------- */ #include @@ -144,4 +143,3 @@ int main( int argc, char **argv ) return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/Makefile.include b/gfx/include/userland/host_applications/linux/apps/hello_pi/Makefile.include index fecf555423..f0258aba58 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/Makefile.include +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/Makefile.include @@ -8,11 +8,11 @@ INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/v all: $(BIN) $(LIB) %.o: %.c - @rm -f $@ + @rm -f $@ $(CC) $(CFLAGS) $(INCLUDES) -g -c $< -o $@ -Wno-deprecated-declarations %.o: %.cpp - @rm -f $@ + @rm -f $@ $(CXX) $(CFLAGS) $(INCLUDES) -g -c $< -o $@ -Wno-deprecated-declarations %.bin: $(OBJS) @@ -25,4 +25,3 @@ clean: for i in $(OBJS); do (if test -e "$$i"; then ( rm $$i ); fi ); done @rm -f $(BIN) $(LIB) - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/README b/gfx/include/userland/host_applications/linux/apps/hello_pi/README index 7a911272a9..dd09245b69 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/README +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/README @@ -12,7 +12,6 @@ then by entering each test app directory and run make. E.g. Running ./rebuild.sh will rebuild the all libs and and apps. - Building on a different PC ++++++++++++++++++++++++++ diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/Makefile index 3c3c13944d..a229151f2f 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/Makefile @@ -3,4 +3,3 @@ BIN=hello_audio.bin LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audio.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audio.c index ebbcbce140..4182dd9563 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audio.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audio.c @@ -317,7 +317,6 @@ int32_t audioplay_set_dest(AUDIOPLAY_STATE_T *st, const char *name) return success; } - uint32_t audioplay_get_latency(AUDIOPLAY_STATE_T *st) { OMX_PARAM_U32TYPE param; @@ -423,4 +422,3 @@ int main (int argc, char **argv) play_api_test(samplerate, bitdepth, channels, audio_dest); return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audioplay.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audioplay.h index 9c9693854c..8b2dcd2e22 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audioplay.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_audio/audioplay.h @@ -31,27 +31,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AUDIOPLAY_H /** - * \file + * \file * * \brief This API allows the host to provide PCM samples to be * rendered via audio_render. - * + * * This file describes a simple API for host applications to play sound * using VideoCore. It includes the functionality to: - * + * * \li open/close * \li set pcm parameters * \li set buffer size parameters * \li retrieve empty buffer available to use * \li send full buffer to be played * \li retrieve current buffering level - * + * * This API has no thread context of it's own, so the caller must be * aware that the IL API will be used in context. This has * implications on executing calls inside callback contexts, and on * the minimum size of stack that the caller requires. See the * ilclient_stack_size() function for assistance. - * + * * This API will use a single audio_render IL component, and * supply buffers to the input port using the OpenMAX IL base profile mode. ********************************************************************************/ @@ -66,26 +66,26 @@ typedef struct AUDIOPLAY_STATE_T AUDIOPLAY_STATE_T; /** * The audioplay_create() function creates the audioplay object. - * + * * @param handle On success, this is filled in with a handle to use in other * API functions. - * + * * @param sample_rate The sample rate, in samples per second, for the PCM data. * This shall be between 8000 and 96000. - * + * * @param num_channels The number of channels for the PCM data. Must be 1, 2, 4, or 8. * Channels must be sent interleaved. - * + * * @param bit_depth The bitdepth per channel per sample. Must be 16 or 32. - * + * * @param num_buffers The number of buffers that will be created to write PCM * samples into. - * + * * @param buffer_size The size in bytes of each buffer that will be used to write * PCM samples into. Note that small buffers of less than a few * Kb in size may be faster than larger buffers, although this is * platform dependent. - * + * * @return 0 on success, -1 on failure. *********************************************************************************/ VCHPRE_ int32_t VCHPOST_ audioplay_create(AUDIOPLAY_STATE_T **handle, @@ -97,13 +97,13 @@ VCHPRE_ int32_t VCHPOST_ audioplay_create(AUDIOPLAY_STATE_T **handle, /** * The audioplay_delete() function deletes the audioplay object. - * + * * @param handle Must be a handle previously created by * audioplay_create(). After calling this * function that handle is no longer valid. Any * buffers provided by audioplay_get_buffer() * are also no longer valid and must not be referenced. - * + * * @return 0 on success, -1 on failure. ********************************************************************************/ VCHPRE_ int32_t VCHPOST_ audioplay_delete(AUDIOPLAY_STATE_T *handle); @@ -112,31 +112,30 @@ VCHPRE_ int32_t VCHPOST_ audioplay_delete(AUDIOPLAY_STATE_T *handle); * The audioplay_get_buffer() function requests an empty * buffer. Any buffer returned will have the valid size indicated in * the call to audioplay_create(). - * + * * @param handle Must be a handle previously created by - * audioplay_create(). - * + * audioplay_create(). + * * @return A pointer to an available buffer. If no buffers are * available, then NULL will be returned. *********************************************************************************/ VCHPRE_ uint8_t * VCHPOST_ audioplay_get_buffer(AUDIOPLAY_STATE_T *handle); - /** * The audioplay_play_buffer() sends a buffer containing * raw samples to be rendered. - * + * * @param handle Must be a handle previously created by - * audioplay_create(). - * + * audioplay_create(). + * * @param buffer Must be a pointer previously returned by * audioplay_get_buffer(). After calling this function * the buffer pointer must not be referenced until returned * again by another call to audioplay_get_buffer(). - * - * @param length Length in bytes of valid data. Must be a whole number of + * + * @param length Length in bytes of valid data. Must be a whole number of * samples, ie a multiple of (num_channels*bit_depth/8). - * + * * @return 0 on success, -1 on failure ********************************************************************************/ VCHPRE_ int32_t VCHPOST_ audioplay_play_buffer(AUDIOPLAY_STATE_T *handle, @@ -147,13 +146,12 @@ VCHPRE_ int32_t VCHPOST_ audioplay_play_buffer(AUDIOPLAY_STATE_T *handle, * The audioplay_get_latency() requests the current audio * playout buffer size in samples, which is the latency until the next * sample supplied is to be rendered. - * + * * @param handle Must be a handle previously created by - * audioplay_create(). - * + * audioplay_create(). + * * @return Number of samples currently buffered. *********************************************************************************/ VCHPRE_ uint32_t VCHPOST_ audioplay_get_latency(AUDIOPLAY_STATE_T *handle); - #endif /* AUDIOPLAY_H */ diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/Makefile index 98dc5e9703..5b6359ece3 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/Makefile @@ -2,4 +2,3 @@ OBJS=dispmanx.o BIN=hello_dispmanx.bin include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c index 1f23b324b6..34940df5d6 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_dispmanx/dispmanx.c @@ -85,7 +85,7 @@ int main(void) int width = WIDTH, height = HEIGHT; int pitch = ALIGN_UP(width*2, 32); int aligned_height = ALIGN_UP(height, 16); - VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE | DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS, + VC_DISPMANX_ALPHA_T alpha = { DISPMANX_FLAGS_ALPHA_FROM_SOURCE | DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS, 120, /*alpha 0->255*/ 0 }; @@ -160,4 +160,3 @@ int main(void) return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/Makefile index 62d320e83a..0c33eb2a4a 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/Makefile @@ -3,4 +3,3 @@ BIN=hello_encode.bin LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/encode.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/encode.c index 0f2a95a5a7..92888f3c16 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/encode.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_encode/encode.c @@ -195,7 +195,6 @@ video_encode_test(char *outputfilename) exit(1); } - // get current bitrate memset(&bitrateType, 0, sizeof(OMX_VIDEO_PARAM_BITRATETYPE)); bitrateType.nSize = sizeof(OMX_VIDEO_PARAM_BITRATETYPE); @@ -211,8 +210,6 @@ video_encode_test(char *outputfilename) } printf("Current Bitrate=%u\n",bitrateType.nTargetBitrate); - - printf("encode to idle...\n"); if (ilclient_change_component_state(video_encode, OMX_StateIdle) == -1) { printf diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/gpu_fft.txt b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/gpu_fft.txt index 49d65bf15d..b135a69377 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/gpu_fft.txt +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/gpu_fft.txt @@ -6,7 +6,6 @@ GPU_FFT is an FFT library for the Raspberry Pi which exploits the BCM2835 SoC between 256 and 4,194,304 points inclusive. A transpose function, which also uses the 3D hardware, is provided to support 2-dimensional transforms. - *** Accuracy *** GPU_FFT uses single-precision floats for data and twiddle factors. The output @@ -23,7 +22,6 @@ Accuracy has improved significantly over previous releases at the expense of a small (2%) performance hit; however, FFTW is still one order of magnitude more accurate than GPU_FFT. - *** Throughput *** GPU_FFT 1.0 had to be invoked through a "mailbox" which added a 100us overhead @@ -44,7 +42,6 @@ log2(N) | 16 | 17 | 18 | 19 | 20 | 21 | 22 All times in 1 | 7.0 | 17 | 43 | 97 | 194 | 388 | 786 milliseconds FFTW | 83 | 180 | 560 | 670 | 1600 | 3400 | 8800 2 sig. figs. - *** API functions *** gpu_fft_prepare() Call once to allocate memory and initialise data @@ -56,7 +53,6 @@ log2(N) | 16 | 17 | 18 | 19 | 20 | 21 | 22 All times in gpu_fft_release() Call once to release resources after use. GPU memory is permanently lost if not freed. - *** Parameters *** int mb Mailbox file descriptor obtained by calling mbox_open() @@ -71,7 +67,6 @@ log2(N) | 16 | 17 | 18 | 19 | 20 | 21 | 22 All times in GPU_FFT ** Output parameter from prepare: control structure. GPU_FFT * Input parameter to execute and release - *** Data format *** Complex data arrays are stored as alternate real and imaginary parts: @@ -101,7 +96,6 @@ lands in the same buffer as input after an even number of passes. Transforms where log2_N=12...16 use an odd number of passes and the final result is left out-of-place. The input data is never preserved. - *** Example program *** The code that produced the above accuracy and performance figures is included @@ -116,7 +110,6 @@ It accepts three optional command-line arguments: The special character device is required for the ioctl mailbox through which the ARM communicates with the Videocore GPU. - *** With Open GL on Pi 1 *** GPU_FFT and Open GL will run concurrently on Pi 1 if GPU_FFT is configured not @@ -138,7 +131,6 @@ waiting for rendering, call glFlush() and glFinish() afterwards as follows: .... } - *** 2-dimensional FFT *** Please study the hello_fft_2d demo source, which is built and executed thus: diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/makefile index c31fece58e..474f32f971 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_fft/makefile @@ -19,7 +19,7 @@ C = mailbox.c gpu_fft.c gpu_fft_base.c gpu_fft_twiddles.c gpu_fft_shaders.c C1D = $(C) hello_fft.c C2D = $(C) hello_fft_2d.c gpu_fft_trans.c -H1D = gpu_fft.h mailbox.h +H1D = gpu_fft.h mailbox.h H2D = gpu_fft.h mailbox.h gpu_fft_trans.h hello_fft_2d_bitmap.h F = -lrt -lm -ldl diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/Makefile index 7ec49f22dc..4398126cdf 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/Makefile @@ -4,4 +4,3 @@ BIN=hello_font.bin LDFLAGS+=-lvgfont -lfreetype -lz include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/main.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/main.c index 66bbe835fa..109992e15e 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/main.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_font/main.c @@ -135,4 +135,3 @@ int main(void) return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/Makefile index 04fd84f1d9..81c63cb41d 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/Makefile @@ -3,4 +3,3 @@ BIN=hello_jpeg.bin LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.c index 233b20e7be..ebedb21859 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.c @@ -162,7 +162,7 @@ portSettingsChanged(OPENMAX_JPEG_DECODER * decoder) decoder->imageResizer->outPort, NULL); // allocate the buffer - // void* outputBuffer = 0; + // void* outputBuffer = 0; // if (posix_memalign(&outputBuffer, portdef.nBufferAlignment, // portdef.nBufferSize) != 0) // { @@ -368,7 +368,7 @@ startupImageDecoder(OPENMAX_JPEG_DECODER * decoder) return OMXJPEG_ERROR_MEMORY; } } - // wait for port enable to complete - which it should once buffers are + // wait for port enable to complete - which it should once buffers are // assigned int ret = ilclient_wait_for_event(decoder->imageDecoder->component, @@ -380,7 +380,7 @@ startupImageDecoder(OPENMAX_JPEG_DECODER * decoder) fprintf(stderr, "Did not get port enable %d\n", ret); return OMXJPEG_ERROR_EXECUTING; } - // start executing the decoder + // start executing the decoder ret = OMX_SendCommand(decoder->imageDecoder->handle, OMX_CommandStateSet, OMX_StateExecuting, NULL); if (ret != 0) { @@ -541,7 +541,7 @@ decodeImage(OPENMAX_JPEG_DECODER * decoder, char *sourceImage, // wait for buffer to fill /* - * while(pBufHeader->nFilledLen == 0) { sleep(5); } + * while(pBufHeader->nFilledLen == 0) { sleep(5); } */ // wait for end of stream events diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h index f525dab16d..3e89adc84b 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_jpeg/jpeg.h @@ -65,4 +65,3 @@ int decodeImage(OPENMAX_JPEG_DECODER* decoder, void cleanup(OPENMAX_JPEG_DECODER* decoder); #endif - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/Makefile index e15aeb3be3..8c08b35a14 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/Makefile @@ -7,4 +7,3 @@ LDFLAGS+=-lmmal -lmmal_core -lmmal_components -lmmal_util -lmmal_vc_client LDFLAGS+=-Wl,--no-as-needed include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/mmal_encode.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/mmal_encode.c index 21ebf92f8e..323544c4fe 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/mmal_encode.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_mmal_encode/mmal_encode.c @@ -98,7 +98,7 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding int outputWritten = 0; FILE* outFile; int nw; - + printf("Encoding test image %s\n", filename); // Configure input @@ -139,7 +139,7 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding portIn->format->es->video.width, portIn->format->es->video.height); // Configure output - + portOut = encoder->output[0]; if (portOut->is_enabled) { @@ -156,7 +156,7 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding } mmal_port_parameter_set_uint32(portOut, MMAL_PARAMETER_JPEG_Q_FACTOR, 100); - + portOut->buffer_size = portOut->buffer_size_recommended; portOut->buffer_num = portOut->buffer_num_recommended; @@ -167,7 +167,7 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding } printf("- output %4.4s\n", (char*)&encoding); - + // Perform the encoding outFile = fopen(filename, "w"); @@ -175,9 +175,9 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding fprintf(stderr, "Failed to open file %s (%s)\n", filename, strerror(errno)); exit(1); } - + while (!eos) { - + // Send output buffers to be filled with encoded image. while (mmal_wrapper_buffer_get_empty(portOut, &out, 0) == MMAL_SUCCESS) { if (mmal_port_send_buffer(portOut, out) != MMAL_SUCCESS) { @@ -219,7 +219,7 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding exit(1); } outputWritten += nw; - + mmal_buffer_header_release(out); } @@ -229,7 +229,6 @@ void mmal_encode_test(MMAL_FOURCC_T encoding, // Encoding printf("- written %u bytes to %s\n\n", outputWritten, filename); } - int main(int argc, const char** argv) { bcm_host_init(); @@ -245,7 +244,7 @@ int main(int argc, const char** argv) exit(1); } encoder->callback = mmalCallback; - + // Perform test encodings in various formats mmal_encode_test(MMAL_ENCODING_PNG, "out.png"); mmal_encode_test(MMAL_ENCODING_JPEG, "out.jpg"); @@ -258,4 +257,3 @@ int main(int argc, const char** argv) return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/Makefile index 0ebb234726..c561573944 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/Makefile @@ -4,4 +4,3 @@ LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/cube_texture_and_coords.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/cube_texture_and_coords.h index 7dd30a96b2..68d91d5780 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/cube_texture_and_coords.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/cube_texture_and_coords.h @@ -97,4 +97,3 @@ static const GLfloat texCoords[6 * 4 * 2] = { 1.f, 0.f, 1.f, 1.f }; - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/models.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/models.c index a5af1413e6..1c47124ec8 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/models.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/models.c @@ -57,7 +57,6 @@ typedef struct wavefront_model_s { GLuint texture; } WAVEFRONT_MODEL_T; - /****************************************************************************** Static Data ******************************************************************************/ @@ -76,10 +75,9 @@ static void create_vbo(GLenum type, GLuint *vbo, int size, void *data) vc_assert(*vbo); glBindBuffer(type, *vbo); glBufferData(type, size, data, GL_STATIC_DRAW); - glBindBuffer(type, 0); + glBindBuffer(type, 0); } - static void destroy_vbo(GLuint *vbo) { glDeleteBuffers(1, vbo); @@ -174,14 +172,14 @@ int draw_wavefront(MODEL_T m, GLuint texture) glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_VERTEX]); glVertexPointer(3, GL_FLOAT, 0, NULL); } - if (mat->vbo[VBO_NORMAL]) { + if (mat->vbo[VBO_NORMAL]) { glEnableClientState(GL_NORMAL_ARRAY); glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_NORMAL]); glNormalPointer(GL_FLOAT, 0, NULL); } else { glDisableClientState(GL_NORMAL_ARRAY); } - if (mat->vbo[VBO_TEXTURE]) { + if (mat->vbo[VBO_TEXTURE]) { glEnableClientState(GL_TEXTURE_COORD_ARRAY); glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_TEXTURE]); glTexCoordPointer(2, GL_FLOAT, 0, NULL); @@ -223,7 +221,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s while (valid > 0) { char *s, *end = line; - + while((end-line < valid) && *end != '\n' && *end != '\r') end++; *end++ = 0; @@ -239,7 +237,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s case '\r': case '\n': case '\0': break; // blank line case 'm': vc_assert(strncmp(s, "mtllib", sizeof "mtllib"-1)==0); break; case 'o': break; - case 'u': + case 'u': if (sscanf(s, "usemtl %s", /*MAX_MATERIAL_NAME-1, */model->material[m->num_materials].name) == 1) { if (m->num_materials < MAX_MATERIALS) { if (m->num_materials > 0 && ((pf-qf)/3 == m->material_index[m->num_materials-1] || strcmp(model->material[m->num_materials-1].name, model->material[m->num_materials].name)==0)) { @@ -263,8 +261,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu" " %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu" " %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, - pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, + pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36), i >= 6) { int poly = i/2; //vc_assert(i < countof(pp)); // may need to increment poly count and pp array @@ -276,8 +274,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu" " %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu" " %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, - pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, + pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36), i >= 6) { int poly = i/2; //vc_assert(i < countof(pp); // may need to increment poly count and pp array @@ -289,8 +287,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu" " %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu" " %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, - pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, + pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36, pp+37, pp+38, pp+39, pp+40, pp+41, pp+42, pp+43, pp+44, pp+45, pp+46, pp+47, pp+48, pp+49, pp+50, pp+51, pp+52, pp+53, pp+54), i >= 9) { int poly = i/3; //vc_assert(i < countof(pp); // may need to increment poly count and pp array @@ -301,7 +299,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } } else { printf(s); vc_assert(0); } break; - default: + default: printf("%02x %02x %s", s[0], s[1], s); vc_assert(0); break; } @@ -339,7 +337,7 @@ static int load_wavefront_dat(const char *modelname, WAVEFRONT_MODEL_T *model, s { FILE *fp; int s; - const int size = sizeof *m + + const int size = sizeof *m + sizeof(float)*(3+2+3)*MAX_VERTICES + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*MAX_VERTICES; //each face has 9 vertices @@ -365,7 +363,7 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) if (!model || !modelname) return NULL; memset (model, 0, sizeof *model); model->texture = 0; //load_texture(texturename); - m = allocbuffer(sizeof *m + + m = allocbuffer(sizeof *m + sizeof(float)*(3+2+3)*MAX_VERTICES + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*MAX_VERTICES); //each face has 9 vertices if (!m) return 0; @@ -385,7 +383,7 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) #ifdef DUMP_OBJ_DAT strcpy(modelname_obj, modelname); strcat(modelname_obj, ".dat"); - size = sizeof *m + + size = sizeof *m + sizeof(float)*(3*m->numv+2*m->numt+3*m->numn) + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*m->numf; //each face has 9 vertices fp = host_file_open(modelname_obj, "w"); @@ -412,10 +410,10 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) // vertex, texture, normal deindex(temp, qv, qf+3*offset+0, 3, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_VERTEX, 3 * mat->numverts * sizeof *qv, temp); // 3 - + deindex(temp, qt, qf+3*offset+1, 2, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_TEXTURE, 2 * mat->numverts * sizeof *qt, temp); // 2 - + deindex(temp, qn, qf+3*offset+2, 3, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_NORMAL, 3 * mat->numverts * sizeof *qn, temp); // 3 offset += mat->numverts; @@ -443,7 +441,7 @@ void unload_wavefront(MODEL_T m) } } -// create a cube model that looks like a wavefront model, +// create a cube model that looks like a wavefront model, MODEL_T cube_wavefront(void) { static const float qv[] = { @@ -456,7 +454,7 @@ MODEL_T cube_wavefront(void) 0.5f, 0.5f, -0.5f, -0.5f, 0.5f, -0.5f, }; - + static const float qn[] = { 0.0f, -1.0f, -0.0f, 0.0f, 1.0f, -0.0f, @@ -465,14 +463,14 @@ MODEL_T cube_wavefront(void) 0.0f, 0.0f, -1.0f, -1.0f, 0.0f, -0.0f, }; - + static const float qt[] = { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, }; - + static const unsigned short qf[] = { 1,1,1, 2,2,1, 3,3,1, 3,3,1, 4,4,1, 1,1,1, @@ -512,4 +510,3 @@ MODEL_T cube_wavefront(void) return (MODEL_T)model; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c index 8b9c2ddceb..813d1813f1 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.c @@ -46,7 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "triangle.h" #include - #define PATH "./" #define IMAGE_SIZE_WIDTH 1920 @@ -55,7 +54,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef M_PI #define M_PI 3.141592654 #endif - typedef struct { @@ -95,7 +93,6 @@ static CUBE_STATE_T _state, *state=&_state; static void* eglImage = 0; static pthread_t thread1; - /*********************************************************** * Name: init_ogl * @@ -132,7 +129,7 @@ static void init_ogl(CUBE_STATE_T *state) EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_NONE }; - + EGLConfig config; // get an EGL display connection @@ -160,24 +157,24 @@ static void init_ogl(CUBE_STATE_T *state) dst_rect.y = 0; dst_rect.width = state->screen_width; dst_rect.height = state->screen_height; - + src_rect.x = 0; src_rect.y = 0; src_rect.width = state->screen_width << 16; - src_rect.height = state->screen_height << 16; + src_rect.height = state->screen_height << 16; dispman_display = vc_dispmanx_display_open( 0 /* LCD */); dispman_update = vc_dispmanx_update_start( 0 ); - + dispman_element = vc_dispmanx_element_add ( dispman_update, dispman_display, 0/*layer*/, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0/*clamp*/, 0/*transform*/); - + nativewindow.element = dispman_element; nativewindow.width = state->screen_width; nativewindow.height = state->screen_height; vc_dispmanx_update_submit_sync( dispman_update ); - + state->surface = eglCreateWindowSurface( state->display, config, &nativewindow, NULL ); assert(state->surface != EGL_NO_SURFACE); @@ -222,7 +219,7 @@ static void init_model_proj(CUBE_STATE_T *state) glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); glViewport(0, 0, (GLsizei)state->screen_width, (GLsizei)state->screen_height); - + glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -230,7 +227,7 @@ static void init_model_proj(CUBE_STATE_T *state) hwd = hht * (float)state->screen_width / (float)state->screen_height; glFrustumf(-hwd, hwd, -hht, hht, nearp, farp); - + glEnableClientState( GL_VERTEX_ARRAY ); reset_model(state); @@ -392,7 +389,7 @@ static void init_textures(CUBE_STATE_T *state) EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)state->tex, 0); - + if (eglImage == EGL_NO_IMAGE_KHR) { printf("eglCreateImageKHR failed.\n"); @@ -444,7 +441,7 @@ int main () // Clear application state memset( state, 0, sizeof( *state ) ); - + // Start OGLES init_ogl(state); @@ -465,4 +462,3 @@ int main () exit_func(); return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.h index 0f50e93132..054b635fb5 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/triangle.h @@ -26,5 +26,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #pragma once - void* video_decode_test(void* arg); diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/video.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/video.c index 4baae8f7dc..2010ed7cc4 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/video.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_teapot/video.c @@ -49,7 +49,6 @@ void my_fill_buffer_done(void* data, COMPONENT_T* comp) } } - // Modified function prototype to work with pthreads void *video_decode_test(void* arg) { @@ -204,7 +203,6 @@ void *video_decode_test(void* arg) // Set egl_render to executing ilclient_change_component_state(egl_render, OMX_StateExecuting); - // Request egl_render to write data to the texture buffer if(OMX_FillThisBuffer(ILC_GET_HANDLE(egl_render), eglBuffer) != OMX_ErrorNone) { @@ -263,4 +261,3 @@ void *video_decode_test(void* arg) ilclient_destroy(client); return (void *)status; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/Makefile index f95e24483f..f092b484c1 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/Makefile @@ -5,4 +5,3 @@ BIN=hello_tiger.bin CFLAGS+=-D__RASPBERRYPI__ include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/license.txt b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/license.txt index 07599fc036..0a0470594d 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/license.txt +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/license.txt @@ -9,10 +9,10 @@ copy of this software and /or associated documentation files including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Materials, and to permit persons to whom the Materials are furnished to do so, -subject to the following conditions: +subject to the following conditions: -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Materials. THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -22,7 +22,6 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - Path data for the Tiger sample program has been extracted from Ghostscript's tiger.eps example file distributed under GNU General Public License. diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/main.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/main.c index a15dda609d..cc52595125 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/main.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/main.c @@ -11,10 +11,10 @@ * including without limitation the rights to use, copy, modify, merge, * publish, distribute, sublicense, and/or sell copies of the Materials, * and to permit persons to whom the Materials are furnished to do so, - * subject to the following conditions: + * subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. * * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -30,7 +30,7 @@ * rerenders the tiger in the new resolution. Pressing 1,2,3 * or 4 sets pixel zoom factor, mouse moves inside the zoomed * image (mouse move works on OpenGL >= 1.2). - * \note + * \note *//*-------------------------------------------------------------------*/ #include @@ -501,19 +501,19 @@ int main(void) dst_rect.y = 0; dst_rect.width = width; dst_rect.height = height; - + src_rect.x = 0; src_rect.y = 0; src_rect.width = width << 16; - src_rect.height = height << 16; + src_rect.height = height << 16; dispman_display = vc_dispmanx_display_open( 0 /* LCD */); dispman_update = vc_dispmanx_update_start( 0 ); - + dispman_element = vc_dispmanx_element_add ( dispman_update, dispman_display, 1/*layer*/, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0/*clamp*/, 0/*transform*/); - + nativewindow.element = dispman_element; nativewindow.width = width; nativewindow.height = height; @@ -530,4 +530,3 @@ int main(void) return 0; } #endif - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/readme.txt b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/readme.txt index 6845e24fb8..43f2c4b053 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/readme.txt +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/readme.txt @@ -22,13 +22,11 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - Version ------- Official RI for OpenVG 1.1 Released: May 13, 2008 - Release Notes ------------- @@ -40,7 +38,6 @@ provided for MSVC 6. This archive contains sources for OpenVG RI, VGU and EGL. There's also a precompiled libOpenVG.dll that contains OpenVG and EGL implementations. - Package Structure ----------------- @@ -72,7 +69,6 @@ samples readme.txt license.txt - Samples ------- @@ -83,7 +79,6 @@ tiger. Note that the sample doesn't start immediately, since it takes a few seconds to render the image. Resizing the window rerenders the image in the new resolution. - Known Issues ------------ @@ -92,7 +87,6 @@ Known Issues -When opening samples.dsw, MSVC may complain about missing Perforce connection. Just ignore that. - Changes ------- diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.c index ae2eff9bf7..35d9c1ff87 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.c @@ -11,10 +11,10 @@ * including without limitation the rights to use, copy, modify, merge, * publish, distribute, sublicense, and/or sell copies of the Materials, * and to permit persons to whom the Materials are furnished to do so, - * subject to the following conditions: + * subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. * * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -27,218 +27,218 @@ *//** * \file * \brief Path and paint data for Tiger image. - * \note + * \note *//*-------------------------------------------------------------------*/ const int tigerCommandCount = 4151; const char tigerCommands[4151] = { -'F', 'N', 'B', 'M', 'M', 'L', 'L', 'L', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', -'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', -'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', -'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', -'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', -'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', -'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', -'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', -'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', -'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', -'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'N', 'S', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', -'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'L', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', -'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', -'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', -'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', -'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'C', -'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', -'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', -'L', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', -'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', -'S', 'B', 'M', 'M', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', -'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', -'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', -'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', -'C', 'C', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'N', 'S', -'B', 'M', 'M', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', -'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', -'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', -'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', -'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', -'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'L', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', -'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', -'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', -'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', 'C', -'C', 'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', 'C', 'C', -'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', -'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', -'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'L', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'L', 'L', 'C', 'E', 'F', 'N', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', -'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'L', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'L', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'L', 'C', 'C', 'C', 'C', 'C', -'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'L', 'L', 'N', 'S', 'R', 'M', 'M', 'C', 'C', -'N', 'S', 'R', 'M', 'M', 'C', 'C', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'N', 'S', 'R', 'M', 'M', -'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', -'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', -'L', 'C', 'C', 'C', 'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'F', 'N', 'B', 'M', 'M', -'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', -'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', -'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', -'L', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', -'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', -'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', -'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', -'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', -'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', -'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', -'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', -'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', -'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', -'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', -'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', -'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', -'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', -'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', -'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', -'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', -'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', -'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', -'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', -'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', -'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', -'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', -'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', -'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', -'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', -'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', -'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', -'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', -'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', -'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', -'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', -'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', -'N', 'R', 'M', 'M', 'L', 'C', 'L', 'N', 'S', 'R', 'M', 'M', 'L', 'N', 'S', 'R', 'M', 'M', 'C', 'N', +'F', 'N', 'B', 'M', 'M', 'L', 'L', 'L', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', +'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', +'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', +'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', +'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', +'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', +'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', +'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', +'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', +'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', +'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'N', 'S', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', +'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'L', 'L', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', +'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', +'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', +'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', +'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'L', 'C', 'C', +'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', +'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', +'L', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', +'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'N', +'S', 'B', 'M', 'M', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', +'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', +'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', +'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', +'C', 'C', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'N', 'S', +'B', 'M', 'M', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', +'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', +'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', +'C', 'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', +'E', 'N', 'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', +'S', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'B', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'L', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', +'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', +'C', 'L', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', +'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', 'C', +'C', 'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'C', 'C', 'C', 'C', +'L', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', +'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', +'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'L', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'L', 'L', 'C', 'E', 'F', 'N', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', +'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'L', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'L', 'L', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'L', 'C', 'C', 'C', 'C', 'C', +'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'L', 'L', 'L', 'N', 'S', 'R', 'M', 'M', 'C', 'C', +'N', 'S', 'R', 'M', 'M', 'C', 'C', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'N', 'S', 'R', 'M', 'M', +'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'E', 'F', 'N', +'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'L', +'L', 'C', 'C', 'C', 'C', 'L', 'L', 'C', 'C', 'C', 'C', 'C', 'C', 'L', 'C', 'F', 'N', 'B', 'M', 'M', +'C', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'L', 'C', 'C', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', +'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', +'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', +'L', 'L', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', +'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', +'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', +'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', +'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', +'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', +'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', +'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', +'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', +'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', +'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', +'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', +'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', +'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', +'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', +'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', +'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', +'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', +'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', +'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', +'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', +'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'N', 'S', 'R', 'M', 'M', 'C', 'C', 'C', 'E', +'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', +'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', +'F', 'N', 'B', 'M', 'M', 'C', 'C', 'L', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', +'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', +'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'C', 'C', +'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', +'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', +'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', +'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', +'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', +'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', 'N', 'R', 'M', 'M', 'C', 'C', 'C', 'E', 'F', +'N', 'R', 'M', 'M', 'L', 'C', 'L', 'N', 'S', 'R', 'M', 'M', 'L', 'N', 'S', 'R', 'M', 'M', 'C', 'N', 'S', 'R', 'M', 'M', 'C', 'N', 'S', 'R', 'M', 'M', 'C'}; const float tigerMinX = 0.0f; @@ -248,1705 +248,1704 @@ const float tigerMaxY = 792.0f; const int tigerPointCount = 17005; const float tigerPoints[17005] = { -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 0, -792, 0, 0, 612, 0, 612, 792, 10, 0, 1, -1, 1, 1, 1, 1, 5, 85.25f, 487.75f, 85.25f, 487.75f, -85.5742f, 485.199f, 84.25f, 484.746f, 83.7617f, 485.242f, 65.6641f, 538.125f, 43.2461f, 535.746f, -43.2422f, 535.746f, 62.6445f, 543.746f, 85.25f, 487.75f, 10, 0.1892f, 0, 0, -0, 0, 0, 0, 5, 85.25f, 487.75f, 85.25f, 487.75f, 85.5742f, -485.199f, 84.25f, 484.746f, 83.7617f, 485.242f, 65.6641f, 538.125f, 43.2461f, 535.746f, 43.2422f, -535.746f, 62.6445f, 543.746f, 85.25f, 487.75f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 89.2461f, 490.75f, 89.2461f, 490.75f, 88.7422f, 488.613f, -88.2461f, 488.746f, 87.0508f, 489.27f, 88.0234f, 545.156f, 66.2461f, 550.746f, 66.2461f, 550.742f, -87.0977f, 551.469f, 89.2461f, 490.75f, 10, 0.1892f, 0, 0, 0, 0, -0, 0, 5, 89.2461f, 490.75f, 89.2461f, 490.75f, 88.7422f, 488.613f, 88.2461f, -488.746f, 87.0508f, 489.27f, 88.0234f, 545.156f, 66.2461f, 550.746f, 66.2461f, 550.742f, 87.0977f, -551.469f, 89.2461f, 490.75f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 119.25f, 443.75f, 119.25f, 443.75f, 121.387f, 442.992f, 121.246f, 442.746f, -120.352f, 441.504f, 66.2578f, 455.586f, 56.25f, 435.75f, 56.25f, 435.75f, 59.9062f, 456.168f, -119.25f, 443.75f, 10, 0.1892f, 0, 0, 0, 0, 0, 0, -5, 119.25f, 443.75f, 119.25f, 443.75f, 121.387f, 442.992f, 121.246f, 442.746f, 120.352f, -441.504f, 66.2578f, 455.586f, 56.25f, 435.75f, 56.25f, 435.75f, 59.9062f, 456.168f, 119.25f, -443.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -116.246f, 432.75f, 116.246f, 432.75f, 118.539f, 432.383f, 118.25f, 431.746f, 118.023f, 430.641f, -62.25f, 426.965f, 58.25f, 404.75f, 58.25f, 404.75f, 56.0391f, 425.516f, 116.246f, 432.75f, -10, 0.1892f, 0, 0, 0, 0, 0, 0, 5, 116.246f, -432.75f, 116.246f, 432.75f, 118.539f, 432.383f, 118.25f, 431.746f, 118.023f, 430.641f, 62.25f, -426.965f, 58.25f, 404.75f, 58.25f, 404.75f, 56.0391f, 425.516f, 116.246f, 432.75f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 112.25f, 438.746f, -112.25f, 438.742f, 113.82f, 438.164f, 113.25f, 437.75f, 113.059f, 436.52f, 57.3437f, 441.016f, -50.2461f, 419.75f, 50.2461f, 419.75f, 50.9883f, 440.492f, 112.25f, 438.746f, 10, 0.1892f, -0, 0, 0, 0, 0, 0, 5, 112.25f, 438.746f, 112.25f, -438.742f, 113.82f, 438.164f, 113.25f, 437.75f, 113.059f, 436.52f, 57.3437f, 441.016f, 50.2461f, -419.75f, 50.2461f, 419.75f, 50.9883f, 440.492f, 112.25f, 438.746f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 100.246f, 458.746f, 100.246f, 458.746f, -101.527f, 457.406f, 101.25f, 456.746f, 100.121f, 456.262f, 52.0039f, 484.699f, 36.25f, 467.746f, -36.25f, 467.746f, 46.0586f, 487.012f, 100.246f, 458.746f, 10, 0.1892f, 0, 0, -0, 0, 0, 0, 5, 100.246f, 458.746f, 100.246f, 458.746f, 101.527f, -457.406f, 101.25f, 456.746f, 100.121f, 456.262f, 52.0039f, 484.699f, 36.25f, 467.746f, 36.25f, -467.746f, 46.0586f, 487.012f, 100.246f, 458.746f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 92.2461f, 454.75f, 92.2422f, 454.75f, 93.3906f, 452.969f, -93.2461f, 452.75f, 92.125f, 451.672f, 41.0976f, 474.484f, 27.25f, 456.746f, 27.25f, 456.746f, -34.9258f, 476.105f, 92.2461f, 454.75f, 10, 0.1892f, 0, 0, 0, 0, -0, 0, 5, 92.2461f, 454.75f, 92.2422f, 454.75f, 93.3906f, 452.969f, 93.2461f, -452.75f, 92.125f, 451.672f, 41.0976f, 474.484f, 27.25f, 456.746f, 27.25f, 456.746f, 34.9258f, -476.105f, 92.2461f, 454.75f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 89.2461f, 449.746f, 89.2461f, 449.742f, 90.6992f, 448.723f, 90.25f, 447.746f, -89.6211f, 447.262f, 35.9609f, 462.906f, 25.25f, 442.746f, 25.25f, 442.742f, 29.625f, 463.676f, -89.2461f, 449.746f, 10, 0.1892f, 0, 0, 0, 0, 0, 0, -5, 89.2461f, 449.746f, 89.2461f, 449.742f, 90.6992f, 448.723f, 90.25f, 447.746f, 89.6211f, -447.262f, 35.9609f, 462.906f, 25.25f, 442.746f, 25.25f, 442.742f, 29.625f, 463.676f, 89.2461f, -449.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -100.246f, 448.75f, 100.246f, 448.75f, 101.969f, 447.469f, 101.25f, 446.75f, 100.43f, 446.512f, -56.3516f, 480.887f, 39.2461f, 466.746f, 39.2461f, 466.742f, 50.75f, 483.941f, 100.246f, 448.75f, -10, 0.1892f, 0, 0, 0, 0, 0, 0, 5, 100.246f, -448.75f, 100.246f, 448.75f, 101.969f, 447.469f, 101.25f, 446.75f, 100.43f, 446.512f, 56.3516f, -480.887f, 39.2461f, 466.746f, 39.2461f, 466.742f, 50.75f, 483.941f, 100.246f, 448.75f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 79.25f, 480.746f, -79.25f, 480.746f, 79.6367f, 479.02f, 79.25f, 478.746f, 77.8789f, 478.578f, 46.418f, 524.777f, -25.25f, 516.75f, 25.25f, 516.75f, 42.0195f, 529.398f, 79.25f, 480.746f, 10, 0.1892f, -0, 0, 0, 0, 0, 0, 5, 79.25f, 480.746f, 79.25f, -480.746f, 79.6367f, 479.02f, 79.25f, 478.746f, 77.8789f, 478.578f, 46.418f, 524.777f, 25.25f, -516.75f, 25.25f, 516.75f, 42.0195f, 529.398f, 79.25f, 480.746f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 79.25f, 473.746f, 79.25f, 473.742f, -80.8164f, 471.527f, 80.25f, 470.75f, 79.1914f, 470.723f, 38.5078f, 509.051f, 19.25f, 496.75f, -19.25f, 496.75f, 33.2148f, 512.609f, 79.25f, 473.746f, 10, 0.1892f, 0, 0, -0, 0, 0, 0, 5, 79.25f, 473.746f, 79.25f, 473.742f, 80.8164f, -471.527f, 80.25f, 470.75f, 79.1914f, 470.723f, 38.5078f, 509.051f, 19.25f, 496.75f, 19.25f, -496.75f, 33.2148f, 512.609f, 79.25f, 473.746f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 79.25f, 468.75f, 79.25f, 468.75f, 80.8516f, 466.828f, -80.25f, 466.746f, 79.3086f, 465.875f, 35.2305f, 500.246f, 17.25f, 485.75f, 17.25f, 485.75f, -29.6289f, 503.301f, 79.25f, 468.75f, 10, 0.1892f, 0, 0, 0, 0, -0, 0, 5, 79.25f, 468.75f, 79.25f, 468.75f, 80.8516f, 466.828f, 80.25f, -466.746f, 79.3086f, 465.875f, 35.2305f, 500.246f, 17.25f, 485.75f, 17.25f, 485.75f, 29.6289f, -503.301f, 79.25f, 468.75f, 10, 0, 1, 1, 1, 1, 1, -1, 88, 77.2461f, 466.746f, 77.7383f, 459.973f, 78.8242f, 452.746f, 80.25f, 449.746f, -80.25f, 449.742f, 76.7773f, 435.676f, 86.25f, 420.746f, 86.25f, 420.742f, 86.0195f, 413.238f, -88.2461f, 409.746f, 88.2461f, 409.742f, 92.1797f, 400.477f, 97.25f, 399.75f, 101.73f, 398.887f, -111.324f, 395.508f, 122.246f, 393.75f, 122.246f, 393.75f, 141.02f, 378.477f, 137.246f, 364.75f, -137.242f, 364.75f, 137.059f, 346.355f, 133.246f, 344.75f, 133.246f, 344.75f, 145.859f, 356.918f, -135.25f, 338.75f, 130.25f, 317.746f, 130.25f, 317.742f, 158.617f, 341.516f, 141.25f, 321.746f, -130.25f, 292.75f, 130.25f, 292.75f, 152.02f, 312.918f, 144.246f, 303.75f, 140.25f, 293.746f, -140.25f, 293.746f, 188.098f, 323.918f, 154.246f, 291.746f, 154.242f, 291.746f, 163.02f, 295.316f, -168.25f, 291.746f, 168.25f, 291.746f, 175.34f, 293.559f, 174.25f, 291.746f, 174.25f, 291.746f, -151.578f, 280.355f, 147.25f, 259.746f, 147.25f, 259.746f, 156.859f, 271.117f, 153.246f, 258.746f, -154.246f, 246.746f, 154.242f, 246.746f, 158.18f, 270.238f, 157.25f, 228.746f, 157.25f, 228.742f, -178.859f, 248.676f, 166.246f, 225.746f, 166.246f, 207.75f, 166.246f, 207.75f, 182.816f, 225.355f, -176.246f, 211.75f, 176.246f, 211.75f, 186.777f, 220.957f, 182.25f, 203.746f, 182.25f, 203.746f, -181.5f, 192.797f, 186.25f, 204.746f, 186.25f, 204.746f, 203.938f, 238.777f, 197.25f, 209.75f, -197.25f, 209.75f, 196.457f, 188.836f, 201.246f, 204.746f, 201.246f, 204.746f, 202.18f, 193.676f, -212.246f, 185.75f, 212.246f, 185.75f, 210.977f, 241.637f, 225.25f, 201.746f, 229.25f, 183.746f, -229.25f, 183.742f, 232.539f, 194.117f, 232.246f, 199.75f, 232.246f, 199.75f, 248.379f, 217.879f, -241.25f, 190.746f, 241.25f, 190.746f, 257.617f, 216.117f, 254.246f, 201.746f, 254.246f, 201.746f, -245.738f, 183.996f, 247.246f, 178.75f, 247.242f, 178.75f, 265.977f, 216.996f, 267.246f, 218.75f, -267.246f, 218.75f, 265.098f, 172.117f, 277.246f, 211.75f, 277.246f, 211.75f, 283.137f, 198.516f, -280.246f, 193.746f, 280.242f, 193.746f, 288.859f, 202.477f, 288.246f, 205.746f, 288.246f, 205.742f, -293.039f, 215.016f, 296.25f, 199.75f, 296.25f, 199.75f, 298.098f, 189.719f, 300.246f, 192.746f, -300.246f, 192.746f, 304.258f, 166.836f, 305.25f, 191.746f, 305.25f, 191.746f, 307.34f, 206.879f, -299.246f, 219.75f, 299.246f, 219.75f, 300.297f, 223.156f, 297.246f, 227.746f, 297.246f, 227.742f, -312.18f, 203.797f, 304.25f, 235.746f, 304.25f, 235.746f, 316.578f, 226.676f, 318.25f, 226.746f, -318.25f, 226.746f, 302.937f, 252.195f, 312.246f, 246.746f, 312.242f, 246.746f, 306.898f, 258.355f, -326.25f, 244.75f, 326.25f, 244.75f, 309.098f, 262.758f, 328.25f, 251.75f, 328.25f, 251.75f, -337.258f, 245.156f, 329.25f, 255.75f, 329.25f, 255.75f, 313.059f, 273.758f, 337.25f, 253.75f, -337.25f, 253.75f, 350.02f, 235.918f, 351.25f, 232.75f, 351.25f, 232.75f, 339.898f, 264.957f, -335.246f, 267.75f, 335.242f, 267.75f, 344.301f, 308.078f, 389.246f, 290.75f, 389.246f, 290.75f, -397.098f, 271.996f, 402.246f, 291.746f, 402.242f, 291.746f, 416.02f, 299.277f, 428.25f, 268.75f, -428.25f, 268.75f, 432.738f, 283.879f, 432.246f, 286.746f, 432.246f, 286.742f, 439.34f, 285.637f, -438.25f, 286.746f, 438.25f, 286.742f, 452.98f, 282.117f, 454.246f, 282.746f, 454.246f, 282.746f, -461.777f, 275.516f, 462.246f, 279.75f, 462.242f, 279.75f, 472.34f, 276.398f, 470.25f, 280.746f, -470.25f, 280.746f, 479.82f, 263.195f, 480.246f, 258.746f, 483.25f, 274.75f, 485.25f, 271.746f, -485.25f, 271.746f, 486.859f, 279.918f, 486.25f, 280.746f, 485.098f, 282.559f, 507.98f, 273.758f, -513.246f, 250.746f, 515.246f, 241.75f, 515.242f, 241.75f, 522.059f, 257.918f, 520.246f, 262.75f, -520.246f, 262.75f, 526.02f, 261.438f, 526.246f, 256.746f, 526.242f, 256.746f, 530.859f, 282.117f, -525.25f, 288.746f, 525.25f, 288.742f, 530.418f, 289.598f, 531.246f, 285.75f, 531.246f, 293.746f, -531.246f, 293.746f, 539.66f, 292.676f, 539.246f, 295.746f, 539.242f, 295.742f, 544.5f, 299.719f, -546.246f, 294.75f, 546.242f, 294.75f, 533.059f, 333.156f, 553.246f, 311.75f, 553.246f, 311.75f, -561.219f, 300.156f, 557.246f, 320.75f, 553.301f, 341.516f, 548.898f, 343.277f, 554.25f, 343.746f, -554.25f, 343.742f, 555.059f, 347.676f, 553.246f, 349.75f, 550.66f, 351.195f, 554.25f, 349.75f, -554.25f, 349.75f, 554.25f, 349.75f, 559.461f, 345.035f, 553.246f, 368.746f, 553.246f, 368.746f, -560.777f, 367.477f, 547.25f, 399.75f, 547.25f, 399.75f, 550.66f, 402.238f, 546.246f, 411.746f, -546.242f, 411.742f, 555.059f, 406.637f, 558.25f, 408.75f, 558.25f, 408.75f, 557.699f, 410.156f, -554.25f, 414.746f, 554.25f, 414.746f, 530.418f, 474.84f, 553.246f, 450.75f, 553.246f, 450.75f, -565.895f, 435.73f, 559.246f, 460.746f, 559.242f, 460.742f, 548.832f, 487.223f, 549.25f, 491.746f, -77.2461f, 466.746f, 10, 1.1f, 0, 0, 0, 0, 0, 0, -88, 77.2461f, 466.746f, 77.7383f, 459.973f, 78.8242f, 452.746f, 80.25f, 449.746f, 80.25f, -449.742f, 76.7773f, 435.676f, 86.25f, 420.746f, 86.25f, 420.742f, 86.0195f, 413.238f, 88.2461f, -409.746f, 88.2461f, 409.742f, 92.1797f, 400.477f, 97.25f, 399.75f, 101.73f, 398.887f, 111.324f, -395.508f, 122.246f, 393.75f, 122.246f, 393.75f, 141.02f, 378.477f, 137.246f, 364.75f, 137.242f, -364.75f, 137.059f, 346.355f, 133.246f, 344.75f, 133.246f, 344.75f, 145.859f, 356.918f, 135.25f, -338.75f, 130.25f, 317.746f, 130.25f, 317.742f, 158.617f, 341.516f, 141.25f, 321.746f, 130.25f, -292.75f, 130.25f, 292.75f, 152.02f, 312.918f, 144.246f, 303.75f, 140.25f, 293.746f, 140.25f, -293.746f, 188.098f, 323.918f, 154.246f, 291.746f, 154.242f, 291.746f, 163.02f, 295.316f, 168.25f, -291.746f, 168.25f, 291.746f, 175.34f, 293.559f, 174.25f, 291.746f, 174.25f, 291.746f, 151.578f, -280.355f, 147.25f, 259.746f, 147.25f, 259.746f, 156.859f, 271.117f, 153.246f, 258.746f, 154.246f, -246.746f, 154.242f, 246.746f, 158.18f, 270.238f, 157.25f, 228.746f, 157.25f, 228.742f, 178.859f, -248.676f, 166.246f, 225.746f, 166.246f, 207.75f, 166.246f, 207.75f, 182.816f, 225.355f, 176.246f, -211.75f, 176.246f, 211.75f, 186.777f, 220.957f, 182.25f, 203.746f, 182.25f, 203.746f, 181.5f, -192.797f, 186.25f, 204.746f, 186.25f, 204.746f, 203.938f, 238.777f, 197.25f, 209.75f, 197.25f, -209.75f, 196.457f, 188.836f, 201.246f, 204.746f, 201.246f, 204.746f, 202.18f, 193.676f, 212.246f, -185.75f, 212.246f, 185.75f, 210.977f, 241.637f, 225.25f, 201.746f, 229.25f, 183.746f, 229.25f, -183.742f, 232.539f, 194.117f, 232.246f, 199.75f, 232.246f, 199.75f, 248.379f, 217.879f, 241.25f, -190.746f, 241.25f, 190.746f, 257.617f, 216.117f, 254.246f, 201.746f, 254.246f, 201.746f, 245.738f, -183.996f, 247.246f, 178.75f, 247.242f, 178.75f, 265.977f, 216.996f, 267.246f, 218.75f, 267.246f, -218.75f, 265.098f, 172.117f, 277.246f, 211.75f, 277.246f, 211.75f, 283.137f, 198.516f, 280.246f, -193.746f, 280.242f, 193.746f, 288.859f, 202.477f, 288.246f, 205.746f, 288.246f, 205.742f, 293.039f, -215.016f, 296.25f, 199.75f, 296.25f, 199.75f, 298.098f, 189.719f, 300.246f, 192.746f, 300.246f, -192.746f, 304.258f, 166.836f, 305.25f, 191.746f, 305.25f, 191.746f, 307.34f, 206.879f, 299.246f, -219.75f, 299.246f, 219.75f, 300.297f, 223.156f, 297.246f, 227.746f, 297.246f, 227.742f, 312.18f, -203.797f, 304.25f, 235.746f, 304.25f, 235.746f, 316.578f, 226.676f, 318.25f, 226.746f, 318.25f, -226.746f, 302.937f, 252.195f, 312.246f, 246.746f, 312.242f, 246.746f, 306.898f, 258.355f, 326.25f, -244.75f, 326.25f, 244.75f, 309.098f, 262.758f, 328.25f, 251.75f, 328.25f, 251.75f, 337.258f, -245.156f, 329.25f, 255.75f, 329.25f, 255.75f, 313.059f, 273.758f, 337.25f, 253.75f, 337.25f, -253.75f, 350.02f, 235.918f, 351.25f, 232.75f, 351.25f, 232.75f, 339.898f, 264.957f, 335.246f, -267.75f, 335.242f, 267.75f, 344.301f, 308.078f, 389.246f, 290.75f, 389.246f, 290.75f, 397.098f, -271.996f, 402.246f, 291.746f, 402.242f, 291.746f, 416.02f, 299.277f, 428.25f, 268.75f, 428.25f, -268.75f, 432.738f, 283.879f, 432.246f, 286.746f, 432.246f, 286.742f, 439.34f, 285.637f, 438.25f, -286.746f, 438.25f, 286.742f, 452.98f, 282.117f, 454.246f, 282.746f, 454.246f, 282.746f, 461.777f, -275.516f, 462.246f, 279.75f, 462.242f, 279.75f, 472.34f, 276.398f, 470.25f, 280.746f, 470.25f, -280.746f, 479.82f, 263.195f, 480.246f, 258.746f, 483.25f, 274.75f, 485.25f, 271.746f, 485.25f, -271.746f, 486.859f, 279.918f, 486.25f, 280.746f, 485.098f, 282.559f, 507.98f, 273.758f, 513.246f, -250.746f, 515.246f, 241.75f, 515.242f, 241.75f, 522.059f, 257.918f, 520.246f, 262.75f, 520.246f, -262.75f, 526.02f, 261.438f, 526.246f, 256.746f, 526.242f, 256.746f, 530.859f, 282.117f, 525.25f, -288.746f, 525.25f, 288.742f, 530.418f, 289.598f, 531.246f, 285.75f, 531.246f, 293.746f, 531.246f, -293.746f, 539.66f, 292.676f, 539.246f, 295.746f, 539.242f, 295.742f, 544.5f, 299.719f, 546.246f, -294.75f, 546.242f, 294.75f, 533.059f, 333.156f, 553.246f, 311.75f, 553.246f, 311.75f, 561.219f, -300.156f, 557.246f, 320.75f, 553.301f, 341.516f, 548.898f, 343.277f, 554.25f, 343.746f, 554.25f, -343.742f, 555.059f, 347.676f, 553.246f, 349.75f, 550.66f, 351.195f, 554.25f, 349.75f, 554.25f, -349.75f, 554.25f, 349.75f, 559.461f, 345.035f, 553.246f, 368.746f, 553.246f, 368.746f, 560.777f, -367.477f, 547.25f, 399.75f, 547.25f, 399.75f, 550.66f, 402.238f, 546.246f, 411.746f, 546.242f, -411.742f, 555.059f, 406.637f, 558.25f, 408.75f, 558.25f, 408.75f, 557.699f, 410.156f, 554.25f, -414.746f, 554.25f, 414.746f, 530.418f, 474.84f, 553.246f, 450.75f, 553.246f, 450.75f, 565.895f, -435.73f, 559.246f, 460.746f, 559.242f, 460.742f, 548.832f, 487.223f, 549.25f, 491.746f, 77.2461f, -466.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 44, -549.25f, 491.746f, 550.379f, 491.531f, 552.805f, 490.293f, 554.25f, 488.746f, 554.25f, 488.742f, -561.66f, 476.598f, 556.25f, 496.75f, 556.25f, 496.75f, 545.82f, 528.52f, 555.246f, 515.746f, -555.246f, 515.742f, 562.098f, 508.277f, 558.25f, 522.746f, 554.328f, 541.309f, 551.25f, 548.746f, -551.25f, 548.746f, 551.25f, 548.746f, 564.301f, 543.039f, 535.246f, 586.75f, 544.246f, 582.75f, -544.246f, 582.75f, 522.938f, 626.199f, 499.25f, 631.746f, 490.25f, 638.746f, 490.25f, 638.742f, -532.621f, 680.316f, 518.25f, 720.75f, 518.25f, 720.75f, 511.059f, 726.52f, 500.246f, 716.75f, -500.246f, 716.75f, 493.461f, 711.117f, 487.246f, 712.75f, 487.246f, 712.75f, 452.98f, 711.559f, -451.25f, 711.746f, 448.578f, 711.559f, 410.301f, 752.477f, 338.25f, 732.746f, 338.25f, 732.742f, -332.418f, 730.918f, 327.25f, 731.75f, 327.25f, 731.75f, 307.34f, 749.84f, 253.246f, 724.746f, -253.246f, 724.746f, 242.656f, 722.559f, 241.25f, 722.746f, 239.137f, 722.559f, 236.059f, 722.559f, -227.25f, 715.746f, 218.457f, 708.477f, 218.02f, 707.598f, 216.25f, 705.75f, 216.25f, 705.75f, -197.777f, 693.52f, 192.25f, 692.75f, 192.25f, 692.75f, 179.738f, 685.598f, 175.25f, 674.75f, -171.246f, 673.746f, 171.246f, 673.742f, 169.18f, 665.359f, 168.25f, 663.75f, 168.25f, 663.75f, -163.457f, 660.078f, 162.25f, 653.746f, 162.25f, 653.742f, 152.898f, 647.316f, 153.246f, 642.746f, -153.242f, 642.742f, 151.578f, 636.758f, 150.246f, 631.746f, 150.246f, 631.742f, 142.777f, 626.199f, -143.246f, 622.75f, 143.242f, 622.75f, 135.297f, 607.719f, 136.25f, 599.75f, 136.25f, 599.75f, -129.578f, 600.68f, 126.246f, 597.75f, 126.242f, 597.75f, 125.617f, 592.758f, 124.25f, 592.746f, -124.25f, 592.746f, 120.777f, 591, 123.25f, 586.75f, 123.25f, 586.75f, 121.656f, 583.52f, -121.246f, 581.746f, 121.246f, 581.746f, 122.098f, 578.68f, 117.25f, 572.746f, 117.25f, 572.742f, -110.219f, 551.84f, 112.25f, 545.75f, 112.25f, 545.75f, 112.859f, 540.84f, 110.246f, 538.75f, -110.246f, 538.75f, 105.816f, 539.52f, 115.246f, 526.746f, 115.242f, 526.742f, 115.938f, 525, -112.25f, 522.746f, 112.25f, 522.746f, 93.5f, 518.398f, 91.25f, 500.746f, 91.25f, 500.746f, -75.8984f, 484.078f, 76.2461f, 478.746f, 75.8984f, 475.824f, 76.1953f, 472.359f, 77.2461f, 467.746f, -77.2461f, 467.746f, 76.3398f, 458.117f, 106.25f, 456.746f, 137.059f, 456.355f, 549.25f, 491.746f, -549.25f, 491.746f, 10, 1.1f, 0, 0, 0, 0, 0, 0, -44, 549.25f, 491.746f, 550.379f, 491.531f, 552.805f, 490.293f, 554.25f, 488.746f, 554.25f, -488.742f, 561.66f, 476.598f, 556.25f, 496.75f, 556.25f, 496.75f, 545.82f, 528.52f, 555.246f, -515.746f, 555.246f, 515.742f, 562.098f, 508.277f, 558.25f, 522.746f, 554.328f, 541.309f, 551.25f, -548.746f, 551.25f, 548.746f, 551.25f, 548.746f, 564.301f, 543.039f, 535.246f, 586.75f, 544.246f, -582.75f, 544.246f, 582.75f, 522.938f, 626.199f, 499.25f, 631.746f, 490.25f, 638.746f, 490.25f, -638.742f, 532.621f, 680.316f, 518.25f, 720.75f, 518.25f, 720.75f, 511.059f, 726.52f, 500.246f, -716.75f, 500.246f, 716.75f, 493.461f, 711.117f, 487.246f, 712.75f, 487.246f, 712.75f, 452.98f, -711.559f, 451.25f, 711.746f, 448.578f, 711.559f, 410.301f, 752.477f, 338.25f, 732.746f, 338.25f, -732.742f, 332.418f, 730.918f, 327.25f, 731.75f, 327.25f, 731.75f, 307.34f, 749.84f, 253.246f, -724.746f, 253.246f, 724.746f, 242.656f, 722.559f, 241.25f, 722.746f, 239.137f, 722.559f, 236.059f, -722.559f, 227.25f, 715.746f, 218.457f, 708.477f, 218.02f, 707.598f, 216.25f, 705.75f, 216.25f, -705.75f, 197.777f, 693.52f, 192.25f, 692.75f, 192.25f, 692.75f, 179.738f, 685.598f, 175.25f, -674.75f, 171.246f, 673.746f, 171.246f, 673.742f, 169.18f, 665.359f, 168.25f, 663.75f, 168.25f, -663.75f, 163.457f, 660.078f, 162.25f, 653.746f, 162.25f, 653.742f, 152.898f, 647.316f, 153.246f, -642.746f, 153.242f, 642.742f, 151.578f, 636.758f, 150.246f, 631.746f, 150.246f, 631.742f, 142.777f, -626.199f, 143.246f, 622.75f, 143.242f, 622.75f, 135.297f, 607.719f, 136.25f, 599.75f, 136.25f, -599.75f, 129.578f, 600.68f, 126.246f, 597.75f, 126.242f, 597.75f, 125.617f, 592.758f, 124.25f, -592.746f, 124.25f, 592.746f, 120.777f, 591, 123.25f, 586.75f, 123.25f, 586.75f, 121.656f, -583.52f, 121.246f, 581.746f, 121.246f, 581.746f, 122.098f, 578.68f, 117.25f, 572.746f, 117.25f, -572.742f, 110.219f, 551.84f, 112.25f, 545.75f, 112.25f, 545.75f, 112.859f, 540.84f, 110.246f, -538.75f, 110.246f, 538.75f, 105.816f, 539.52f, 115.246f, 526.746f, 115.242f, 526.742f, 115.938f, -525, 112.25f, 522.746f, 112.25f, 522.746f, 93.5f, 518.398f, 91.25f, 500.746f, 91.25f, -500.746f, 75.8984f, 484.078f, 76.2461f, 478.746f, 75.8984f, 475.824f, 76.1953f, 472.359f, 77.2461f, -467.746f, 77.2461f, 467.746f, 76.3398f, 458.117f, 106.25f, 456.746f, 137.059f, 456.355f, 549.25f, -491.746f, 549.25f, 491.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, -0.15f, 18, 93.2461f, 466.746f, 65.3398f, 510.477f, 81.2461f, 448.75f, 81.2461f, 448.75f, -90.8594f, 410.598f, 233.246f, 451.746f, 233.246f, 451.746f, 233.246f, 451.742f, 419.098f, 485.398f, -431.246f, 489.746f, 443.738f, 494.199f, 548.246f, 486.746f, 548.246f, 486.746f, 542.246f, 505.75f, -471.02f, 556.68f, 449.898f, 531.156f, 435.246f, 535.746f, 419.98f, 539.957f, 422.621f, 529.398f, -419.246f, 528.746f, 415.578f, 527.637f, 372.461f, 554.918f, 365.246f, 553.75f, 358.379f, 553.156f, -330.504f, 579.285f, 347.25f, 544.746f, 364.539f, 506.957f, 282.699f, 501.238f, 264.246f, 513.746f, -245.738f, 525.879f, 272.25f, 493.746f, 272.25f, 493.746f, 292.379f, 471.316f, 254.246f, 489.746f, -254.246f, 489.746f, 216.699f, 503.879f, 190.297f, 475.719f, 187.246f, 474.75f, 183.258f, 473.957f, -177.977f, 470.438f, 177.246f, 477.746f, 176.219f, 484.52f, 167.957f, 502.891f, 133.246f, 473.746f, -111.098f, 455.695f, 96.25f, 479.75f, 96.25f, 479.75f, 93.2461f, 466.746f, 10, 0, -0.91f, 0.5f, 0.228f, 0.91f, 0.5f, 0.228f, 19, 367.246f, 551.75f, 359.82f, -551.238f, 331.914f, 577.352f, 348.25f, 542.75f, 366.641f, 503.719f, 284.141f, 499.316f, 265.246f, -511.746f, 247.18f, 523.957f, 273.25f, 491.746f, 273.25f, 491.746f, 293.82f, 469.398f, 256.246f, -487.75f, 256.246f, 487.75f, 218.137f, 501.957f, 191.738f, 473.797f, 188.246f, 472.75f, 184.699f, -472.039f, 179.418f, 468.516f, 178.246f, 475.746f, 177.656f, 482.598f, 169.543f, 500.785f, 134.25f, -471.746f, 111.18f, 452.957f, 96.25f, 476.75f, 96.25f, 476.75f, 93.2461f, 465.75f, 65.3164f, -509.219f, 82.2461f, 444.746f, 82.2461f, 444.746f, 91.5781f, 407.238f, 235.246f, 449.746f, 235.246f, -449.746f, 235.242f, 449.742f, 420.539f, 483.477f, 433.246f, 487.75f, 445.18f, 492.277f, 549.25f, -485.75f, 549.25f, 485.75f, 543.25f, 504.746f, 471.578f, 555.398f, 451.34f, 529.238f, 436.25f, -533.746f, 421.418f, 538.039f, 424.059f, 527.477f, 420.246f, 526.746f, 417.02f, 525.719f, 373.898f, -552.996f, 367.246f, 551.75f, 10, 0, 0.919f, 0.55f, 0.305f, 0.919f, 0.55f, -0.305f, 19, 368.246f, 549.75f, 361.258f, 549.316f, 334.051f, 575.75f, 350.25f, 540.75f, -367.641f, 500.695f, 285.578f, 497.398f, 267.246f, 509.75f, 248.617f, 522.035f, 275.246f, 489.746f, -275.246f, 489.746f, 295.258f, 467.477f, 257.246f, 485.75f, 257.246f, 485.75f, 219.578f, 500.035f, -193.18f, 471.875f, 189.246f, 470.75f, 186.137f, 470.117f, 180.859f, 466.598f, 180.246f, 473.746f, -179.098f, 480.676f, 171.125f, 498.68f, 136.25f, 469.746f, 111.258f, 450.215f, 97.25f, 472.75f, -97.25f, 472.75f, 93.2461f, 463.75f, 66.6172f, 506.637f, 82.2461f, 441.75f, 82.2461f, 441.75f, -92.2969f, 403.879f, 236.25f, 447.746f, 236.25f, 447.746f, 236.25f, 447.746f, 421.98f, 481.559f, -434.246f, 485.75f, 446.617f, 490.355f, 549.25f, 483.75f, 549.25f, 483.75f, 543.25f, 502.746f, -472.141f, 554.117f, 452.777f, 527.316f, 438.25f, 531.75f, 422.859f, 536.117f, 425.5f, 525.559f, -422.246f, 524.746f, 418.457f, 523.797f, 375.34f, 551.078f, 368.246f, 549.75f, 10, 0, -0.928f, 0.6f, 0.382f, 0.928f, 0.6f, 0.382f, 19, 369.25f, 548.746f, 362.699f, -547.398f, 335.496f, 573.832f, 351.25f, 538.75f, 369.738f, 497.285f, 286.43f, 495.867f, 268.246f, -507.75f, 250.059f, 520.117f, 276.246f, 487.75f, 276.246f, 487.75f, 296.699f, 465.559f, 259.25f, -483.75f, 259.25f, 483.75f, 221.02f, 498.117f, 194.617f, 469.957f, 191.246f, 468.75f, 187.578f, -468.199f, 182.301f, 464.676f, 181.25f, 471.746f, 180.539f, 478.758f, 172.711f, 496.574f, 137.246f, -467.746f, 111.336f, 447.477f, 97.25f, 469.746f, 97.25f, 469.746f, 93.2461f, 461.75f, 68.7969f, -502.516f, 83.2461f, 438.746f, 83.2461f, 438.746f, 93.0195f, 400.516f, 237.25f, 445.746f, 237.25f, -445.746f, 237.25f, 445.746f, 423.418f, 479.637f, 435.246f, 483.75f, 448.059f, 488.438f, 550.246f, -481.75f, 550.246f, 481.75f, 544.246f, 501.75f, 472.699f, 552.84f, 454.219f, 525.398f, 439.25f, -529.75f, 424.301f, 534.199f, 426.938f, 523.637f, 423.246f, 522.746f, 419.898f, 521.879f, 376.777f, -549.156f, 369.25f, 548.746f, 10, 0, 0.937f, 0.65f, 0.46f, 0.937f, 0.65f, -0.46f, 19, 371.25f, 546.746f, 364.141f, 545.477f, 337.492f, 572.156f, 352.25f, 536.75f, -371.18f, 493.559f, 288.457f, 493.559f, 270.25f, 505.75f, 251.5f, 518.195f, 278.246f, 485.75f, -278.246f, 485.75f, 298.141f, 463.637f, 260.25f, 481.75f, 260.25f, 481.75f, 222.457f, 496.195f, -196.059f, 468.035f, 192.25f, 466.746f, 189.02f, 466.277f, 183.738f, 462.758f, 183.25f, 469.746f, -181.98f, 476.836f, 174.297f, 494.473f, 139.246f, 466.746f, 111.418f, 444.738f, 97.25f, 466.746f, -97.25f, 466.746f, 93.2461f, 460.746f, 70.9766f, 498.617f, 84.25f, 434.746f, 84.25f, 434.746f, -93.7383f, 397.156f, 239.25f, 444.746f, 239.25f, 444.746f, 239.25f, 444.742f, 424.859f, 477.715f, -437.25f, 481.75f, 449.5f, 486.516f, 550.246f, 479.75f, 550.246f, 479.75f, 544.246f, 500.746f, -473.262f, 551.559f, 455.66f, 523.477f, 440.25f, 527.75f, 425.738f, 532.277f, 428.379f, 521.715f, -425.25f, 520.75f, 421.34f, 519.957f, 378.219f, 547.238f, 371.25f, 546.746f, 10, 0, -0.946f, 0.7f, 0.537f, 0.946f, 0.7f, 0.537f, 19, 372.25f, 544.746f, 365.578f, -543.559f, 337.02f, 569.352f, 354.246f, 534.75f, 375.258f, 492.078f, 289.898f, 491.637f, 271.25f, -503.75f, 252.938f, 516.277f, 279.246f, 483.75f, 279.246f, 483.75f, 299.578f, 461.719f, 261.25f, -479.75f, 261.25f, 479.75f, 223.898f, 494.277f, 197.5f, 466.117f, 194.25f, 464.746f, 190.457f, -464.355f, 185.18f, 460.836f, 184.25f, 467.746f, 183.418f, 474.918f, 175.879f, 492.367f, 140.25f, -464.746f, 111.5f, 441.996f, 98.2461f, 462.746f, 98.2461f, 462.746f, 92.2461f, 458.746f, 72.9375f, -495.156f, 85.25f, 431.746f, 85.25f, 431.746f, 94.457f, 393.797f, 240.25f, 442.746f, 240.25f, -442.746f, 240.25f, 442.742f, 426.301f, 475.797f, 438.25f, 479.75f, 450.941f, 484.598f, 551.25f, -477.746f, 551.25f, 477.746f, 545.25f, 498.75f, 473.82f, 550.277f, 457.102f, 521.559f, 442.246f, -525.75f, 427.18f, 530.355f, 429.82f, 519.797f, 426.25f, 518.75f, 422.781f, 518.039f, 379.66f, -545.316f, 372.25f, 544.746f, 10, 0, 0.955f, 0.75f, 0.614f, 0.955f, 0.75f, -0.614f, 19, 374.25f, 542.75f, 367.02f, 541.637f, 338.043f, 567.223f, 355.246f, 532.746f, -378.02f, 488.836f, 291.34f, 489.715f, 273.25f, 501.75f, 254.379f, 514.355f, 281.25f, 481.75f, -281.25f, 481.75f, 301.02f, 459.797f, 263.25f, 478.746f, 263.25f, 478.746f, 225.34f, 492.355f, -198.938f, 464.195f, 195.25f, 463.75f, 191.898f, 462.438f, 186.617f, 458.918f, 185.25f, 465.75f, -184.859f, 472.996f, 177.465f, 490.262f, 141.25f, 462.746f, 111.578f, 439.258f, 98.2461f, 459.75f, -98.2461f, 459.75f, 92.2461f, 456.746f, 75.1172f, 490.156f, 85.25f, 428.75f, 85.25f, 428.75f, -95.1797f, 390.438f, 242.246f, 440.746f, 242.246f, 440.746f, 242.246f, 440.742f, 427.738f, 473.875f, -440.25f, 478.746f, 452.379f, 482.676f, 551.25f, 475.746f, 551.25f, 475.746f, 545.25f, 497.746f, -474.379f, 548.996f, 458.539f, 519.637f, 443.246f, 523.75f, 428.621f, 528.438f, 431.258f, 517.875f, -427.25f, 516.75f, 424.219f, 516.117f, 381.102f, 543.398f, 374.25f, 542.75f, 10, 0, -0.964f, 0.8f, 0.691f, 0.964f, 0.8f, 0.691f, 19, 375.246f, 540.75f, 368.461f, -539.719f, 338.273f, 564.66f, 357.246f, 530.746f, 381.219f, 487.355f, 292.777f, 487.797f, 274.25f, -499.746f, 255.82f, 512.438f, 282.25f, 479.75f, 282.25f, 479.75f, 302.457f, 457.879f, 264.246f, -476.75f, 264.246f, 476.75f, 226.777f, 490.438f, 200.379f, 462.277f, 197.25f, 461.75f, 193.34f, -460.516f, 188.059f, 456.996f, 187.246f, 463.75f, 186.297f, 471.078f, 179.047f, 488.156f, 143.246f, -460.746f, 111.656f, 436.516f, 99.2461f, 456.746f, 99.2461f, 456.746f, 92.2461f, 454.75f, 76.8555f, -486.477f, 86.25f, 424.75f, 86.25f, 424.75f, 95.8984f, 387.074f, 243.246f, 438.746f, 243.246f, -438.746f, 243.246f, 438.742f, 429.18f, 471.957f, 441.246f, 476.75f, 453.82f, 480.758f, 552.25f, -474.75f, 552.25f, 474.75f, 546.246f, 496.75f, 474.941f, 547.719f, 459.98f, 517.719f, 445.246f, -521.746f, 430.059f, 526.516f, 432.699f, 515.957f, 429.25f, 514.75f, 425.66f, 514.195f, 382.539f, -541.477f, 375.246f, 540.75f, 10, 0, 0.973f, 0.85f, 0.769f, 0.973f, 0.85f, -0.769f, 19, 377.246f, 538.75f, 369.898f, 537.797f, 339.715f, 562.738f, 358.25f, 528.746f, -382.66f, 485.437f, 294.219f, 485.875f, 275.246f, 497.746f, 257.258f, 510.516f, 283.25f, 477.746f, -283.25f, 477.746f, 303.898f, 455.957f, 266.246f, 474.75f, 266.246f, 474.75f, 228.219f, 488.516f, -201.816f, 460.355f, 198.246f, 459.75f, 194.777f, 458.598f, 189.5f, 455.078f, 188.246f, 461.75f, -187.738f, 469.156f, 180.633f, 486.051f, 144.246f, 458.746f, 111.738f, 433.777f, 99.2461f, 452.75f, -99.2461f, 452.75f, 92.2461f, 453.746f, 77.7188f, 482.578f, 87.2461f, 421.75f, 87.2461f, 421.75f, -96.6172f, 383.715f, 245.246f, 436.746f, 245.246f, 436.746f, 245.246f, 436.746f, 430.621f, 470.035f, -443.246f, 474.75f, 455.258f, 478.836f, 552.25f, 472.75f, 552.25f, 472.75f, 547.25f, 495.746f, -475.5f, 546.438f, 461.418f, 515.797f, 446.246f, 519.746f, 431.5f, 524.598f, 434.141f, 514.035f, -430.246f, 512.75f, 427.098f, 512.277f, 383.98f, 539.555f, 377.246f, 538.75f, 10, 0, -0.982f, 0.9f, 0.846f, 0.982f, 0.9f, 0.846f, 19, 378.246f, 536.75f, 371.34f, -535.879f, 341.578f, 561.055f, 360.25f, 526.746f, 384.098f, 482.195f, 295.66f, 483.957f, 277.246f, -496.75f, 258.699f, 508.598f, 285.25f, 475.746f, 285.25f, 475.746f, 305.34f, 454.035f, 267.246f, -472.75f, 267.246f, 472.75f, 229.66f, 486.598f, 203.258f, 458.438f, 199.246f, 457.75f, 196.219f, -456.676f, 190.937f, 453.156f, 190.246f, 459.75f, 189.18f, 467.238f, 182.219f, 483.949f, 146.25f, -456.746f, 111.82f, 431.035f, 99.2461f, 449.746f, 99.2461f, 449.746f, 92.2461f, 451.746f, 78.3594f, -478.238f, 87.2461f, 417.75f, 87.2461f, 417.75f, 97.3399f, 380.355f, 246.246f, 434.746f, 246.246f, -434.746f, 246.242f, 434.746f, 432.059f, 468.117f, 444.246f, 472.75f, 456.699f, 476.918f, 553.246f, -470.75f, 553.246f, 470.75f, 547.25f, 493.746f, 476.059f, 545.156f, 462.859f, 513.879f, 448.25f, -518.75f, 432.938f, 522.676f, 435.578f, 512.117f, 432.246f, 510.746f, 428.539f, 510.355f, 385.418f, -537.637f, 378.246f, 536.75f, 10, 0, 0.991f, 0.95f, 0.923f, 0.991f, 0.95f, -0.923f, 19, 380.25f, 534.75f, 372.777f, 533.957f, 344.207f, 559.746f, 361.25f, 524.746f, -384.66f, 478.078f, 297.098f, 482.035f, 278.246f, 494.75f, 260.141f, 506.676f, 286.246f, 473.746f, -286.246f, 473.746f, 306.777f, 452.117f, 269.246f, 470.75f, 269.246f, 470.75f, 231.098f, 484.676f, -204.699f, 456.516f, 201.246f, 455.746f, 197.66f, 454.758f, 192.379f, 451.238f, 191.246f, 458.746f, -190.621f, 465.316f, 183.801f, 481.844f, 147.25f, 454.75f, 111.898f, 428.297f, 100.246f, 446.75f, -100.246f, 446.75f, 92.2461f, 449.746f, 78.5586f, 475.656f, 88.2461f, 414.746f, 88.2461f, 414.746f, -98.0586f, 376.996f, 248.25f, 432.75f, 248.25f, 432.75f, 248.25f, 432.75f, 433.5f, 466.195f, -446.246f, 470.75f, 458.141f, 474.996f, 553.246f, 468.75f, 553.246f, 468.75f, 548.246f, 492.75f, -476.621f, 543.879f, 464.301f, 511.957f, 449.25f, 516.75f, 434.379f, 520.758f, 437.02f, 510.195f, -433.246f, 509.75f, 429.98f, 508.438f, 386.859f, 535.719f, 380.25f, 534.75f, 10, 0, -1, 1, 1, 1, 1, 1, 18, 92.2461f, 448.75f, 78.5391f, -472.637f, 89.2461f, 411.746f, 89.2461f, 411.746f, 98.7773f, 373.637f, 249.25f, 430.75f, 249.25f, -430.75f, 249.25f, 430.75f, 434.938f, 464.277f, 447.25f, 468.75f, 459.578f, 473.078f, 553.246f, -466.746f, 553.246f, 466.746f, 548.246f, 491.746f, 477.18f, 542.598f, 465.738f, 510.039f, 451.25f, -514.75f, 435.82f, 518.84f, 438.461f, 508.277f, 435.246f, 507.75f, 431.418f, 506.52f, 388.301f, -533.797f, 381.25f, 532.746f, 374.219f, 532.039f, 346.477f, 558.227f, 363.25f, 522.746f, 387.23f, -470.762f, 295.941f, 481.848f, 280.246f, 492.75f, 261.578f, 504.758f, 288.246f, 471.746f, 288.246f, -471.746f, 308.219f, 450.195f, 270.25f, 468.75f, 270.25f, 468.75f, 232.539f, 482.758f, 206.137f, -454.598f, 202.246f, 453.746f, 199.098f, 452.836f, 193.816f, 449.316f, 193.25f, 456.746f, 192.059f, -463.398f, 185.387f, 479.738f, 149.246f, 452.75f, 111.977f, 425.559f, 100.246f, 442.746f, 100.246f, -442.746f, 92.2461f, 448.75f, 10, 0, 0, 0, 0, 0, 0, -0, 7, 138.246f, 415.75f, 138.246f, 415.75f, 130.457f, 402.676f, 153.246f, 387.746f, -153.242f, 387.742f, 154.879f, 386.617f, 135.25f, 390.746f, 135.25f, 390.746f, 128.258f, 393.438f, -126.246f, 404.75f, 126.242f, 404.75f, 121.219f, 409.719f, 116.246f, 415.75f, 110.656f, 422.035f, -138.246f, 415.75f, 138.246f, 415.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 8, 292.25f, 467.746f, 292.25f, 467.746f, 311.848f, 438.297f, 311.246f, -432.75f, 309.758f, 421.598f, 309.539f, 411.035f, 313.246f, 406.75f, 316.578f, 402.238f, 326.25f, -365.746f, 326.25f, 365.746f, 326.25f, 365.742f, 325.82f, 364.398f, 339.25f, 405.746f, 339.25f, -405.742f, 352.219f, 423.797f, 330.25f, 443.75f, 330.25f, 443.75f, 291.5f, 475.719f, 292.25f, -467.746f, 10, 0, 0, 0, 0, 0, 0, 0, 15, -160.246f, 385.746f, 160.246f, 385.742f, 172.699f, 378.035f, 157.25f, 343.746f, 164.246f, 346.746f, -164.242f, 346.746f, 163.02f, 334.035f, 159.246f, 331.75f, 167.25f, 334.75f, 167.25f, 334.75f, -172.699f, 326.117f, 168.25f, 320.75f, 168.25f, 320.75f, 186.777f, 312.035f, 186.25f, 304.746f, -186.25f, 304.746f, 192.938f, 313.797f, 188.246f, 320.75f, 184.137f, 327.879f, 176.219f, 323.477f, -177.246f, 343.746f, 167.25f, 339.746f, 167.25f, 339.742f, 173.578f, 349.879f, 173.25f, 356.75f, -165.246f, 354.746f, 165.242f, 354.742f, 181.793f, 383.512f, 170.246f, 384.75f, 163.457f, 385.957f, -160.246f, 385.746f, 160.246f, 385.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 5, 196.25f, 367.75f, 196.25f, 367.75f, 199.098f, 372.316f, 196.25f, -371.75f, 192.938f, 370.559f, 158.617f, 354.277f, 152.25f, 343.746f, 152.25f, 343.742f, 189.859f, -370.559f, 196.25f, 367.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 5, 207.25f, 358.75f, 207.25f, 358.75f, 210.539f, 363.516f, 207.25f, 362.75f, -204.379f, 361.758f, 170.059f, 345.477f, 163.25f, 334.75f, 163.25f, 334.75f, 201.297f, 361.758f, -207.25f, 358.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -5, 222.246f, 375.75f, 222.246f, 375.75f, 225.059f, 380.238f, 222.246f, 379.746f, 218.898f, -378.477f, 184.578f, 362.195f, 178.246f, 351.75f, 178.246f, 351.75f, 215.816f, 378.477f, 222.246f, -375.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, -196.25f, 327.75f, 196.25f, 327.75f, 196.457f, 334.035f, 193.25f, 332.746f, 190.297f, 332.277f, -150.699f, 312.918f, 144.246f, 302.746f, 144.246f, 302.746f, 190.297f, 330.516f, 196.25f, 327.75f, -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 198.246f, -339.746f, 198.246f, 339.742f, 199.098f, 344.598f, 196.25f, 343.746f, 193.816f, 343.719f, 164.777f, -330.957f, 158.25f, 320.75f, 158.25f, 320.75f, 190.738f, 344.156f, 198.246f, 339.746f, 10, -0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 24, 182.25f, 286.746f, -171.246f, 278.75f, 171.246f, 278.75f, 182.379f, 286.957f, 186.25f, 285.75f, 186.25f, 285.75f, -178.859f, 273.316f, 178.246f, 267.75f, 178.246f, 267.75f, 189.418f, 281.676f, 195.25f, 280.746f, -195.25f, 280.746f, 203.938f, 280.797f, 204.25f, 268.75f, 204.25f, 268.75f, 210.098f, 280.355f, -213.246f, 279.75f, 213.242f, 279.75f, 214.938f, 272.879f, 213.246f, 265.75f, 213.242f, 265.75f, -218.02f, 273.758f, 222.246f, 271.746f, 222.246f, 271.746f, 229.457f, 274.195f, 228.25f, 261.746f, -228.25f, 261.742f, 228.578f, 249.996f, 227.25f, 246.746f, 227.25f, 246.746f, 233.859f, 275.957f, -236.25f, 276.75f, 236.25f, 276.75f, 245.297f, 277.719f, 250.25f, 267.75f, 250.25f, 267.75f, -246.18f, 276.398f, 251.25f, 273.746f, 251.25f, 273.742f, 263.34f, 272.438f, 267.246f, 264.746f, -267.246f, 264.742f, 259.379f, 278.156f, 265.246f, 274.75f, 265.246f, 274.75f, 273.02f, 274.637f, -274.25f, 267.75f, 274.25f, 267.75f, 283.578f, 244.277f, 286.246f, 242.75f, 286.246f, 242.75f, -277.418f, 266.277f, 279.246f, 266.746f, 279.242f, 266.742f, 276.977f, 279.477f, 282.25f, 262.75f, -282.25f, 262.75f, 279.18f, 278.598f, 285.25f, 277.746f, 291.5f, 276.836f, 296.34f, 265.836f, -305.25f, 268.75f, 305.25f, 268.75f, 316.141f, 262.316f, 318.25f, 338.75f, 182.25f, 286.746f, -10, 0, 0, 0, 0, 0, 0, 0, 15, 187.246f, -388.75f, 187.246f, 388.75f, 203.5f, 395.637f, 247.246f, 388.75f, 247.242f, 388.75f, 255.418f, -388.598f, 263.25f, 398.746f, 270.379f, 407.957f, 299.859f, 415.879f, 307.25f, 413.75f, 317.25f, -406.75f, 318.25f, 405.746f, 318.25f, 405.742f, 331.98f, 393.879f, 332.246f, 385.746f, 332.859f, -377.156f, 316.578f, 324.355f, 306.25f, 306.746f, 295.457f, 289.156f, 284.898f, 275.516f, 264.246f, -277.746f, 264.246f, 277.742f, 240.898f, 282.559f, 212.246f, 277.746f, 212.246f, 277.742f, 180.617f, -279.918f, 177.246f, 288.746f, 174.457f, 297.516f, 190.246f, 313.746f, 190.246f, 313.746f, 190.246f, -313.746f, 194.699f, 323.477f, 193.25f, 339.746f, 192.059f, 355.156f, 192.5f, 385.957f, 187.246f, -388.75f, 10, 0, 0.9f, 0.4f, 0.55f, 0.9f, 0.4f, 0.55f, 8, -211.246f, 386.75f, 220.656f, 366.598f, 188.246f, 294.75f, 188.246f, 294.75f, 185.898f, 293.117f, -202.023f, 286.469f, 213.246f, 288.746f, 225.219f, 292.059f, 269.246f, 287.75f, 269.246f, 287.75f, -295.457f, 304.559f, 309.246f, 353.75f, 309.246f, 353.75f, 309.246f, 353.75f, 320.98f, 379.797f, -301.246f, 383.746f, 282.258f, 386.836f, 211.246f, 386.75f, 211.246f, 386.75f, 10, 0, -0.7f, 0.2f, 0.35f, 0.7f, 0.2f, 0.35f, 6, 209.246f, 352.746f, 212.844f, -366.922f, 214.586f, 379.902f, 211.246f, 386.75f, 211.246f, 386.75f, 280.059f, 379.797f, 292.25f, -402.75f, 297.043f, 411.34f, 313.277f, 377.598f, 313.246f, 366.75f, 313.242f, 366.75f, 243.539f, -351.195f, 227.25f, 363.746f, 209.246f, 352.746f, 10, 0, 0.65f, 0.15f, 0.3f, -0.65f, 0.15f, 0.3f, 13, 214.25f, 334.75f, 214.25f, 334.75f, 216.258f, 326.996f, -213.246f, 322.75f, 213.242f, 322.75f, 211.859f, 321.719f, 210.246f, 321.746f, 210.246f, 321.742f, -211.859f, 317.316f, 218.25f, 315.746f, 218.25f, 315.746f, 220.656f, 310.719f, 223.246f, 310.746f, -225.938f, 309.836f, 231.219f, 303.676f, 235.246f, 304.746f, 240.02f, 306.316f, 252.25f, 310.746f, -252.25f, 310.746f, 252.25f, 310.742f, 258.5f, 314.238f, 268.246f, 310.746f, 268.242f, 310.742f, -270.789f, 311.16f, 271.25f, 315.746f, 271.809f, 320.727f, 275.219f, 324.797f, 277.246f, 326.746f, -279.617f, 329.195f, 290.18f, 343.277f, 289.246f, 343.746f, 287.539f, 344.156f, 214.25f, 334.75f, -214.25f, 334.75f, 10, 0, 1, 0.45f, 0.5f, 1, 0.45f, 0.5f, -12, 209.246f, 387.746f, 209.246f, 387.742f, 206.137f, 363.516f, 209.246f, 354.746f, 213.18f, -345.035f, 212.297f, 342.836f, 211.246f, 338.75f, 210.539f, 334.035f, 215.379f, 323.035f, 221.246f, -316.75f, 234.246f, 314.75f, 234.246f, 314.75f, 251.457f, 318.637f, 261.25f, 315.746f, 261.25f, -315.746f, 271.473f, 314.078f, 275.246f, 330.746f, 275.246f, 330.742f, 280.5f, 337.559f, 288.246f, -340.75f, 296.34f, 343.719f, 304.258f, 389.477f, 300.246f, 398.746f, 295.457f, 407.078f, 279.617f, -411.918f, 262.25f, 394.746f, 244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 10, -1.1f, 0, 0, 0, 0, 0, 0, 12, 209.246f, 387.746f, -209.246f, 387.742f, 206.137f, 363.516f, 209.246f, 354.746f, 213.18f, 345.035f, 212.297f, 342.836f, -211.246f, 338.75f, 210.539f, 334.035f, 215.379f, 323.035f, 221.246f, 316.75f, 234.246f, 314.75f, -234.246f, 314.75f, 251.457f, 318.637f, 261.25f, 315.746f, 261.25f, 315.746f, 271.473f, 314.078f, -275.246f, 330.746f, 275.246f, 330.742f, 280.5f, 337.559f, 288.246f, 340.75f, 296.34f, 343.719f, -304.258f, 389.477f, 300.246f, 398.746f, 295.457f, 407.078f, 279.617f, 411.918f, 262.25f, 394.746f, -244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 10, 0, 1, 1, -0.8f, 1, 1, 0.8f, 7, 211.246f, 305.75f, 211.246f, 305.75f, 210.098f, -308.078f, 205.25f, 308.746f, 205.25f, 308.742f, 180.617f, 312.477f, 171.246f, 325.75f, 171.246f, -325.75f, 163.898f, 332.277f, 168.25f, 319.746f, 168.25f, 319.742f, 180.18f, 297.078f, 187.246f, -293.746f, 187.246f, 293.746f, 205.699f, 289.598f, 211.246f, 305.75f, 10, 0.55f, 0, -0, 0, 0, 0, 0, 7, 211.246f, 305.75f, 211.246f, 305.75f, -210.098f, 308.078f, 205.25f, 308.746f, 205.25f, 308.742f, 180.617f, 312.477f, 171.246f, 325.75f, -171.246f, 325.75f, 163.898f, 332.277f, 168.25f, 319.746f, 168.25f, 319.742f, 180.18f, 297.078f, -187.246f, 293.746f, 187.246f, 293.746f, 205.699f, 289.598f, 211.246f, 305.75f, 10, 0, -0.8f, 0.25f, 0.3f, 0.8f, 0.25f, 0.3f, 9, 299.246f, 375.75f, 299.641f, -384.941f, 301.789f, 394.418f, 300.246f, 398.746f, 292.766f, 412.461f, 274.098f, 406.535f, 262.25f, -394.746f, 244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 209.246f, 387.742f, 207.297f, -372.797f, 208.25f, 361.746f, 208.25f, 361.742f, 249.258f, 374.516f, 250.25f, 368.746f, 250.25f, -368.746f, 251.898f, 371.879f, 262.25f, 371.75f, 272.137f, 371.879f, 297.152f, 373.168f, 299.246f, -375.75f, 10, 2.2f, 0.65f, 0.1f, 0.15f, 0.65f, 0.1f, 0.15f, 3, -251.25f, 387.746f, 251.25f, 387.742f, 256.738f, 381.996f, 253.246f, 371.75f, 253.246f, 371.75f, -236.938f, 353.836f, 239.25f, 338.75f, 10, 0, 1, 1, 0.8f, 1, -1, 0.8f, 5, 198.246f, 293.746f, 198.246f, 293.746f, 193.816f, 308.078f, 203.25f, -300.75f, 203.25f, 300.75f, 208.777f, 298.398f, 207.25f, 296.75f, 206.137f, 294.879f, 199.977f, -290.477f, 198.246f, 293.746f, 10, 0.55f, 0, 0, 0, 0, 0, -0, 5, 198.246f, 293.746f, 198.246f, 293.746f, 193.816f, 308.078f, 203.25f, 300.75f, -203.25f, 300.75f, 208.777f, 298.398f, 207.25f, 296.75f, 206.137f, 294.879f, 199.977f, 290.477f, -198.246f, 293.746f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, -5, 204.25f, 292.75f, 204.25f, 292.75f, 200.328f, 303.941f, 208.25f, 297.746f, 208.25f, -297.742f, 212.937f, 295.266f, 211.246f, 294.75f, 206.227f, 293.383f, 211.242f, 290.566f, 204.25f, -292.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 5, -204.25f, 292.75f, 204.25f, 292.75f, 200.328f, 303.941f, 208.25f, 297.746f, 208.25f, 297.742f, -212.937f, 295.266f, 211.246f, 294.75f, 206.227f, 293.383f, 211.242f, 290.566f, 204.25f, 292.75f, -10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 5, 209.246f, -292.75f, 209.246f, 292.75f, 205.609f, 303.941f, 213.246f, 297.746f, 213.242f, 297.742f, 218.168f, -295.414f, 216.25f, 294.75f, 212.824f, 293.383f, 216.523f, 290.566f, 209.246f, 292.75f, 10, -0.55f, 0, 0, 0, 0, 0, 0, 5, 209.246f, 292.75f, -209.246f, 292.75f, 205.609f, 303.941f, 213.246f, 297.746f, 213.242f, 297.742f, 218.168f, 295.414f, -216.25f, 294.75f, 212.824f, 293.383f, 216.523f, 290.566f, 209.246f, 292.75f, 10, 0, -1, 1, 0.8f, 1, 1, 0.8f, 5, 216.25f, 292.75f, 216.25f, -292.75f, 212.871f, 303.723f, 220.246f, 297.746f, 220.246f, 297.742f, 225.434f, 295.172f, 224.246f, -294.75f, 220.527f, 293.383f, 223.781f, 290.344f, 216.25f, 292.75f, 10, 0.55f, 0, -0, 0, 0, 0, 0, 5, 216.25f, 292.75f, 216.25f, 292.75f, -212.871f, 303.723f, 220.246f, 297.746f, 220.246f, 297.742f, 225.434f, 295.172f, 224.246f, 294.75f, -220.527f, 293.383f, 223.781f, 290.344f, 216.25f, 292.75f, 10, 0, 1, 1, -0.8f, 1, 1, 0.8f, 5, 224.246f, 292.75f, 224.242f, 292.75f, 220, -303.809f, 227.25f, 297.746f, 227.25f, 297.742f, 231.969f, 296.066f, 231.246f, 294.75f, 229.855f, -293.25f, 230.91f, 290.434f, 224.246f, 292.75f, 10, 0.55f, 0, 0, 0, -0, 0, 0, 5, 224.246f, 292.75f, 224.242f, 292.75f, 220, 303.809f, -227.25f, 297.746f, 227.25f, 297.742f, 231.969f, 296.066f, 231.246f, 294.75f, 229.855f, 293.25f, -230.91f, 290.434f, 224.246f, 292.75f, 10, 0, 1, 1, 0.8f, 1, -1, 0.8f, 5, 231.246f, 291.746f, 231.246f, 291.746f, 225.938f, 305.438f, 236.25f, -298.75f, 236.25f, 298.75f, 241.34f, 296.195f, 240.25f, 294.75f, 238.699f, 292.676f, 240.02f, -289.156f, 231.246f, 291.746f, 10, 0.55f, 0, 0, 0, 0, 0, -0, 5, 231.246f, 291.746f, 231.246f, 291.746f, 225.938f, 305.438f, 236.25f, 298.75f, -236.25f, 298.75f, 241.34f, 296.195f, 240.25f, 294.75f, 238.699f, 292.676f, 240.02f, 289.156f, -231.246f, 291.746f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, -4, 200.246f, 310.746f, 200.246f, 310.742f, 214.5f, 313.797f, 221.246f, 310.746f, 221.246f, -310.742f, 227.699f, 308.957f, 229.25f, 309.75f, 230.34f, 309.836f, 234.246f, 310.746f, 234.246f, -310.746f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, 4, -237.25f, 300.75f, 237.25f, 300.75f, 250.578f, 315.996f, 264.246f, 310.746f, 271.496f, 308.328f, -270.379f, 312.035f, 271.25f, 314.75f, 272.137f, 318.195f, 272.359f, 322.816f, 278.246f, 325.75f, -10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 7, 256.246f, -318.75f, 256.246f, 318.75f, 251.898f, 330.516f, 249.25f, 316.75f, 245.738f, 302.355f, 242.219f, -298.398f, 240.25f, 295.746f, 240.25f, 295.742f, 240.457f, 289.598f, 249.25f, 289.75f, 249.25f, -289.75f, 261.578f, 290.477f, 262.25f, 293.746f, 262.457f, 296.637f, 260.699f, 309.398f, 256.246f, -318.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 7, -256.246f, 318.75f, 256.246f, 318.75f, 251.898f, 330.516f, 249.25f, 316.75f, 245.738f, 302.355f, -242.219f, 298.398f, 240.25f, 295.746f, 240.25f, 295.742f, 240.457f, 289.598f, 249.25f, 289.75f, -249.25f, 289.75f, 261.578f, 290.477f, 262.25f, 293.746f, 262.457f, 296.637f, 260.699f, 309.398f, -256.246f, 318.75f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, -2, 271.25f, 310.746f, 271.25f, 310.742f, 275.656f, 313.355f, 278.246f, 311.75f, 10, -2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, 2, 279.246f, 328.746f, -279.242f, 328.742f, 282.039f, 334.148f, 287.246f, 334.75f, 10, 0, 0.7f, 0.7f, -0.7f, 0.7f, 0.7f, 0.7f, 6, 191.246f, 288.746f, 191.242f, 288.742f, 211.418f, -284.758f, 216.25f, 286.746f, 216.25f, 286.742f, 225.938f, 286.516f, 216.25f, 284.746f, 216.25f, -284.742f, 202.617f, 284.316f, 194.25f, 285.75f, 194.25f, 285.75f, 181.059f, 291.797f, 191.246f, -288.746f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 7, -207.25f, 390.746f, 207.25f, 390.746f, 226.379f, 390.797f, 228.25f, 389.75f, 228.25f, 389.75f, -236.5f, 356.035f, 232.246f, 347.75f, 232.246f, 347.75f, 231.219f, 344.598f, 228.25f, 350.746f, -228.25f, 350.742f, 207.898f, 386.836f, 204.25f, 388.75f, 200.859f, 391.238f, 205.699f, 390.797f, -207.25f, 390.746f, 10, 0.55f, 0, 0, 0, 0, 0, 0, -7, 207.25f, 390.746f, 207.25f, 390.746f, 226.379f, 390.797f, 228.25f, 389.75f, 228.25f, -389.75f, 236.5f, 356.035f, 232.246f, 347.75f, 232.246f, 347.75f, 231.219f, 344.598f, 228.25f, -350.746f, 228.25f, 350.742f, 207.898f, 386.836f, 204.25f, 388.75f, 200.859f, 391.238f, 205.699f, -390.797f, 207.25f, 390.746f, 10, 0, 1, 1, 0.8f, 1, 1, -0.8f, 7, 122.246f, 393.75f, 122.246f, 393.75f, 132, 391.898f, 146.25f, 388.75f, -146.25f, 388.75f, 151.137f, 364.398f, 154.246f, 358.75f, 158.18f, 353.836f, 154.219f, 353.836f, -150.246f, 356.75f, 146.297f, 359.996f, 130.02f, 375.398f, 128.25f, 379.746f, 125.617f, 385.078f, -122.246f, 393.75f, 122.246f, 393.75f, 10, 0.55f, 0, 0, 0, 0, -0, 0, 7, 122.246f, 393.75f, 122.246f, 393.75f, 132, 391.898f, 146.25f, -388.75f, 146.25f, 388.75f, 151.137f, 364.398f, 154.246f, 358.75f, 158.18f, 353.836f, 154.219f, -353.836f, 150.246f, 356.75f, 146.297f, 359.996f, 130.02f, 375.398f, 128.25f, 379.746f, 125.617f, -385.078f, 122.246f, 393.75f, 122.246f, 393.75f, 10, 0, 1, 1, 0.8f, -1, 1, 0.8f, 6, 146.25f, 388.75f, 146.25f, 388.75f, 152.637f, 387.094f, -153.246f, 384.75f, 154.855f, 382.223f, 152.25f, 378.75f, 152.25f, 378.75f, 152.25f, 378.75f, -151.324f, 374.961f, 150.246f, 377.75f, 148.68f, 379.719f, 145.52f, 388.145f, 146.25f, 388.75f, -10, 0.55f, 0, 0, 0, 0, 0, 0, 6, 146.25f, -388.75f, 146.25f, 388.75f, 152.637f, 387.094f, 153.246f, 384.75f, 154.855f, 382.223f, 152.25f, -378.75f, 152.25f, 378.75f, 152.25f, 378.75f, 151.324f, 374.961f, 150.246f, 377.75f, 148.68f, -379.719f, 145.52f, 388.145f, 146.25f, 388.75f, 10, 0, 0, 0, 0, -0, 0, 0, 10, 146.25f, 388.75f, 146.25f, 388.75f, 150.258f, 383.316f, -154.246f, 383.746f, 158.18f, 383.316f, 158.598f, 383.77f, 161.246f, 382.75f, 166.758f, 381.996f, -166.316f, 384.195f, 173.25f, 382.75f, 176.48f, 382.348f, 179.297f, 383.316f, 182.25f, 381.746f, -185.457f, 380.676f, 188.977f, 381.559f, 190.246f, 383.746f, 191.617f, 385.957f, 197.25f, 390.746f, -197.25f, 390.746f, 197.25f, 390.746f, 182.816f, 388.598f, 179.246f, 387.746f, 179.246f, 387.742f, -155.098f, 386.398f, 146.25f, 388.75f, 10, 0, 1, 1, 0.8f, 1, -1, 0.8f, 6, 195.25f, 388.75f, 195.25f, 388.75f, 188.262f, 384.969f, 188.246f, -382.75f, 187.383f, 379.688f, 193.25f, 375.75f, 193.25f, 375.75f, 193.25f, 375.75f, 196.625f, -370.559f, 197.25f, 372.746f, 197.941f, 375.836f, 196.238f, 388.379f, 195.25f, 388.75f, 10, -0.55f, 0, 0, 0, 0, 0, 0, 6, 195.25f, 388.75f, -195.25f, 388.75f, 188.262f, 384.969f, 188.246f, 382.75f, 187.383f, 379.688f, 193.25f, 375.75f, -193.25f, 375.75f, 193.25f, 375.75f, 196.625f, 370.559f, 197.25f, 372.746f, 197.941f, 375.836f, -196.238f, 388.379f, 195.25f, 388.75f, 10, 0, 1, 1, 0.8f, 1, -1, 0.8f, 5, 154.246f, 382.75f, 154.242f, 382.75f, 161.832f, 370.5f, 162.25f, -382.75f, 162.25f, 382.75f, 162.684f, 384.215f, 160.246f, 383.746f, 154.066f, 384.324f, 155.738f, -388.836f, 154.246f, 382.75f, 10, 0.55f, 0, 0, 0, 0, 0, -0, 5, 154.246f, 382.75f, 154.242f, 382.75f, 161.832f, 370.5f, 162.25f, 382.75f, -162.25f, 382.75f, 162.684f, 384.215f, 160.246f, 383.746f, 154.066f, 384.324f, 155.738f, 388.836f, -154.246f, 382.75f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, -5, 162.25f, 382.75f, 162.25f, 382.75f, 170.734f, 370.227f, 170.246f, 382.75f, 170.242f, -382.75f, 170.043f, 383, 168.25f, 382.75f, 162.891f, 383.625f, 163.27f, 388.594f, 162.25f, -382.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 5, -162.25f, 382.75f, 162.25f, 382.75f, 170.734f, 370.227f, 170.246f, 382.75f, 170.242f, 382.75f, -170.043f, 383, 168.25f, 382.75f, 162.891f, 383.625f, 163.27f, 388.594f, 162.25f, 382.75f, -10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 5, 170.246f, -382.75f, 170.242f, 382.75f, 178.711f, 370.832f, 178.246f, 381.746f, 178.246f, 381.746f, 178.105f, -382.82f, 176.246f, 382.75f, 172.004f, 383.93f, 171.773f, 387.504f, 170.246f, 382.75f, 10, -0.55f, 0, 0, 0, 0, 0, 0, 5, 170.246f, 382.75f, -170.242f, 382.75f, 178.711f, 370.832f, 178.246f, 381.746f, 178.246f, 381.746f, 178.105f, 382.82f, -176.246f, 382.75f, 172.004f, 383.93f, 171.773f, 387.504f, 170.246f, 382.75f, 10, 0, -1, 1, 0.8f, 1, 1, 0.8f, 5, 177.246f, 382.75f, 177.246f, -382.75f, 186.207f, 369.719f, 186.25f, 380.75f, 186.25f, 380.75f, 188.398f, 381.992f, 186.25f, -381.746f, 180.078f, 383.051f, 180.957f, 387.953f, 177.246f, 382.75f, 10, 0.55f, 0, -0, 0, 0, 0, 0, 5, 177.246f, 382.75f, 177.246f, 382.75f, -186.207f, 369.719f, 186.25f, 380.75f, 186.25f, 380.75f, 188.398f, 381.992f, 186.25f, 381.746f, -180.078f, 383.051f, 180.957f, 387.953f, 177.246f, 382.75f, 10, 0, 0.9f, 0.9f, -0.7f, 0.9f, 0.9f, 0.7f, 6, 137.246f, 378.75f, 129.25f, 379.746f, 126.441f, -385.738f, 124.25f, 392.746f, 124.25f, 392.746f, 124.25f, 392.746f, 131.117f, 391.402f, 145.25f, -388.75f, 145.25f, 388.75f, 145.832f, 384.672f, 147.25f, 378.75f, 137.246f, 378.75f, 10, -0, 0.9f, 0.9f, 0.7f, 0.9f, 0.9f, 0.7f, 7, 209.246f, 383.746f, -207.469f, 386.437f, 206.02f, 388.371f, 205.25f, 388.75f, 201.992f, 390.891f, 206.547f, 390.477f, -208.25f, 390.746f, 208.25f, 390.746f, 226.02f, 390.477f, 228.25f, 389.75f, 228.25f, 389.75f, -228.668f, 387.18f, 229.25f, 383.746f, 229.25f, 383.742f, 218.32f, 385.66f, 209.246f, 383.746f, -10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 10, 268.246f, -535.746f, 298.758f, 531.289f, 326.832f, 570.492f, 329.25f, 580.75f, 330.703f, 591.789f, 319.25f, -604.75f, 319.25f, 604.75f, 321.023f, 608.246f, 315.699f, 623.734f, 310.246f, 633.75f, 304.082f, -644.063f, 286.594f, 642.992f, 267.246f, 643.75f, 249.875f, 645.031f, 229.547f, 619.379f, 228.25f, -617.75f, 226.641f, 615.508f, 233.418f, 573.398f, 235.246f, 566.75f, 236.32f, 560.813f, 233.246f, -531.75f, 233.246f, 531.75f, 271.082f, 541.781f, 237.773f, 540, 268.246f, 535.746f, 10, -0, 0.92f, 0.56f, 0.32f, 0.92f, 0.56f, 0.32f, 10, 229.25f, 616.746f, -227.469f, 614.828f, 234.121f, 573.484f, 235.246f, 567.75f, 236.973f, 561.129f, 234.246f, 532.746f, -234.246f, 532.746f, 270.063f, 542.387f, 238.398f, 540.695f, 268.246f, 536.75f, 298.273f, 532.141f, -325.836f, 570.633f, 327.25f, 580.75f, 329.637f, 591.543f, 318.25f, 604.75f, 318.25f, 604.75f, -320.133f, 607.699f, 314.906f, 622.906f, 309.246f, 632.75f, 303.504f, 642.867f, 286.332f, 641.813f, -267.246f, 642.746f, 250.277f, 643.816f, 230.32f, 618.629f, 229.25f, 616.746f, 10, 0, -0.94f, 0.67f, 0.49f, 0.94f, 0.67f, 0.49f, 10, 229.25f, 615.75f, 228.297f, -614.152f, 234.824f, 573.574f, 236.25f, 567.75f, 237.625f, 561.445f, 235.246f, 533.746f, 235.246f, -533.746f, 269.371f, 543.539f, 239.023f, 541.391f, 268.246f, 536.75f, 297.793f, 532.996f, 324.844f, -570.773f, 326.25f, 580.75f, 328.574f, 591.297f, 318.25f, 603.746f, 318.25f, 603.746f, 319.246f, -607.156f, 314.113f, 622.078f, 308.246f, 631.746f, 302.922f, 641.668f, 286.066f, 640.637f, 267.246f, -641.75f, 250.684f, 642.602f, 231.094f, 617.883f, 229.25f, 615.75f, 10, 0, 0.96f, -0.78f, 0.66f, 0.96f, 0.78f, 0.66f, 10, 230.25f, 615.75f, 229.125f, 613.473f, -235.531f, 573.66f, 237.25f, 567.75f, 238.277f, 561.762f, 235.246f, 534.75f, 235.246f, 534.75f, -267.91f, 544.25f, 239.648f, 542.086f, 268.246f, 537.746f, 297.309f, 533.852f, 323.848f, 570.914f, -325.25f, 580.75f, 327.508f, 591.051f, 317.25f, 603.746f, 317.25f, 603.746f, 318.355f, 606.609f, -313.324f, 621.254f, 308.246f, 630.75f, 302.34f, 640.473f, 285.805f, 639.457f, 267.246f, 640.746f, -251.09f, 641.387f, 231.871f, 617.133f, 230.25f, 615.75f, 10, 0, 0.98f, 0.89f, -0.83f, 0.98f, 0.89f, 0.83f, 10, 231.246f, 614.746f, 229.949f, 612.797f, 236.234f, -573.75f, 237.25f, 567.75f, 238.926f, 562.082f, 236.25f, 534.75f, 236.25f, 534.75f, 266.891f, -544.965f, 240.273f, 542.781f, 268.246f, 538.75f, 296.824f, 534.703f, 322.855f, 571.055f, 324.246f, -580.75f, 326.445f, 590.805f, 316.25f, 602.75f, 316.25f, 602.75f, 317.469f, 606.063f, 312.531f, -620.426f, 307.25f, 629.746f, 301.762f, 639.273f, 285.543f, 638.281f, 267.246f, 639.75f, 251.492f, -640.172f, 232.645f, 616.387f, 231.246f, 614.746f, 10, 0, 1, 1, 1, -1, 1, 1, 10, 268.246f, 539.746f, 296.34f, 535.559f, 321.859f, 571.199f, -323.246f, 580.75f, 325.379f, 590.559f, 315.25f, 602.75f, 315.25f, 602.75f, 316.578f, 605.52f, -311.738f, 619.598f, 306.25f, 628.75f, 301.18f, 638.078f, 285.277f, 637.102f, 267.246f, 637.75f, -251.898f, 638.957f, 233.418f, 615.637f, 232.246f, 613.75f, 230.777f, 612.117f, 236.938f, 573.84f, -238.25f, 567.75f, 239.578f, 562.398f, 237.25f, 535.746f, 237.25f, 535.746f, 264.988f, 545.457f, -240.898f, 543.477f, 268.246f, 539.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 6, 319.25f, 576.746f, 319.25f, 576.742f, 289.078f, 568.559f, 276.246f, -570.746f, 276.246f, 570.746f, 258.937f, 577.578f, 249.25f, 553.75f, 249.25f, 553.75f, 245.297f, -545.68f, 243.246f, 543.746f, 240.898f, 541.277f, 319.25f, 576.746f, 319.25f, 576.746f, 10, -0, 0, 0, 0, 0, 0, 0, 11, 324.246f, 579.746f, -324.242f, 579.746f, 291.937f, 565.918f, 281.25f, 566.75f, 281.25f, 566.75f, 262.898f, 571.418f, -253.246f, 555.75f, 253.246f, 555.75f, 244.418f, 545.238f, 241.25f, 543.746f, 241.25f, 543.742f, -240.457f, 541.719f, 247.246f, 545.75f, 259.25f, 540.75f, 259.25f, 540.75f, 275.219f, 529.84f, -286.246f, 547.75f, 286.246f, 547.75f, 290.18f, 559.758f, 290.246f, 561.746f, 290.18f, 564.156f, -313.5f, 570.316f, 315.25f, 570.746f, 317.02f, 571.199f, 324.277f, 575.816f, 324.246f, 579.746f, -10, 0, 0.6f, 0.8f, 0.2f, 0.6f, 0.8f, 0.2f, 6, 271.25f, -539.746f, 264.141f, 539.832f, 254.93f, 544.086f, 255.246f, 550.746f, 254.93f, 557.832f, 264.141f, -564.723f, 271.25f, 564.75f, 279.258f, 564.723f, 285.387f, 559.152f, 285.25f, 552.746f, 285.387f, -545.402f, 279.258f, 539.832f, 271.25f, 539.746f, 10, 0, 0.4f, 0.6f, 0, -0.4f, 0.6f, 0, 6, 267.246f, 557.746f, 262.383f, 557.391f, 256.785f, 555.738f, -257.246f, 555.75f, 258.559f, 561.055f, 265.555f, 564.723f, 271.25f, 564.75f, 276.422f, 564.723f, -280.59f, 562.547f, 283.25f, 558.75f, 283.25f, 558.75f, 277.203f, 559.598f, 267.246f, 557.746f, -10, 0, 1, 1, 1, 1, 1, 1, 4, 281.25f, -558.75f, 281.25f, 558.75f, 276.098f, 561.957f, 276.246f, 559.746f, 276.246f, 559.746f, 280.059f, -554.699f, 281.25f, 558.75f, 10, 0, 0, 0, 0, 0, 0, -0, 6, 270.25f, 549.75f, 267.187f, 549.5f, 264.961f, 551.727f, 265.246f, 554.746f, -264.961f, 557.227f, 267.187f, 559.457f, 270.25f, 559.746f, 272.687f, 559.457f, 274.918f, 557.227f, -275.246f, 554.746f, 274.918f, 551.727f, 272.687f, 549.5f, 270.25f, 549.75f, 10, 0, -0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 15, 155.246f, 563.746f, 155.246f, -563.742f, 152.02f, 587.477f, 154.246f, 592.746f, 154.242f, 592.746f, 166.539f, 603.316f, 166.246f, -607.746f, 166.246f, 607.742f, 165.656f, 627.078f, 164.246f, 627.746f, 163.02f, 628.84f, 154.656f, -635.438f, 148.246f, 628.75f, 148.242f, 628.75f, 136.617f, 608.598f, 137.246f, 601.746f, 137.246f, -599.75f, 137.242f, 599.75f, 129.137f, 599.797f, 127.246f, 597.75f, 127.246f, 597.75f, 126.059f, -591.879f, 124.25f, 591.75f, 124.25f, 591.75f, 121.656f, 588.797f, 124.25f, 585.746f, 124.25f, -585.742f, 121.656f, 583.078f, 122.246f, 578.75f, 130.25f, 574.746f, 130.25f, 574.742f, 132.656f, -558.438f, 144.246f, 552.746f, 149.859f, 550.156f, 153.34f, 557.559f, 155.246f, 563.746f, 10, -0, 1, 1, 1, 1, 1, 1, 15, 154.246f, 565.746f, -154.242f, 565.742f, 151.27f, 587.172f, 153.246f, 591.75f, 153.242f, 591.75f, 164.34f, 601.426f, -164.246f, 604.75f, 164.242f, 604.75f, 163.547f, 622.809f, 162.25f, 623.746f, 161.172f, 624.395f, -153.645f, 630.336f, 147.25f, 623.746f, 147.25f, 623.746f, 137.41f, 606.18f, 138.246f, 599.75f, -138.246f, 597.75f, 138.246f, 597.75f, 130.68f, 598.258f, 129.25f, 596.746f, 129.25f, 596.742f, -127.906f, 591.129f, 126.246f, 590.746f, 126.242f, 590.746f, 123.945f, 588.359f, 126.246f, 585.746f, -126.242f, 585.742f, 123.945f, 583.211f, 124.25f, 579.746f, 132.246f, 575.75f, 132.246f, 575.75f, -133.848f, 561.035f, 144.246f, 555.75f, 149.324f, 553.582f, 152.457f, 560.242f, 154.246f, 565.746f, -10, 0, 0.925f, 0.588f, 0.363f, 0.925f, 0.588f, 0.363f, 15, 164.246f, -626.75f, 162.645f, 627.816f, 154.406f, 634.16f, 148.246f, 627.746f, 148.242f, 627.742f, 136.816f, -607.992f, 137.246f, 600.75f, 137.246f, 598.746f, 137.242f, 598.742f, 129.523f, 599.414f, 128.25f, -597.75f, 128.25f, 597.75f, 126.52f, 591.691f, 125.25f, 591.75f, 125.25f, 591.75f, 122.23f, -588.688f, 124.25f, 585.746f, 124.25f, 585.742f, 122.23f, 583.109f, 122.246f, 578.75f, 131.246f, -574.746f, 131.242f, 574.742f, 132.953f, 559.086f, 144.246f, 553.75f, 149.723f, 551.012f, 153.117f, -558.23f, 155.246f, 564.75f, 155.246f, 564.75f, 151.832f, 587.402f, 154.246f, 591.75f, 154.242f, -591.75f, 165.988f, 602.844f, 165.246f, 606.75f, 165.242f, 606.75f, 165.129f, 626.012f, 164.246f, -626.75f, 10, 0, 0.95f, 0.725f, 0.575f, 0.95f, 0.725f, 0.575f, 15, -163.25f, 625.746f, 162.27f, 626.793f, 154.152f, 632.887f, 148.246f, 625.746f, 148.242f, 625.746f, -137.016f, 607.387f, 138.246f, 600.75f, 138.246f, 598.746f, 138.246f, 598.742f, 129.906f, 599.027f, -128.25f, 596.746f, 128.25f, 596.742f, 126.98f, 591.504f, 125.25f, 590.746f, 125.25f, 590.746f, -122.801f, 588.578f, 125.25f, 585.746f, 125.25f, 585.742f, 122.801f, 583.145f, 123.25f, 578.75f, -131.246f, 574.746f, 131.242f, 574.742f, 133.254f, 559.734f, 144.246f, 554.746f, 149.59f, 551.867f, -152.898f, 558.898f, 155.246f, 564.75f, 155.246f, 564.75f, 151.645f, 587.324f, 154.246f, 591.75f, -154.242f, 591.75f, 165.438f, 602.371f, 165.246f, 605.746f, 165.242f, 605.742f, 164.602f, 624.945f, -163.25f, 625.746f, 10, 0, 0.975f, 0.863f, 0.788f, 0.975f, 0.863f, 0.788f, -15, 163.25f, 624.75f, 161.895f, 625.77f, 153.898f, 631.609f, 148.246f, 624.75f, 148.242f, -624.75f, 137.211f, 606.781f, 138.246f, 600.75f, 138.246f, 597.75f, 138.246f, 597.75f, 130.293f, -598.645f, 128.25f, 596.746f, 128.25f, 596.742f, 127.445f, 591.316f, 126.246f, 590.746f, 126.242f, -590.746f, 123.375f, 588.469f, 125.25f, 585.746f, 125.25f, 585.742f, 123.375f, 583.176f, 124.25f, -578.75f, 131.246f, 574.746f, 131.242f, 574.742f, 133.551f, 560.387f, 144.246f, 554.746f, 149.457f, -552.727f, 152.68f, 559.57f, 154.246f, 565.746f, 154.242f, 565.742f, 151.457f, 587.246f, 154.246f, -591.75f, 154.242f, 591.75f, 164.887f, 601.898f, 164.246f, 605.746f, 164.242f, 605.742f, 164.074f, -623.879f, 163.25f, 624.75f, 10, 0, 1, 1, 1, 1, 1, -1, 15, 154.246f, 566.75f, 154.242f, 566.75f, 151.27f, 587.172f, 153.246f, 591.75f, -153.242f, 591.75f, 164.34f, 601.426f, 164.246f, 604.75f, 164.242f, 604.75f, 163.547f, 622.809f, -162.25f, 623.746f, 161.523f, 624.746f, 153.645f, 630.336f, 147.25f, 623.746f, 147.25f, 623.746f, -137.41f, 606.18f, 138.246f, 599.75f, 138.246f, 597.75f, 138.246f, 597.75f, 130.68f, 598.258f, -129.25f, 596.746f, 129.25f, 596.742f, 127.906f, 591.129f, 126.246f, 590.746f, 126.242f, 590.746f, -123.945f, 588.359f, 126.246f, 585.746f, 126.242f, 585.742f, 123.945f, 583.211f, 124.25f, 579.746f, -132.246f, 575.75f, 132.246f, 575.75f, 133.848f, 561.035f, 144.246f, 555.75f, 149.324f, 553.582f, -152.457f, 560.352f, 154.246f, 566.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 5, 151.25f, 572.746f, 151.25f, 572.742f, 127.27f, 584.398f, 126.246f, -585.746f, 126.242f, 585.742f, 136.289f, 576.258f, 137.246f, 576.746f, 138.047f, 576.258f, 151.25f, -572.746f, 151.25f, 572.746f, 10, 0, 0, 0, 0, 0, 0, -0, 5, 132.246f, 579.746f, 132.246f, 579.746f, 152.457f, 576.039f, 152.25f, 570.746f, -152.457f, 567.996f, 152.191f, 553.234f, 146.25f, 554.746f, 137.059f, 557.559f, 141.02f, 573.398f, -132.246f, 579.746f, 10, 0, 0.6f, 0.8f, 0.2f, 0.6f, 0.8f, 0.2f, -5, 141.25f, 575.75f, 141.25f, 575.75f, 151.332f, 574.195f, 152.25f, 570.746f, 153.117f, -569.438f, 153.848f, 560.301f, 148.246f, 558.75f, 142.832f, 558.098f, 140.379f, 569.34f, 141.25f, -575.75f, 10, 0, 0, 0, 0, 0, 0, 0, 44, -236.25f, 528.746f, 235.504f, 530.93f, 236.949f, 530.785f, 239.25f, 531.75f, 241.117f, 532.039f, -254.539f, 536.219f, 255.246f, 538.75f, 256.297f, 541.938f, 271.25f, 536.75f, 271.25f, 536.75f, -272.797f, 536.219f, 277.246f, 533.746f, 277.246f, 533.746f, 282.918f, 532.039f, 290.246f, 531.75f, -290.246f, 531.75f, 292.816f, 530.5f, 296.25f, 527.75f, 296.25f, 527.75f, 312.617f, 516.199f, -326.25f, 523.75f, 326.25f, 523.75f, 348.258f, 531.379f, 341.25f, 550.746f, 341.25f, 550.746f, -338.359f, 560.199f, 342.246f, 563.746f, 342.246f, 563.746f, 342.098f, 568.117f, 350.25f, 560.75f, -350.25f, 560.75f, 352.879f, 556.457f, 354.246f, 550.746f, 354.246f, 550.746f, 362.559f, 538.637f, -359.25f, 557.746f, 359.25f, 557.746f, 359.039f, 559.316f, 355.961f, 563.277f, 356.246f, 564.75f, -355.961f, 565.918f, 354.246f, 569.75f, 354.246f, 569.75f, 350.68f, 573.398f, 353.246f, 580.75f, -353.246f, 580.75f, 355.301f, 596.277f, 353.246f, 594.746f, 353.246f, 594.746f, 351.559f, 596.277f, -341.25f, 585.746f, 341.25f, 585.746f, 339.02f, 581.539f, 332.246f, 579.746f, 332.246f, 579.746f, -329.34f, 577.797f, 325.25f, 579.746f, 325.25f, 579.746f, 322.738f, 579.777f, 316.25f, 571.75f, -316.25f, 571.75f, 319.66f, 572.297f, 322.301f, 567.457f, 325.25f, 566.75f, 327.578f, 567.02f, -329.559f, 569.879f, 331.246f, 570.746f, 333.078f, 571.199f, 336.25f, 564.75f, 336.25f, 564.75f, -336.598f, 561.957f, 330.25f, 556.75f, 330.25f, 556.75f, 330, 551.617f, 328.25f, 553.75f, -328.25f, 553.75f, 324.938f, 554.039f, 323.621f, 549.859f, 322.246f, 544.746f, 321.418f, 539.738f, -317.25f, 539.746f, 317.25f, 539.746f, 315.039f, 531.156f, 313.246f, 534.75f, 313.246f, 534.75f, -313.5f, 540.617f, 307.25f, 533.746f, 307.25f, 533.746f, 305.578f, 532.039f, 300.246f, 534.75f, -300.246f, 534.75f, 293.039f, 536.656f, 295.25f, 538.75f, 295.25f, 538.75f, 297.656f, 541.277f, -310.246f, 538.75f, 310.246f, 538.75f, 312.398f, 540.617f, 303.25f, 544.746f, 303.25f, 544.746f, -302.937f, 547, 304.25f, 551.75f, 304.25f, 551.75f, 305.359f, 555.359f, 313.246f, 561.746f, -313.246f, 561.746f, 323.18f, 562.84f, 320.246f, 564.75f, 320.246f, 564.75f, 313.277f, 570.316f, -307.25f, 561.746f, 307.25f, 561.746f, 304.477f, 555.137f, 285.25f, 538.75f, 285.25f, 538.75f, -280.059f, 534.898f, 282.918f, 542.379f, 278.246f, 538.75f, 274.117f, 534.898f, 251.25f, 544.746f, -251.25f, 544.746f, 238.738f, 546.109f, 235.734f, 528.793f, 232.246f, 531.75f, 232.246f, 531.75f, -237.813f, 522.855f, 236.25f, 528.746f, 10, 0, 0, 0, 0, 0, -0, 0, 12, 450.25f, 711.746f, 450.25f, 711.746f, 422.18f, 703.199f, 419.246f, -682.746f, 419.246f, 682.742f, 416.461f, 657.438f, 439.25f, 637.75f, 439.25f, 637.75f, 439.34f, -631.039f, 441.246f, 627.746f, 441.246f, 627.742f, 439.777f, 622.238f, 460.246f, 630.75f, 490.25f, -639.75f, 490.25f, 639.75f, 497.418f, 642.477f, 503.25f, 651.746f, 508.859f, 661.84f, 525.578f, -682.52f, 521.25f, 709.75f, 521.25f, 709.75f, 522.938f, 722.559f, 516.25f, 722.746f, 516.25f, -722.746f, 507.098f, 724.758f, 499.25f, 716.75f, 499.25f, 716.75f, 491.699f, 712.879f, 489.246f, -713.746f, 450.25f, 711.746f, 10, 0, 0, 0, 0, 0, 0, -0, 8, 510.25f, 712.75f, 510.25f, 712.75f, 512.73f, 722.91f, 507.25f, 717.746f, -507.25f, 717.742f, 499.664f, 711.293f, 491.246f, 711.746f, 491.242f, 711.746f, 475.465f, 708.875f, -470.25f, 694.75f, 470.25f, 694.75f, 466.266f, 664.828f, 475.25f, 658.746f, 475.25f, 658.746f, -480.305f, 650.309f, 488.25f, 657.75f, 495.793f, 664.828f, 512.844f, 698.082f, 510.25f, 712.75f, -10, 0, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 8, 510.25f, -712.75f, 510.25f, 712.75f, 512.309f, 722.313f, 507.25f, 716.75f, 507.25f, 716.75f, 499.48f, -710.906f, 491.246f, 710.746f, 491.242f, 710.742f, 475.719f, 708.531f, 471.246f, 694.75f, 471.242f, -694.75f, 466.691f, 665.289f, 475.25f, 658.746f, 475.25f, 658.746f, 480.469f, 651.031f, 488.25f, -657.75f, 495.68f, 665.289f, 512.387f, 697.961f, 510.25f, 712.75f, 10, 0, 0.4f, -0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 8, 509.246f, 712.75f, 509.246f, 712.75f, -511.887f, 721.715f, 507.25f, 716.75f, 507.25f, 716.75f, 499.293f, 710.52f, 491.246f, 710.746f, -491.242f, 710.742f, 475.973f, 708.188f, 471.246f, 693.746f, 471.242f, 693.742f, 467.113f, 665.746f, -475.25f, 659.75f, 475.25f, 659.75f, 480.637f, 651.754f, 488.25f, 658.746f, 495.563f, 665.746f, -511.93f, 697.84f, 509.246f, 712.75f, 10, 0, 0.6f, 0.6f, 0.6f, 0.6f, -0.6f, 0.6f, 8, 509.246f, 711.746f, 509.246f, 711.746f, 511.465f, 721.113f, 506.246f, -715.746f, 506.242f, 715.742f, 499.109f, 710.133f, 491.246f, 709.75f, 491.242f, 709.75f, 476.23f, -707.844f, 471.246f, 693.746f, 471.242f, 693.742f, 467.535f, 666.203f, 476.246f, 660.746f, 476.246f, -660.742f, 480.805f, 652.477f, 488.25f, 659.75f, 495.449f, 666.203f, 511.477f, 697.719f, 509.246f, -711.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 8, -509.246f, 711.746f, 509.246f, 711.746f, 511.043f, 720.516f, 506.246f, 715.746f, 506.242f, 715.742f, -498.926f, 709.746f, 491.246f, 709.75f, 491.242f, 709.75f, 476.484f, 707.5f, 472.25f, 693.746f, -472.25f, 693.742f, 467.957f, 666.66f, 476.246f, 660.746f, 476.246f, 660.742f, 480.973f, 653.195f, -488.25f, 659.75f, 495.332f, 666.66f, 511.02f, 697.598f, 509.246f, 711.746f, 10, 0, -1, 1, 1, 1, 1, 1, 8, 508.25f, 710.746f, 508.25f, -710.742f, 510.621f, 719.918f, 506.246f, 714.75f, 506.242f, 714.75f, 498.738f, 709.359f, 491.246f, -709.75f, 491.242f, 709.75f, 476.738f, 707.156f, 472.25f, 693.746f, 472.25f, 693.742f, 468.379f, -667.117f, 476.246f, 661.75f, 476.246f, 661.75f, 481.141f, 653.918f, 488.25f, 660.746f, 495.219f, -667.117f, 510.563f, 697.477f, 508.25f, 710.746f, 10, 0, 0.6f, 0.15f, 0, -0.6f, 0.15f, 0, 24, 275.246f, 487.75f, 275.246f, 487.75f, 253.219f, 508.719f, -244.246f, 509.75f, 244.246f, 509.75f, 206.578f, 514, 190.246f, 493.746f, 190.246f, 493.742f, -209.656f, 516.637f, 240.25f, 510.746f, 240.25f, 510.742f, 216.258f, 515.316f, 202.246f, 511.746f, -202.242f, 511.746f, 184.137f, 511.797f, 173.25f, 496.75f, 170.246f, 490.75f, 170.242f, 490.75f, -174.898f, 507.398f, 195.25f, 513.746f, 195.25f, 513.746f, 220.219f, 519.277f, 232.246f, 513.746f, -232.246f, 513.746f, 208.34f, 521.477f, 197.25f, 519.746f, 197.25f, 519.742f, 163.898f, 521.918f, -150.246f, 492.75f, 150.246f, 492.75f, 154.219f, 508.719f, 170.246f, 516.75f, 170.242f, 516.75f, -185.457f, 526.316f, 208.25f, 522.746f, 208.25f, 522.746f, 223.738f, 519.719f, 229.25f, 516.75f, -235.18f, 514.438f, 233.859f, 517.52f, 224.246f, 522.746f, 224.242f, 522.746f, 218.457f, 533.797f, -203.25f, 533.746f, 203.25f, 533.746f, 155.977f, 529.398f, 144.246f, 515.746f, 144.246f, 515.742f, -159.5f, 528.52f, 171.246f, 531.75f, 171.246f, 531.75f, 195.578f, 540.398f, 205.25f, 539.746f, -205.25f, 539.742f, 232.098f, 538.418f, 240.25f, 542.75f, 240.25f, 542.75f, 228.137f, 537.316f, -231.246f, 533.746f, 235.18f, 530.277f, 242.656f, 521.918f, 242.246f, 520.75f, 242.656f, 519.277f, -269.277f, 494.969f, 273.25f, 489.746f, 275.246f, 487.75f, 10, 0, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 5, 428.25f, 273.746f, 428.25f, 273.742f, 410.848f, -314.348f, 397.246f, 324.746f, 397.246f, 324.746f, 425.699f, 307.199f, 429.25f, 287.75f, 429.25f, -287.75f, 429.547f, 276.398f, 428.25f, 273.746f, 10, 0, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 7, 479.25f, 265.75f, 479.25f, 265.75f, 450.449f, 326.449f, -430.246f, 352.746f, 430.246f, 352.742f, 477.949f, 311.598f, 483.25f, 282.746f, 484.246f, 276.75f, -480.246f, 278.75f, 480.242f, 278.75f, 480.148f, 269.25f, 479.25f, 265.75f, 10, 0, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 542.246f, 319.746f, 542.246f, -319.742f, 473, 384.75f, 471.246f, 387.746f, 471.242f, 387.742f, 537.898f, 314.898f, 541.25f, -306.746f, 541.25f, 306.742f, 539, 316.547f, 542.246f, 319.746f, 10, 0, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 334.246f, 271.746f, 334.246f, 271.746f, -355.848f, 328.648f, 377.246f, 303.75f, 377.246f, 303.75f, 393.25f, 292.898f, 392.25f, 289.75f, -392.25f, 289.75f, 388.297f, 296.75f, 368.246f, 295.746f, 368.242f, 295.742f, 347.598f, 299.5f, -334.246f, 271.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -5, 544.246f, 411.746f, 544.246f, 411.742f, 494.449f, 443.047f, 486.25f, 444.746f, 473.211f, -447.297f, 540.648f, 412.797f, 546.246f, 400.75f, 546.242f, 400.75f, 548.348f, 404, 544.246f, -411.746f, 10, 0, 0, 0, 0, 0, 0, 0, 63, -378.246f, 294.75f, 378.246f, 294.75f, 400.621f, 296.637f, 408.246f, 303.75f, 413.246f, 299.746f, -432.246f, 342.75f, 436.25f, 336.75f, 436.25f, 336.75f, 452.098f, 352.957f, 451.25f, 361.746f, -450.34f, 370.559f, 465.246f, 354.746f, 465.246f, 354.746f, 465.246f, 354.742f, 464.418f, 367.918f, -472.25f, 360.75f, 472.25f, 360.75f, 469.699f, 377.598f, 479.25f, 368.746f, 479.25f, 368.746f, -467.348f, 401.969f, 492.25f, 373.75f, 498.301f, 366.598f, 493.246f, 373.75f, 493.246f, 373.75f, -493.242f, 373.75f, 464.859f, 426.879f, 488.25f, 410.75f, 488.25f, 410.75f, 490.82f, 436.117f, -489.246f, 440.746f, 488.18f, 445.797f, 485.98f, 470.438f, 480.246f, 475.746f, 475.418f, 481.879f, -481.141f, 483.637f, 487.246f, 477.746f, 487.246f, 477.742f, 474.98f, 504.316f, 489.246f, 490.75f, -489.246f, 490.75f, 485.539f, 507.84f, 480.246f, 510.746f, 480.242f, 510.742f, 474.539f, 529.84f, -491.246f, 517.746f, 491.242f, 517.742f, 486.418f, 531.598f, 483.25f, 534.75f, 483.25f, 534.75f, -470.141f, 565.477f, 478.246f, 559.746f, 483.25f, 555.75f, 483.25f, 555.75f, 475.418f, 571.637f, -482.246f, 566.75f, 489.5f, 561.957f, 489.246f, 562.75f, 489.246f, 562.75f, 489.246f, 562.75f, -466.18f, 598.918f, 488.25f, 579.746f, 488.25f, 579.746f, 479.645f, 594.867f, 476.246f, 602.75f, -476.246f, 602.75f, 455.18f, 624.879f, 471.246f, 617.75f, 476.246f, 615.75f, 476.246f, 615.75f, -466.621f, 627.078f, 458.246f, 628.75f, 449.02f, 630.598f, 460.461f, 637.637f, 467.246f, 635.75f, -474.539f, 633.238f, 491.246f, 624.75f, 491.246f, 624.75f, 491.242f, 624.75f, 505.777f, 604.199f, -510.25f, 603.746f, 510.25f, 603.746f, 488.18f, 612.117f, 495.246f, 603.746f, 495.242f, 603.746f, -510.621f, 587.918f, 502.246f, 588.75f, 502.242f, 588.75f, 496.098f, 580.438f, 501.25f, 570.746f, -501.25f, 570.746f, 481.074f, 590.988f, 497.25f, 562.75f, 505.25f, 544.746f, 505.25f, 544.746f, -478.059f, 572.078f, 490.25f, 547.75f, 490.25f, 547.75f, 509.301f, 521.918f, 511.246f, 521.746f, -513.699f, 521.039f, 518.25f, 511.746f, 518.25f, 511.746f, 513.246f, 513.746f, 519.25f, 503.75f, -519.25f, 503.75f, 507.098f, 517.078f, 513.246f, 502.746f, 520.246f, 486.746f, 520.246f, 486.742f, -497.418f, 510.918f, 512.25f, 478.746f, 512.25f, 478.746f, 494.34f, 484.078f, 504.246f, 464.746f, -504.242f, 464.742f, 502.258f, 447.559f, 502.246f, 441.75f, 503.141f, 436.117f, 504.461f, 404.879f, -499.25f, 395.75f, 494.777f, 387.277f, 506.219f, 366.156f, 508.25f, 361.746f, 510.621f, 357.355f, -514.578f, 345.477f, 505.25f, 355.75f, 495.219f, 365.719f, 500.059f, 359.559f, 502.246f, 349.75f, -504.461f, 340.195f, 511.059f, 323.035f, 510.25f, 316.75f, 510.25f, 316.75f, 508.859f, 315.559f, -505.25f, 319.746f, 505.25f, 319.742f, 489.059f, 344.598f, 491.246f, 328.746f, 491.242f, 328.742f, -489.5f, 319.957f, 486.25f, 310.746f, 486.25f, 310.742f, 482.461f, 298.398f, 482.246f, 307.75f, -482.242f, 307.75f, 478.938f, 326.559f, 476.246f, 317.746f, 472.777f, 309.836f, 468.82f, 303.238f, -465.246f, 300.75f, 462.66f, 297.957f, 456.938f, 323.035f, 455.25f, 311.75f, 455.25f, 311.75f, -442.418f, 325.238f, 437.25f, 306.746f, 424.246f, 288.746f, 424.242f, 288.742f, 423.938f, 302.797f, -422.246f, 295.746f, 422.246f, 295.742f, 389.621f, 289.598f, 378.246f, 294.75f, 10, 0, -0, 0, 0, 0, 0, 0, 34, 340.25f, 686.746f, 340.25f, -686.742f, 327.578f, 695.719f, 323.246f, 695.746f, 318.777f, 694.84f, 353.539f, 704.957f, 399.246f, -674.75f, 399.246f, 674.75f, 404.141f, 671.52f, 408.246f, 671.746f, 408.246f, 671.742f, 411.621f, -669.316f, 408.246f, 665.75f, 408.246f, 665.75f, 398.859f, 654.797f, 411.246f, 642.746f, 411.246f, -642.742f, 431.418f, 635, 425.25f, 644.75f, 425.25f, 644.75f, 437.141f, 640.277f, 440.25f, -635.75f, 442.418f, 631.477f, 441.246f, 635.75f, 441.246f, 635.75f, 441.246f, 635.75f, 434.059f, -643.797f, 427.25f, 649.746f, 427.25f, 649.742f, 421.738f, 651.719f, 418.25f, 660.746f, 415.578f, -670.199f, 412.938f, 681.199f, 418.25f, 684.746f, 418.25f, 684.742f, 413.379f, 679.879f, 414.25f, -684.746f, 415.141f, 688.68f, 419.098f, 692.637f, 421.246f, 692.75f, 422.621f, 693.52f, 440.66f, -710.898f, 448.25f, 711.746f, 448.25f, 711.746f, 438.02f, 709.797f, 434.246f, 710.746f, 431.418f, -712, 402.16f, 724.539f, 395.25f, 725.75f, 395.25f, 725.75f, 377.078f, 733.117f, 390.246f, -730.746f, 390.242f, 730.742f, 429.66f, 726.738f, 449.25f, 711.746f, 449.25f, 711.746f, 441.758f, -721.457f, 421.246f, 728.746f, 421.246f, 728.742f, 397.098f, 743.02f, 358.25f, 737.746f, 358.25f, -737.742f, 338.801f, 734, 330.25f, 731.75f, 330.25f, 731.75f, 327.359f, 732.68f, 326.25f, -732.746f, 326.039f, 733.559f, 313.059f, 743.457f, 282.25f, 735.746f, 282.25f, 735.746f, 264, -730.699f, 254.246f, 725.75f, 254.246f, 725.75f, 237.816f, 724.098f, 234.246f, 720.75f, 234.246f, -720.75f, 213.398f, 704.52f, 211.246f, 703.75f, 209, 702.758f, 196.457f, 694.398f, 195.25f, -693.746f, 195.25f, 693.742f, 222.637f, 701.219f, 225.25f, 703.75f, 227.918f, 706.5f, 247.059f, -709.359f, 249.25f, 707.75f, 252.34f, 706.277f, 261.578f, 706.938f, 251.25f, 706.746f, 251.25f, -706.742f, 334.18f, 690, 335.246f, 687.75f, 335.938f, 685.598f, 340.25f, 686.746f, 340.25f, -686.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 13, -419.246f, 696.75f, 419.246f, 696.75f, 407.66f, 705.18f, 405.25f, 704.746f, 403.258f, 705.18f, -389.621f, 716.398f, 385.25f, 715.746f, 380.379f, 715.52f, 366.961f, 726.52f, 337.25f, 717.746f, -337.25f, 717.742f, 336.16f, 719.699f, 340.25f, 720.75f, 340.25f, 720.75f, 347.16f, 723, -347.25f, 723.75f, 347.25f, 723.75f, 369.82f, 728.277f, 377.246f, 724.746f, 377.246f, 724.746f, -387.859f, 721.457f, 394.25f, 714.75f, 394.25f, 714.75f, 407, 711.117f, 410.246f, 711.746f, -410.246f, 711.746f, 420.199f, 709.797f, 420.246f, 707.75f, 420.246f, 707.75f, 427.02f, 704.52f, -425.25f, 701.75f, 425.25f, 701.75f, 425.48f, 699.898f, 419.246f, 696.75f, 10, 0, -0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 38, 405.25f, 699.746f, 406.047f, -698.664f, 407.168f, 698.555f, 408.246f, 697.746f, 408.094f, 697.32f, 407.773f, 696.961f, 407.25f, -696.75f, 406.281f, 696.504f, 405.121f, 697.133f, 404.25f, 696.75f, 403.422f, 696.258f, 402.715f, -696.457f, 402.246f, 696.75f, 400.313f, 697.105f, 398.301f, 697.137f, 396.25f, 696.75f, 394.254f, -697.621f, 391.66f, 696.977f, 389.246f, 697.746f, 389.309f, 698.109f, 389.063f, 697.727f, 389.246f, -697.746f, 385.629f, 699.016f, 381.512f, 698.707f, 379.246f, 700.746f, 376.168f, 701.672f, 373.574f, -702.18f, 371.25f, 702.746f, 368.906f, 703.488f, 367.355f, 704.574f, 365.246f, 705.75f, 364.059f, -706.27f, 362.457f, 706.844f, 361.25f, 707.75f, 358.719f, 707.75f, 356.703f, 707.625f, 354.246f, -707.75f, 354.52f, 708.227f, 354.309f, 707.848f, 354.246f, 707.75f, 353.863f, 707.996f, 353.543f, -708.637f, 353.246f, 708.746f, 351.508f, 708.004f, 349.871f, 709.074f, 348.25f, 708.746f, 346.742f, -710.043f, 344.844f, 709.773f, 343.246f, 710.746f, 339.883f, 711.195f, 336.414f, 709.797f, 333.246f, -710.746f, 337.602f, 712.926f, 342.758f, 711.57f, 347.25f, 713.746f, 349.789f, 715.148f, 352.715f, -713.938f, 355.246f, 714.75f, 356.078f, 714.934f, 356.84f, 715.152f, 357.246f, 714.75f, 357.426f, -714.566f, 357.625f, 714.828f, 357.246f, 714.75f, 360.387f, 713.527f, 362.934f, 712.125f, 365.246f, -710.746f, 366.039f, 710.793f, 366.621f, 711.047f, 367.246f, 710.746f, 368.57f, 709.488f, 370.711f, -709.602f, 372.25f, 708.746f, 374.105f, 708.809f, 376.078f, 708.391f, 378.246f, 708.746f, 378.066f, -709.109f, 378.324f, 708.734f, 378.246f, 708.746f, 379.602f, 709.582f, 380.875f, 709.281f, 382.25f, -708.746f, 382.227f, 708.82f, 382.957f, 708.551f, 383.25f, 708.746f, 384.531f, 708.164f, 385.473f, -707.637f, 387.246f, 707.75f, 386.895f, 707.414f, 387.098f, 707.789f, 387.246f, 707.75f, 388.41f, -707.277f, 389.559f, 707.34f, 390.246f, 705.75f, 390.426f, 706.207f, 390.609f, 706.469f, 390.246f, -706.746f, 391.828f, 706.066f, 392.543f, 705.238f, 394.25f, 704.746f, 394.289f, 704.855f, 394.961f, -704.168f, 395.25f, 703.75f, 398.227f, 703.168f, 400.254f, 701.488f, 402.246f, 700.746f, 403.5f, -700.16f, 404.465f, 699.902f, 405.25f, 699.746f, 10, 0, 0.8f, 0.45f, 0.15f, -0.8f, 0.45f, 0.15f, 23, 321.246f, 714.75f, 318.094f, 716.91f, 315.488f, 718.125f, -313.246f, 719.746f, 312.605f, 720.234f, 312.207f, 720.051f, 312.246f, 719.746f, 310.879f, 720.852f, -309.902f, 721.492f, 309.246f, 722.746f, 308.227f, 722.68f, 307.324f, 722.664f, 307.25f, 722.746f, -303.969f, 724.371f, 301.074f, 724.984f, 298.246f, 726.746f, 299.066f, 727, 300.301f, 726.73f, -301.246f, 727.75f, 301.172f, 727.309f, 301.434f, 726.996f, 302.246f, 726.746f, 303.668f, 728.203f, -305.703f, 728.371f, 307.25f, 728.746f, 309.422f, 728.172f, 311.313f, 727.836f, 313.246f, 727.75f, -313.605f, 727.484f, 313.824f, 726.91f, 314.25f, 726.746f, 316.629f, 726.074f, 319.258f, 726.648f, -321.246f, 725.75f, 323.336f, 725.035f, 325.066f, 724.133f, 326.25f, 722.746f, 326.703f, 722.441f, -326.348f, 722.113f, 326.25f, 721.746f, 326.465f, 722.02f, 326.766f, 721.793f, 327.25f, 721.746f, -326.98f, 721.184f, 326.98f, 720.852f, 327.25f, 720.75f, 326.766f, 720.246f, 326.457f, 720.133f, -326.25f, 719.746f, 324.5f, 719.871f, 326.449f, 721.387f, 325.25f, 720.75f, 324.277f, 720, -325.098f, 718.453f, 324.246f, 716.75f, 323.973f, 717.27f, 323.719f, 717.512f, 324.246f, 717.746f, -324.098f, 717.363f, 323.434f, 717.043f, 323.246f, 716.75f, 322.824f, 715.898f, 321.836f, 714.344f, -321.246f, 714.75f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, -25, 285.25f, 706.746f, 281.645f, 707.801f, 278.293f, 707.676f, 275.246f, 708.746f, 274.898f, -709.109f, 274.656f, 708.727f, 274.25f, 708.746f, 273.082f, 709.41f, 272.07f, 710.473f, 271.25f, -711.746f, 269.883f, 712.602f, 268.059f, 712.176f, 266.246f, 712.75f, 266.301f, 712.848f, 266.078f, -713.41f, 266.246f, 713.746f, 264.406f, 713.625f, 263.387f, 714.672f, 262.25f, 715.746f, 264.809f, -716.172f, 267.461f, 716.137f, 270.25f, 716.75f, 270.293f, 716.582f, 270.453f, 716.227f, 270.25f, -715.746f, 270.746f, 716.227f, 270.891f, 716.469f, 271.25f, 716.75f, 271.254f, 716.309f, 271.586f, -715.953f, 272.25f, 715.746f, 272.469f, 716.824f, 273.082f, 716.617f, 273.25f, 716.75f, 273.836f, -716.563f, 273.973f, 716.227f, 274.25f, 715.746f, 274.27f, 716.227f, 274.41f, 716.57f, 274.25f, -716.75f, 274.707f, 716.57f, 274.852f, 716.227f, 275.246f, 715.746f, 275.148f, 716.227f, 275.289f, -716.469f, 275.246f, 716.75f, 276.199f, 715.758f, 277.172f, 716.367f, 278.246f, 715.746f, 279.219f, -715.922f, 279.512f, 714.656f, 280.246f, 714.75f, 285.879f, 712.895f, 290.43f, 710.535f, 295.25f, -707.75f, 295.566f, 708.078f, 295.801f, 707.805f, 295.25f, 707.75f, 295.973f, 707.379f, 296.316f, -707.477f, 296.25f, 707.75f, 297.688f, 706.523f, 298.832f, 705.922f, 299.246f, 704.746f, 299.84f, -704.34f, 299.477f, 703.895f, 299.246f, 703.75f, 294.348f, 705.047f, 289.941f, 705.715f, 285.25f, -706.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 10, -270.25f, 658.746f, 268.117f, 659.637f, 267.477f, 661.871f, 266.246f, 663.75f, 266, 664.215f, -266.301f, 664.563f, 266.246f, 664.746f, 267.266f, 664.832f, 267.863f, 664.309f, 268.246f, 663.75f, -270.234f, 663.137f, 271.922f, 661.77f, 274.25f, 661.75f, 276.309f, 659.16f, 280.992f, 658.738f, -281.25f, 654.75f, 281, 654.074f, 279.43f, 655.082f, 279.246f, 653.746f, 276.262f, 655.242f, -273.633f, 655.129f, 271.25f, 656.746f, 270.336f, 657.16f, 270.699f, 657.66f, 270.25f, 658.746f, -10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 6, 239.25f, -715.746f, 239.727f, 716.129f, 247.461f, 715.871f, 247.246f, 715.746f, 247.391f, 715.406f, 238.891f, -714.254f, 238.25f, 714.75f, 238.309f, 714.523f, 230.047f, 711.852f, 230.25f, 711.746f, 230.191f, -712.148f, 239.285f, 716.129f, 239.25f, 715.746f, 10, 0, 0, 0, 0, -0, 0, 0, 80, 256.246f, 705.75f, 256.246f, 705.75f, 240.238f, 703.418f, -235.246f, 701.75f, 230.559f, 700.777f, 210.098f, 692.418f, 207.25f, 689.746f, 207.25f, 689.746f, -192.059f, 684.277f, 173.25f, 662.746f, 173.25f, 662.742f, 181.719f, 666.02f, 184.25f, 668.75f, -184.25f, 668.75f, 199.098f, 682.957f, 199.246f, 679.75f, 199.246f, 679.75f, 212.297f, 689.559f, -211.246f, 686.746f, 211.246f, 686.742f, 238.477f, 699.457f, 236.25f, 695.746f, 236.25f, 695.742f, -260.039f, 701, 259.25f, 698.75f, 259.25f, 698.75f, 279.617f, 693.957f, 276.246f, 693.746f, -276.246f, 693.742f, 270.156f, 692.418f, 277.246f, 688.746f, 277.246f, 688.742f, 273.457f, 683.617f, -267.246f, 687.75f, 261.578f, 692.418f, 264.879f, 690, 259.25f, 688.746f, 259.25f, 688.742f, -256.52f, 688.02f, 251.25f, 692.75f, 251.25f, 692.75f, 245.297f, 697.477f, 235.246f, 693.746f, -235.242f, 693.742f, 201.957f, 679.656f, 200.246f, 678.746f, 200.246f, 678.746f, 195.797f, 675.918f, -193.25f, 671.746f, 193.25f, 671.742f, 186.777f, 667.117f, 183.25f, 665.75f, 183.25f, 665.75f, -169.398f, 652.816f, 168.25f, 651.746f, 168.25f, 651.742f, 164.34f, 645.559f, 163.25f, 644.75f, -163.25f, 644.75f, 170.5f, 649.297f, 172.25f, 651.746f, 172.25f, 651.742f, 188.098f, 662.5f, -194.25f, 663.75f, 194.25f, 663.75f, 198.879f, 666.68f, 200.246f, 667.746f, 200.246f, 667.746f, -215.598f, 678.34f, 220.246f, 678.746f, 220.246f, 678.746f, 230.34f, 672.617f, 233.246f, 680.746f, -233.246f, 680.746f, 239.359f, 682.297f, 245.246f, 680.746f, 245.246f, 680.746f, 249.039f, 683.84f, -248.25f, 686.746f, 248.25f, 686.742f, 249.918f, 688.238f, 251.25f, 683.75f, 251.25f, 683.75f, -254.758f, 680.098f, 260.25f, 682.746f, 260.25f, 682.742f, 264.437f, 682.52f, 262.25f, 679.75f, -262.25f, 679.75f, 257.398f, 675.699f, 244.246f, 675.746f, 244.246f, 675.742f, 230.777f, 674.816f, -212.246f, 666.75f, 212.246f, 666.75f, 179.957f, 655.02f, 170.246f, 643.75f, 170.242f, 643.75f, -162.797f, 633.898f, 157.25f, 632.75f, 157.25f, 632.75f, 150.477f, 631.699f, 144.246f, 623.746f, -144.246f, 623.746f, 154.656f, 629.938f, 164.246f, 629.746f, 164.242f, 629.742f, 168.957f, 632.578f, -165.246f, 628.75f, 165.242f, 628.75f, 160.816f, 620.258f, 162.25f, 614.746f, 162.25f, 614.746f, -161.918f, 608.598f, 161.246f, 606.75f, 161.246f, 606.75f, 152.457f, 592.758f, 152.25f, 589.75f, -152.457f, 587.477f, 153.777f, 576.699f, 154.246f, 575.75f, 154.656f, 575.379f, 153.117f, 577.797f, -157.25f, 574.746f, 161.477f, 572.52f, 164.559f, 570.758f, 165.246f, 567.75f, 166.316f, 564.598f, -163.238f, 573.617f, 163.25f, 575.75f, 162.797f, 577.578f, 158.18f, 585.5f, 159.246f, 587.746f, -159.242f, 587.742f, 160.156f, 587.039f, 161.246f, 585.746f, 161.246f, 585.742f, 160.379f, 586.156f, -161.246f, 589.75f, 161.246f, 589.75f, 161.918f, 595.84f, 163.25f, 599.75f, 165, 602.879f, -167.199f, 607.059f, 167.25f, 607.746f, 168.078f, 608.816f, 168.078f, 615.199f, 169.25f, 612.746f, -173.25f, 609.746f, 173.25f, 609.742f, 170.277f, 612.34f, 172.25f, 614.746f, 172.25f, 614.746f, -171.598f, 620.918f, 173.25f, 623.746f, 173.25f, 623.746f, 181.277f, 633.02f, 183.25f, 633.75f, -184.797f, 635.219f, 183.25f, 634.746f, 183.25f, 634.746f, 183.25f, 634.746f, 189.859f, 639.398f, -183.25f, 637.75f, 183.25f, 637.75f, 179.078f, 635.879f, 176.246f, 635.75f, 176.246f, 635.75f, -167.418f, 633.68f, 172.25f, 638.746f, 176.219f, 642.918f, 187.219f, 648.859f, 191.246f, 648.75f, -192.25f, 646.75f, 204.25f, 649.746f, 203.25f, 648.75f, 203.25f, 648.75f, 203.059f, 648.859f, -207.25f, 649.746f, 212.297f, 649.738f, 218.68f, 648.199f, 220.246f, 649.746f, 221.758f, 652.156f, -225.5f, 653.258f, 225.25f, 651.746f, 224.617f, 650.18f, 224.246f, 647.746f, 224.246f, 647.746f, -224.242f, 647.746f, 229.898f, 654.359f, 229.25f, 651.746f, 228.578f, 649.52f, 219.559f, 643.797f, -218.25f, 636.746f, 229.25f, 645.746f, 233.246f, 649.746f, 233.246f, 649.742f, 237.379f, 646.879f, -237.25f, 648.75f, 237.816f, 650.398f, 242.879f, 656.777f, 244.246f, 656.746f, 245.52f, 656.34f, -247.719f, 659.418f, 247.246f, 656.746f, 247.277f, 653.699f, 255.246f, 647.746f, 255.246f, 647.746f, -255.246f, 647.746f, 259.156f, 649.738f, 260.25f, 647.746f, 262.238f, 646.656f, 267.246f, 669.746f, -267.246f, 669.746f, 294.25f, 681.75f, 342.246f, 685.75f, 323.246f, 692.75f, 256.246f, 705.75f, -10, 2.2f, 0.3f, 0, 0, 0.3f, 0, 0, 3, 276.246f, -486.746f, 276.246f, 486.742f, 260.039f, 504.977f, 251.25f, 507.75f, 251.25f, 507.75f, 236.059f, -515.316f, 209.246f, 506.746f, 10, 2.2f, 0.3f, 0, 0, 0.3f, 0, -0, 3, 247.246f, 509.75f, 247.242f, 509.75f, 219.559f, 518.18f, 202.246f, 513.746f, -202.242f, 513.746f, 182.379f, 511.359f, 173.25f, 495.746f, 10, 2.2f, 0.3f, 0, -0, 0.3f, 0, 0, 4, 243.246f, 510.746f, 243.246f, 510.742f, 224.617f, -518.617f, 208.25f, 520.75f, 208.25f, 520.75f, 190.078f, 523.898f, 172.25f, 515.746f, 172.25f, -515.742f, 158.398f, 509.379f, 152.25f, 497.746f, 10, 2.2f, 0.3f, 0, 0, -0.3f, 0, 0, 4, 244.246f, 510.746f, 244.246f, 510.742f, 227.477f, 522.359f, -226.25f, 523.75f, 226.25f, 523.75f, 218.68f, 536, 204.25f, 536.75f, 204.25f, 536.75f, -180.84f, 535.559f, 162.25f, 526.746f, 10, 0, 0, 0, 0, 0, -0, 0, 169, 243.246f, 519.746f, 244.68f, 518.543f, 274.25f, 486.746f, 274.25f, -486.746f, 313.059f, 446.457f, 282.25f, 483.75f, 282.25f, 483.75f, 273.898f, 489.359f, 264.246f, -509.75f, 264.246f, 509.75f, 262.457f, 513.117f, 279.246f, 501.75f, 279.246f, 501.75f, 283.578f, -501.238f, 298.246f, 479.75f, 298.246f, 479.75f, 291.059f, 482.758f, 296.25f, 474.75f, 296.25f, -474.75f, 299.418f, 472.637f, 322.246f, 455.746f, 322.246f, 455.746f, 325.82f, 451.078f, 330.25f, -449.746f, 330.25f, 449.746f, 345.621f, 455.035f, 338.25f, 440.746f, 338.25f, 440.746f, 341.219f, -433.035f, 347.25f, 445.746f, 347.25f, 445.746f, 359.699f, 464.277f, 341.25f, 461.75f, 341.25f, -461.75f, 308.656f, 458.559f, 301.246f, 475.746f, 301.246f, 475.746f, 298.539f, 478.797f, 308.246f, -475.746f, 308.246f, 475.746f, 317.461f, 473.957f, 300.246f, 489.746f, 300.246f, 489.746f, 302.937f, -489.797f, 313.246f, 482.746f, 313.246f, 482.746f, 324.5f, 472.199f, 326.25f, 474.75f, 326.25f, -474.75f, 346.5f, 484.078f, 358.25f, 475.746f, 358.25f, 475.746f, 360.141f, 473.957f, 353.98f, -466.477f, 355.246f, 460.746f, 357.5f, 455.035f, 363.25f, 441.75f, 363.25f, 441.75f, 360.141f, -439.637f, 360.25f, 427.746f, 360.25f, 427.746f, 379.059f, 402.238f, 368.246f, 404.75f, 368.246f, -404.75f, 351.34f, 404.879f, 367.246f, 396.746f, 367.246f, 396.746f, 371.141f, 394.316f, 381.25f, -386.75f, 381.25f, 386.75f, 377.738f, 387.719f, 376.246f, 381.746f, 376.246f, 381.746f, 381.258f, -377.598f, 378.246f, 372.746f, 378.246f, 372.746f, 371.578f, 370.996f, 370.25f, 366.75f, 370.25f, -366.75f, 377.738f, 357.797f, 366.246f, 357.746f, 366.246f, 357.746f, 370.699f, 352.516f, 365.246f, -339.746f, 365.246f, 339.746f, 360.141f, 339.316f, 353.246f, 332.746f, 353.246f, 332.746f, 355.738f, -327.879f, 344.246f, 321.746f, 344.246f, 321.746f, 335.059f, 319.957f, 338.25f, 312.75f, 338.25f, -312.75f, 329.34f, 305.879f, 326.25f, 288.746f, 326.25f, 288.746f, 325.82f, 276.836f, 323.18f, -273.316f, 329.25f, 275.746f, 334.621f, 277.719f, 333.246f, 291.746f, 333.246f, 291.746f, 328.461f, -308.516f, 375.246f, 325.75f, 375.246f, 325.75f, 379.938f, 327.879f, 381.25f, 333.75f, 381.25f, -333.75f, 383.02f, 333.156f, 392.25f, 324.746f, 392.25f, 324.746f, 401.059f, 312.477f, 401.246f, -322.75f, 401.246f, 322.75f, 402.82f, 326.559f, 401.246f, 332.746f, 401.246f, 332.746f, 407.66f, -356.918f, 392.25f, 363.746f, 392.25f, 363.746f, 381.258f, 400.918f, 396.25f, 391.75f, 396.25f, -391.75f, 399.738f, 385.516f, 411.246f, 379.746f, 411.246f, 379.746f, 415.25f, 382.75f, 413.82f, -387.719f, 423.246f, 394.746f, 423.246f, 394.746f, 426.141f, 387.277f, 432.246f, 395.75f, 432.246f, -395.75f, 436.699f, 422.918f, 450.25f, 406.75f, 450.25f, 406.75f, 454.738f, 405.758f, 456.246f, -412.746f, 456.246f, 412.746f, 460.02f, 424.676f, 456.246f, 439.75f, 456.246f, 439.75f, 460.02f, -440.078f, 470.25f, 433.746f, 470.25f, 433.746f, 473.66f, 437.438f, 463.539f, 455.918f, 468.25f, -453.746f, 472.34f, 450.637f, 477.25f, 448.75f, 477.25f, 448.75f, 478.059f, 451.078f, 467.246f, -464.746f, 467.246f, 464.746f, 462.219f, 467.797f, 456.246f, 489.746f, 456.246f, 489.746f, 464.418f, -486.277f, 453.25f, 502.746f, 453.25f, 502.746f, 453.418f, 506.52f, 460.246f, 518.75f, 460.246f, -518.75f, 459.141f, 526.316f, 460.246f, 525.75f, 460.246f, 525.75f, 463.098f, 524.559f, 471.898f, -522.797f, 464.25f, 529.75f, 456.938f, 536.879f, 465.246f, 541.746f, 465.246f, 541.746f, 470.141f, -545.238f, 455.25f, 544.746f, 455.25f, 544.746f, 449.461f, 549.637f, 450.25f, 553.75f, 450.25f, -553.75f, 458.699f, 551.84f, 442.859f, 567.68f, 440.25f, 571.75f, 437.578f, 575.598f, 448.25f, -581.746f, 448.25f, 581.746f, 462.66f, 585.277f, 450.25f, 588.75f, 450.25f, 588.75f, 428.34f, -588.359f, 440.25f, 599.75f, 440.25f, 599.75f, 446.82f, 599.797f, 445.246f, 602.75f, 445.246f, -602.75f, 439.34f, 603.758f, 429.25f, 610.75f, 429.25f, 610.75f, 424.379f, 614.758f, 428.25f, -613.75f, 428.25f, 613.75f, 446.82f, 612.559f, 415.25f, 624.75f, 415.25f, 624.75f, 423.938f, -624.879f, 404.25f, 636.746f, 404.25f, 636.746f, 401.938f, 638.078f, 398.246f, 646.75f, 398.246f, -646.75f, 391.82f, 652.156f, 386.246f, 659.75f, 386.246f, 659.75f, 386.098f, 664.477f, 381.25f, -669.746f, 381.25f, 669.746f, 368.059f, 684.719f, 362.25f, 684.746f, 362.25f, 684.746f, 345.621f, -688.238f, 340.25f, 687.75f, 340.25f, 687.75f, 282.25f, 682.746f, 252.777f, 668.438f, 261.25f, -645.746f, 261.25f, 645.746f, 268.398f, 636.098f, 278.246f, 640.746f, 278.246f, 640.746f, 283.578f, -647.098f, 296.25f, 644.75f, 296.25f, 644.75f, 318.777f, 641.156f, 316.25f, 644.75f, 316.25f, -644.75f, 313.277f, 650.18f, 295.457f, 657, 295.25f, 657.75f, 295.02f, 658.316f, 285.25f, -661.75f, 285.25f, 661.75f, 282.039f, 663.379f, 277.246f, 673.746f, 277.246f, 673.746f, 273.68f, -677.238f, 291.246f, 670.75f, 291.246f, 670.75f, 289.738f, 669.758f, 298.246f, 665.75f, 298.246f, -665.75f, 317.02f, 666.457f, 328.25f, 654.75f, 328.25f, 654.75f, 340.559f, 636.316f, 341.25f, -645.746f, 341.25f, 645.746f, 343.859f, 655.68f, 331.246f, 678.746f, 331.246f, 678.746f, 331.32f, -681.199f, 340.25f, 673.746f, 340.25f, 673.746f, 341.879f, 676.137f, 343.246f, 669.746f, 343.246f, -669.746f, 342.98f, 667.117f, 347.25f, 658.746f, 347.25f, 658.746f, 350.238f, 644.02f, 354.246f, -651.746f, 354.246f, 651.746f, 359.25f, 641.75f, 360.801f, 638.957f, 354.246f, 630.75f, 354.246f, -630.75f, 353.98f, 627.52f, 354.859f, 627.738f, 348.25f, 619.75f, 342.539f, 611.02f, 346.246f, -605.746f, 346.246f, 605.746f, 344.738f, 598.918f, 354.246f, 599.75f, 354.246f, 599.75f, 357.277f, -596.938f, 361.25f, 596.746f, 361.25f, 596.746f, 363, 594.738f, 365.246f, 595.75f, 365.246f, -595.75f, 367.398f, 599.578f, 374.25f, 597.75f, 374.25f, 597.75f, 375.758f, 600.02f, 385.25f, -600.75f, 385.25f, 600.75f, 385.879f, 603.316f, 386.32f, 605.078f, 390.246f, 605.746f, 393.801f, -606.398f, 366.246f, 653.746f, 366.246f, 653.746f, 373.777f, 654.578f, 365.246f, 667.746f, 365.246f, -667.746f, 362.34f, 675.477f, 374.879f, 659.418f, 377.246f, 657.75f, 379.719f, 656.34f, 380.82f, -653.918f, 379.246f, 653.746f, 377.301f, 654.359f, 375.32f, 651.938f, 377.246f, 651.746f, 378.398f, -651.5f, 392.699f, 635, 396.25f, 623.746f, 400.18f, 612.559f, 406.777f, 608.156f, 413.246f, -601.746f, 420.418f, 594.957f, 419.246f, 568.746f, 419.246f, 568.746f, 419.098f, 558.656f, 425.25f, -546.746f, 425.25f, 546.746f, 427.898f, 542.816f, 423.246f, 522.746f, 423.246f, 522.746f, 421.078f, -520.379f, 422.246f, 519.746f, 422.246f, 519.746f, 423.719f, 518.18f, 431.246f, 503.75f, 431.246f, -503.75f, 429.219f, 503.879f, 433.246f, 499.746f, 433.246f, 499.746f, 438.898f, 493.316f, 432.246f, -496.75f, 432.246f, 496.75f, 425.258f, 498.379f, 433.246f, 487.75f, 433.246f, 487.75f, 434.277f, -485.617f, 424.246f, 490.75f, 424.246f, 490.75f, 414.258f, 491.34f, 427.25f, 483.75f, 427.25f, -483.75f, 436.48f, 475.5f, 424.246f, 480.746f, 424.246f, 480.746f, 418.879f, 482.316f, 422.246f, -474.75f, 422.246f, 474.75f, 425.918f, 473.078f, 445.246f, 465.75f, 445.246f, 465.75f, 445.277f, -461.195f, 442.246f, 455.746f, 442.246f, 455.746f, 442.418f, 451.297f, 440.25f, 447.746f, 440.25f, -447.746f, 438.68f, 438.535f, 438.25f, 437.75f, 438.25f, 437.75f, 433.398f, 437.438f, 425.25f, -422.746f, 425.25f, 422.746f, 423.277f, 419.398f, 412.246f, 405.746f, 412.246f, 405.746f, 409.859f, -398.496f, 390.246f, 406.75f, 390.246f, 406.75f, 382.801f, 402.676f, 385.25f, 406.75f, 385.25f, -406.75f, 384.559f, 408.836f, 390.246f, 415.75f, 390.246f, 415.75f, 397.539f, 418.297f, 394.25f, -429.746f, 394.25f, 429.746f, 399.078f, 431.719f, 386.758f, 434.797f, 387.246f, 435.75f, 387.199f, -437.438f, 393.25f, 438.746f, 393.25f, 438.746f, 402.379f, 441.176f, 397.246f, 443.75f, 397.246f, -443.75f, 396.879f, 448.219f, 400.246f, 454.75f, 400.246f, 454.75f, 412.938f, 455.258f, 400.246f, -472.75f, 400.246f, 472.75f, 388.301f, 481.438f, 387.246f, 487.75f, 387.246f, 487.75f, 401.059f, -496.84f, 392.039f, 510.477f, 392.25f, 514.75f, 392.48f, 518.398f, 394.25f, 541.746f, 394.25f, -541.746f, 391.598f, 548.977f, 388.246f, 563.746f, 388.246f, 563.746f, 390.719f, 569.656f, 399.246f, -583.746f, 399.246f, 583.746f, 401.938f, 588.137f, 411.621f, 593.418f, 409.246f, 596.746f, 406.777f, -600.02f, 398.246f, 597.75f, 398.246f, 597.75f, 389.621f, 599.578f, 390.246f, 593.75f, 390.246f, -593.75f, 388.52f, 592.758f, 387.246f, 587.746f, 387.246f, 587.746f, 386.848f, 578.531f, 377.246f, -571.75f, 377.246f, 571.75f, 364.758f, 564.816f, 375.246f, 560.75f, 375.246f, 560.75f, 381.48f, -553.156f, 370.25f, 552.746f, 370.25f, 552.746f, 358.598f, 554.918f, 367.246f, 543.746f, 367.246f, -543.746f, 379.5f, 529.617f, 376.246f, 526.746f, 376.246f, 526.746f, 364.98f, 525.438f, 379.246f, -515.746f, 379.246f, 515.746f, 379.242f, 515.742f, 377.961f, 517.52f, 378.246f, 515.746f, 378.398f, -513.559f, 381.699f, 508.938f, 382.25f, 506.746f, 383.461f, 504.539f, 379.246f, 504.746f, 379.246f, -504.746f, 379.719f, 493.758f, 363.25f, 498.75f, 363.25f, 498.75f, 363.25f, 498.75f, 362.777f, -498.379f, 361.25f, 497.746f, 359.258f, 497.938f, 346.938f, 498.816f, 340.25f, 500.746f, 334.18f, -503.656f, 326.25f, 503.75f, 326.25f, 503.75f, 326.25f, 503.75f, 322.301f, 501.68f, 314.25f, -501.75f, 305.578f, 502.117f, 297.246f, 498.75f, 297.246f, 498.75f, 291.937f, 499.477f, 301.398f, -504.316f, 301.246f, 503.75f, 301.84f, 503.879f, 308, 510.039f, 299.246f, 509.75f, 275.223f, -507.578f, 263.25f, 518.75f, 263.25f, 518.75f, 261.137f, 520.379f, 258.246f, 523.75f, 258.246f, -523.75f, 247.277f, 525.656f, 260.25f, 509.75f, 260.25f, 509.75f, 261.137f, 508.277f, 259.25f, -506.746f, 259.25f, 506.746f, 258.719f, 508.938f, 250.25f, 514.75f, 250.25f, 514.75f, 247.047f, -515.949f, 245.547f, 517.414f, 243.246f, 519.746f, 10, 0, 0.3f, 0, 0, -0.3f, 0, 0, 7, 216.25f, 532.746f, 216.25f, 532.742f, 229.457f, 526.758f, -232.246f, 523.75f, 235.18f, 520.598f, 250.25f, 507.75f, 250.25f, 507.75f, 250.25f, 507.75f, -244.637f, 510.258f, 242.246f, 511.746f, 238.918f, 514.219f, 227.25f, 522.746f, 227.25f, 522.746f, -227.25f, 522.746f, 222.859f, 529.84f, 216.25f, 532.746f, 10, 0, 0.6f, 0.8f, -0.2f, 0.6f, 0.8f, 0.2f, 6, 153.246f, 566.75f, 153.258f, 567.398f, 152.684f, -570.379f, 152.25f, 570.746f, 151.332f, 573.977f, 141.25f, 575.75f, 141.25f, 575.75f, 141.207f, -574.098f, 141.148f, 572.34f, 141.25f, 570.746f, 141.25f, 570.746f, 146.621f, 564.469f, 153.246f, -566.75f, 10, 0, 0.4f, 0.6f, 0, 0.4f, 0.6f, 0, 6, -153.246f, 567.75f, 152.395f, 567.281f, 152.871f, 570.461f, 152.25f, 570.746f, 151.555f, 573.977f, -141.25f, 575.75f, 141.25f, 575.75f, 141.207f, 574.207f, 141.148f, 572.449f, 141.25f, 570.746f, -141.25f, 570.746f, 145.961f, 565.02f, 153.246f, 567.75f, 10, 0, 0, 0, -0, 0, 0, 0, 6, 148.246f, 567.75f, 147.371f, 567.297f, 146.812f, -568.551f, 147.25f, 569.75f, 146.812f, 571.645f, 147.371f, 572.898f, 148.246f, 572.746f, 148.746f, -572.898f, 149.305f, 571.645f, 149.246f, 569.75f, 149.305f, 568.551f, 148.746f, 567.297f, 148.246f, -567.75f, 10, 0, 0, 0, 0, 0, 0, 0, 17, -98.2461f, 459.75f, 98.2422f, 459.75f, 91.7383f, 448.438f, 119.25f, 454.75f, 119.25f, 454.75f, -134.418f, 456.355f, 137.246f, 458.746f, 138.379f, 458.117f, 147.582f, 454.891f, 150.246f, 453.746f, -158.18f, 452.398f, 167.25f, 463.75f, 167.25f, 463.75f, 167.25f, 463.75f, 172.477f, 474.949f, -175.25f, 474.75f, 178.637f, 474.949f, 175.25f, 472.75f, 175.25f, 472.75f, 175.25f, 472.75f, -167.859f, 462.078f, 168.25f, 460.746f, 168.25f, 460.742f, 162.578f, 438.316f, 145.25f, 437.75f, -145.25f, 437.75f, 127.215f, 436.391f, 128.25f, 429.746f, 128.25f, 429.742f, 138.379f, 432.598f, -141.25f, 429.746f, 141.25f, 429.742f, 152.898f, 430.398f, 144.246f, 423.746f, 136.25f, 410.75f, -136.25f, 410.75f, 136.773f, 406.289f, 125.25f, 409.746f, 114.84f, 413.898f, 103.25f, 427.746f, -103.25f, 427.746f, 103.25f, 427.742f, 85.9648f, 444.094f, 98.2461f, 459.75f, 10, 0, -0.9f, 0.6f, 0.6f, 0.9f, 0.6f, 0.6f, 14, 96.25f, 454.75f, 96.25f, -454.75f, 94.3789f, 444.477f, 135.25f, 455.746f, 135.25f, 455.742f, 139.699f, 455.918f, 142.246f, -454.75f, 144.977f, 454.156f, 158.18f, 451.078f, 160.246f, 452.75f, 160.246f, 452.75f, 152.457f, -437.438f, 139.246f, 438.746f, 139.246f, 438.742f, 125.18f, 437.438f, 125.25f, 431.746f, 125.25f, -431.742f, 130.02f, 424.238f, 135.25f, 421.75f, 135.25f, 421.75f, 138.379f, 418.957f, 138.246f, -415.75f, 137.5f, 411.918f, 134.418f, 410.156f, 132.246f, 409.746f, 130.02f, 408.398f, 126.5f, -411.918f, 124.25f, 411.746f, 122.977f, 411.918f, 113.738f, 418.957f, 109.246f, 423.746f, 104.059f, -429.516f, 94.8164f, 442.719f, 95.25f, 445.746f, 95.6992f, 448.879f, 96.25f, 454.75f, 96.25f, -454.75f, 10, 0, 0.7f, 0.4f, 0.4f, 0.7f, 0.4f, 0.4f, 13, -100.246f, 435.75f, 102.957f, 431.496f, 106.477f, 426.879f, 109.246f, 423.746f, 113.738f, 418.957f, -122.977f, 411.918f, 124.25f, 411.746f, 126.5f, 411.918f, 130.02f, 408.398f, 132.246f, 409.746f, -134.418f, 410.156f, 137.5f, 411.918f, 138.246f, 415.75f, 138.379f, 418.957f, 135.25f, 421.75f, -135.25f, 421.75f, 131.926f, 423.285f, 128.91f, 427.125f, 127.246f, 429.746f, 127.246f, 429.742f, -127.379f, 426.879f, 121.246f, 427.746f, 115.938f, 428.637f, 110.219f, 431.719f, 108.25f, 434.746f, -106.699f, 438.758f, 104.059f, 441.398f, 106.25f, 437.75f, 107.578f, 433.477f, 110.219f, 429.516f, -112.25f, 428.75f, 113.738f, 428.637f, 113.297f, 427.316f, 110.246f, 427.746f, 108.02f, 428.195f, -104.938f, 428.637f, 100.246f, 434.746f, 10, 0, 0.6f, 0.15f, 0, 0.6f, -0.15f, 0, 20, 97.25f, 458.746f, 97.25f, 458.746f, 99.2187f, 473.957f, 100.246f, -478.746f, 100.246f, 478.746f, 99.6563f, 485.84f, 102.25f, 490.75f, 104.938f, 495.078f, 107.137f, -501.898f, 110.246f, 507.75f, 113.738f, 513.777f, 113.957f, 518.18f, 118.25f, 519.746f, 122.758f, -521.699f, 129.359f, 531.156f, 132.246f, 532.746f, 135.52f, 533.359f, 135.25f, 532.746f, 135.25f, -532.746f, 135.25f, 532.742f, 142.777f, 548.758f, 157.25f, 544.746f, 157.25f, 544.746f, 139.918f, -547.438f, 157.25f, 557.746f, 157.25f, 557.746f, 152.02f, 556.566f, 155.246f, 564.75f, 158.07f, -569.402f, 157.52f, 561.957f, 145.25f, 548.746f, 145.25f, 548.746f, 139.918f, 539.52f, 134.25f, -535.746f, 128.477f, 532.918f, 115.277f, 525.219f, 114.25f, 520.75f, 112.637f, 516.859f, 109.117f, -510.477f, 107.25f, 508.746f, 104.719f, 506.957f, 101.637f, 502.34f, 101.25f, 498.75f, 101.25f, -498.75f, 99.8789f, 494.199f, 98.2461f, 492.75f, 96.7969f, 491.559f, 96.5781f, 488.039f, 96.25f, -485.75f, 96.5781f, 483.637f, 94.3789f, 480.559f, 94.2461f, 477.746f, 94.2461f, 477.742f, 95.4766f, -457.016f, 95.25f, 454.75f, 97.25f, 458.746f, 10, 0, 1, 1, 1, -1, 1, 1, 6, 88.2461f, 453.746f, 88.2461f, 453.742f, 85.5781f, 455.477f, -80.25f, 448.75f, 80.25f, 448.75f, 88.7695f, 412.578f, 89.2461f, 410.75f, 89.2461f, 410.75f, -89.9766f, 413.348f, 88.2461f, 421.75f, 87.1172f, 429.188f, 86.25f, 442.746f, 86.25f, 442.746f, -88.2461f, 453.746f, 10, 0, 0.6f, 0.15f, 0, 0.6f, 0.15f, 0, -13, 111.246f, 520.75f, 111.246f, 520.75f, 92.1797f, 517.078f, 92.2461f, 484.746f, 91.25f, -457.75f, 91.25f, 457.75f, 90.418f, 485.84f, 89.2461f, 487.75f, 87.7773f, 489.359f, 92.1797f, -501.68f, 88.2461f, 494.75f, 88.2461f, 494.75f, 73.2578f, 479.68f, 82.2461f, 456.746f, 82.2422f, -456.746f, 83.707f, 452.727f, 80.25f, 457.75f, 80.25f, 457.75f, 75.3477f, 471.648f, 76.2461f, -478.746f, 76.2422f, 478.746f, 76.7773f, 481.109f, 79.25f, 483.75f, 79.25f, 483.75f, 88.3281f, -497.059f, 91.25f, 499.746f, 91.25f, 499.742f, 93.2773f, 515.43f, 110.246f, 520.75f, 110.246f, -520.75f, 116.488f, 523.68f, 111.246f, 520.75f, 10, 0, 0, 0, 0, -0, 0, 0, 28, 265.246f, 593.75f, 265.605f, 593.809f, 265.594f, 594.875f, -266.246f, 594.746f, 267.496f, 595.441f, 267.676f, 596.617f, 268.246f, 597.75f, 269.207f, 598.93f, -269.418f, 600.617f, 270.25f, 602.75f, 270.359f, 603.027f, 270.387f, 604.078f, 270.25f, 604.75f, -268.754f, 607.531f, 267.98f, 610.227f, 266.246f, 612.746f, 266.098f, 613.391f, 265.812f, 614.262f, -265.246f, 614.746f, 265.082f, 616.441f, 263.699f, 617.535f, 263.25f, 618.746f, 262.434f, 619.469f, -263.012f, 620.488f, 262.25f, 620.746f, 261.238f, 620.695f, 259.645f, 621.332f, 259.25f, 619.75f, -258.742f, 617.359f, 259.852f, 614.586f, 261.25f, 611.75f, 260.059f, 611.137f, 260.426f, 610.125f, -260.25f, 609.746f, 261.375f, 605.313f, 260.055f, 601.625f, 259.25f, 597.75f, 259.191f, 597.691f, -259.57f, 597.473f, 259.25f, 597.75f, 258.195f, 594.449f, 256.598f, 591.762f, 254.246f, 588.75f, -253.762f, 588.051f, 252.805f, 587.043f, 252.25f, 585.746f, 251.852f, 585.008f, 251.402f, 583.945f, -251.25f, 582.75f, 247.898f, 579.801f, 245.426f, 575.57f, 242.246f, 571.75f, 242.043f, 570.594f, -242.363f, 569.262f, 243.246f, 568.746f, 243.863f, 568.527f, 244.918f, 569.656f, 245.246f, 570.746f, -245.859f, 571.352f, 246.25f, 572.066f, 247.246f, 572.746f, 246.937f, 572.969f, 246.738f, 573.43f, -247.246f, 573.75f, 249.785f, 576.145f, 251.621f, 579.375f, 254.246f, 581.746f, 256.465f, 582.34f, -258.152f, 583.438f, 260.25f, 584.75f, 260.414f, 584.75f, 260.992f, 584.477f, 261.25f, 584.75f, -263.238f, 585.984f, 263.238f, 588.223f, 263.25f, 590.746f, 263.41f, 591.297f, 263.625f, 592.746f, -265.246f, 593.75f, 10, 0, 0, 0, 0, 0, 0, 0, -19, 255.246f, 598.746f, 255.289f, 598.414f, 255.117f, 598.879f, 255.246f, 598.746f, 255.418f, -599.477f, 255.859f, 599.68f, 256.246f, 599.75f, 256.16f, 600.277f, 255.98f, 600.695f, 256.246f, -600.75f, 258.695f, 603.543f, 258.977f, 606.867f, 258.246f, 609.746f, 258.965f, 610.82f, 259.031f, -612.207f, 258.246f, 612.746f, 257.625f, 615.012f, 257.414f, 617.129f, 256.246f, 618.746f, 255.457f, -620.223f, 253.723f, 621.59f, 252.25f, 619.75f, 251.75f, 619.719f, 251.398f, 618.852f, 251.25f, -617.75f, 251.773f, 617.887f, 252.09f, 617.727f, 252.25f, 617.75f, 251.941f, 617.281f, 251.34f, -617.035f, 251.25f, 616.746f, 251.301f, 615.09f, 250.25f, 613.43f, 251.25f, 611.75f, 251.793f, -610.176f, 252.695f, 608.133f, 253.246f, 605.746f, 252.082f, 603.852f, 253.219f, 601.156f, 251.25f, -598.746f, 251.141f, 598.93f, 251.148f, 598.508f, 251.25f, 598.746f, 251.605f, 597.75f, 252.051f, -597.305f, 252.25f, 596.746f, 252.809f, 596.848f, 253.191f, 596.848f, 253.246f, 596.746f, 254.047f, -597.383f, 254.484f, 597.918f, 255.246f, 598.746f, 10, 0, 0, 0, 0, -0, 0, 0, 21, 324.246f, 609.746f, 325.773f, 607.703f, 326.094f, 604.629f, -324.246f, 602.75f, 324.445f, 599.457f, 328.129f, 601.637f, 330.25f, 601.746f, 330.32f, 602.645f, -330.57f, 603.023f, 331.246f, 602.75f, 332.043f, 603.047f, 332.789f, 604.18f, 334.246f, 603.746f, -334.438f, 605.691f, 336.238f, 606.465f, 337.25f, 607.746f, 338.844f, 612.047f, 338.195f, 616.746f, -335.246f, 620.746f, 335.129f, 620.598f, 335.371f, 621.164f, 335.246f, 621.75f, 334.402f, 623.996f, -332.125f, 624.34f, 330.25f, 624.75f, 328.703f, 629.359f, 327.977f, 633.793f, 326.25f, 637.75f, -324.266f, 638.133f, 323.496f, 640.047f, 322.246f, 640.746f, 320.559f, 641.629f, 319.934f, 639.891f, -320.246f, 638.746f, 319.988f, 638.516f, 320.484f, 638.27f, 320.246f, 637.75f, 320.215f, 637.688f, -319.926f, 637.566f, 320.246f, 637.75f, 319.93f, 637.27f, 320.172f, 637.125f, 320.246f, 636.746f, -319.309f, 636.074f, 317.742f, 635.551f, 317.25f, 634.746f, 316.371f, 630.211f, 319.199f, 626.773f, -321.246f, 623.746f, 321.684f, 622.004f, 320.875f, 620.605f, 320.246f, 619.75f, 319.559f, 618.512f, -319.676f, 617.273f, 320.246f, 616.746f, 320.809f, 613.766f, 322.559f, 611.855f, 324.246f, 609.746f, -10, 0, 0, 0, 0, 0, 0, 0, 73, 283.25f, -589.75f, 281.734f, 587.41f, 277.98f, 584.586f, 281.25f, 582.75f, 281.402f, 582.324f, 281.809f, -582.32f, 282.25f, 582.75f, 284.223f, 584.188f, 286.426f, 585.18f, 289.246f, 585.746f, 289.242f, -585.852f, 289.543f, 585.34f, 290.246f, 585.746f, 291.727f, 586.289f, 293.938f, 586.227f, 295.25f, -587.746f, 299.383f, 587.453f, 303.305f, 588.68f, 307.25f, 589.75f, 308.309f, 590.609f, 309.707f, -591.227f, 311.246f, 591.75f, 312.543f, 592.41f, 313.867f, 593.434f, 315.25f, 594.746f, 315.234f, -594.836f, 315.625f, 594.738f, 316.25f, 594.746f, 315.875f, 595.688f, 316.934f, 595.828f, 317.25f, -596.746f, 317.305f, 596.766f, 317.141f, 597.203f, 317.25f, 597.75f, 319.641f, 599.105f, 320.652f, -601.328f, 319.25f, 603.746f, 319.051f, 604.578f, 318.777f, 605.258f, 318.25f, 605.746f, 316.961f, -606.781f, 315.75f, 605.844f, 314.25f, 605.746f, 314.422f, 605.488f, 313.621f, 605.676f, 313.246f, -605.746f, 312.25f, 604.977f, 310.785f, 605.621f, 310.246f, 604.75f, 308.344f, 604.371f, 306.977f, -604.188f, 305.25f, 603.746f, 305.07f, 603.684f, 304.215f, 603.789f, 304.25f, 602.75f, 303.891f, -603.246f, 303.727f, 603.504f, 303.25f, 603.746f, 301.512f, 603.043f, 300.125f, 602.809f, 298.246f, -600.75f, 298.582f, 600.801f, 298.098f, 600.996f, 298.246f, 600.75f, 296.867f, 599.961f, 296.422f, -598.602f, 295.25f, 597.75f, 294.992f, 597.727f, 294.602f, 597.914f, 294.25f, 597.75f, 293.68f, -597.297f, 293.277f, 596.59f, 292.25f, 595.75f, 292.207f, 595.848f, 291.766f, 596.207f, 292.25f, -596.746f, 292.07f, 598.629f, 292.789f, 600.594f, 292.25f, 602.75f, 294.441f, 605.43f, 297.211f, -607.574f, 299.246f, 610.75f, 299.215f, 612.961f, 299.977f, 615.32f, 300.246f, 617.75f, 299.84f, -617.816f, 299.523f, 618.625f, 299.246f, 618.746f, 299.043f, 619.945f, 300.039f, 621.117f, 299.246f, -621.75f, 297.566f, 623.238f, 296.145f, 622.273f, 295.25f, 620.746f, 293.215f, 620.27f, 290.945f, -619.508f, 289.246f, 620.746f, 288.102f, 621.73f, 287.465f, 622.727f, 286.246f, 623.746f, 285.504f, -625.32f, 285.871f, 626.898f, 286.246f, 628.75f, 285.953f, 628.762f, 285.609f, 628.91f, 285.25f, -628.75f, 285.609f, 629.207f, 285.852f, 629.352f, 286.246f, 629.746f, 285.223f, 630.188f, 284.918f, -631.352f, 284.25f, 631.746f, 284.133f, 632.898f, 283.391f, 633.871f, 282.25f, 633.75f, 280.238f, -634.965f, 278.395f, 632.859f, 276.246f, 632.75f, 275.746f, 632.758f, 275.23f, 633.902f, 274.25f, -634.746f, 274.043f, 634.496f, 273.27f, 634.531f, 273.25f, 633.75f, 272.113f, 633.688f, 271.465f, -633.559f, 270.25f, 633.75f, 268.852f, 632.855f, 267.449f, 631.652f, 266.246f, 630.75f, 264.188f, -629.77f, 263.137f, 628.188f, 262.25f, 626.75f, 260.914f, 625.469f, 260.762f, 622.813f, 262.25f, -622.75f, 264.352f, 621.547f, 265.785f, 624.523f, 268.246f, 623.746f, 268.293f, 624.105f, 268.52f, -623.766f, 268.246f, 623.746f, 268.824f, 623.219f, 269.066f, 623.469f, 269.246f, 623.746f, 270.223f, -622.656f, 271.504f, 622.285f, 272.25f, 621.75f, 273.602f, 620.332f, 275.523f, 620.793f, 276.246f, -619.75f, 278.32f, 618.043f, 277.707f, 615.094f, 280.246f, 613.75f, 279.195f, 612.215f, 278.527f, -610.809f, 278.246f, 608.75f, 277.848f, 607.914f, 278.941f, 606.598f, 280.246f, 606.75f, 281.656f, -606.801f, 281.945f, 607.633f, 282.25f, 608.75f, 282.773f, 608.523f, 283.289f, 608.199f, 283.25f, -607.746f, 282.738f, 605.336f, 281.609f, 603.141f, 281.25f, 600.75f, 281.043f, 600.121f, 280.707f, -599.898f, 280.246f, 599.75f, 279.762f, 595.453f, 275.305f, 592.82f, 272.25f, 589.75f, 272.063f, -588.785f, 272.059f, 587.414f, 272.25f, 586.75f, 274.051f, 585.445f, 276.207f, 587.145f, 278.246f, -587.746f, 278.313f, 589.023f, 279.258f, 590.063f, 280.246f, 589.75f, 281.004f, 589.988f, 281.262f, -590.586f, 281.25f, 590.746f, 282, 590.879f, 282.555f, 590.633f, 283.25f, 590.746f, 284.77f, -592.164f, 286.32f, 593.383f, 288.246f, 594.746f, 288.441f, 594.832f, 288.82f, 594.66f, 289.246f, -594.746f, 289.414f, 594.957f, 289.621f, 595.383f, 290.246f, 595.75f, 290.359f, 595.805f, 290.625f, -595.484f, 291.246f, 594.746f, 290.129f, 594.793f, 290.125f, 593.742f, 289.246f, 593.75f, 288.629f, -593.223f, 288.012f, 592.66f, 287.246f, 591.75f, 286.949f, 591.957f, 286.227f, 592.23f, 286.246f, -591.75f, 285.453f, 590.902f, 284.152f, 590.418f, 283.25f, 589.75f, 10, 0, 0, -0, 0, 0, 0, 0, 30, 222.246f, 643.75f, 222.246f, 643.75f, -212.258f, 646.957f, 200.246f, 618.746f, 200.246f, 618.742f, 197.34f, 613, 194.25f, 610.75f, -192.059f, 608.598f, 179.738f, 604.637f, 177.246f, 599.75f, 166.246f, 582.75f, 166.246f, 582.75f, -182.379f, 600.238f, 186.25f, 602.75f, 186.25f, 602.75f, 194.699f, 612.117f, 191.246f, 604.75f, -191.242f, 604.75f, 175.777f, 592.758f, 177.246f, 582.75f, 177.246f, 582.75f, 170.938f, 566.797f, -170.246f, 564.75f, 170.242f, 564.75f, 187.656f, 599.797f, 190.246f, 600.75f, 192.938f, 602.438f, -194.258f, 602.438f, 193.25f, 598.746f, 191.617f, 594.52f, 191.18f, 576.477f, 188.246f, 574.746f, -188.246f, 574.742f, 196.898f, 596.719f, 196.25f, 599.75f, 196.25f, 599.75f, 199.539f, 604.199f, -202.246f, 598.746f, 201.246f, 580.75f, 205.25f, 567.75f, 205.25f, 567.75f, 203.059f, 580, -205.25f, 596.746f, 205.25f, 596.742f, 202.617f, 608.598f, 207.25f, 602.75f, 211.418f, 596.277f, -221.977f, 589.68f, 222.246f, 584.75f, 222.246f, 584.75f, 216.258f, 603.758f, 206.25f, 608.75f, -201.246f, 602.75f, 200.246f, 604.75f, 200.246f, 604.75f, 196.457f, 605.52f, 201.246f, 612.746f, -206.137f, 620.477f, 205.25f, 621.75f, 205.25f, 621.75f, 205.25f, 621.75f, 212.738f, 613.438f, -214.25f, 613.75f, 214.25f, 613.75f, 229.02f, 621.797f, 230.25f, 594.746f, 230.25f, 594.742f, -237.816f, 610.797f, 227.25f, 618.746f, 227.25f, 618.742f, 211.418f, 620.477f, 212.246f, 625.746f, -220.246f, 639.75f, 224.617f, 645.559f, 223.246f, 642.746f, 223.246f, 642.746f, 10, 0, -0, 0, 0, 0, 0, 0, 6, 200.246f, 625.746f, 200.246f, -625.746f, 186.34f, 625.758f, 183.25f, 619.75f, 175.25f, 609.746f, 175.25f, 609.742f, 193.816f, -620.477f, 198.246f, 621.75f, 202.617f, 623.117f, 200.246f, 625.746f, 200.246f, 625.746f, 10, -0, 0, 0, 0, 0, 0, 0, 7, 156.25f, 618.746f, -156.25f, 618.742f, 154.219f, 617.398f, 154.246f, 614.746f, 153.34f, 611.238f, 150.699f, 610.797f, -151.25f, 607.746f, 152.457f, 604.637f, 154.656f, 602, 154.246f, 606.75f, 154.656f, 610.797f, -156.418f, 613, 157.25f, 614.746f, 158.18f, 615.637f, 159.938f, 620.477f, 156.25f, 618.746f, -10, 0, 0, 0, 0, 0, 0, 0, 10, 146.25f, -551.75f, 146.25f, 551.75f, 137.5f, 555.797f, 134.25f, 559.746f, 130.457f, 563.719f, 130.957f, -558.035f, 125.25f, 558.75f, 119.187f, 558.922f, 120.246f, 576.746f, 120.246f, 576.746f, 116.246f, -567.75f, 116.246f, 567.75f, 114.617f, 552.277f, 123.25f, 554.746f, 127.715f, 556.207f, 129.137f, -554.477f, 127.246f, 553.75f, 125.617f, 552.719f, 133.539f, 552.277f, 130.25f, 550.746f, 127.379f, -548.758f, 143.219f, 554.477f, 140.25f, 542.75f, 146.25f, 551.75f, 10, 0, 0, -0, 0, 0, 0, 0, 8, 133.246f, 535.746f, 133.246f, 535.746f, -115.938f, 530.719f, 112.25f, 541.746f, 112.25f, 541.742f, 106.699f, 538.637f, 109.246f, 535.746f, -111.539f, 532.039f, 113.25f, 531.75f, 113.25f, 531.75f, 113.25f, 531.75f, 118.797f, 530.277f, -118.25f, 529.75f, 117.477f, 528.52f, 115.246f, 524.746f, 115.246f, 524.746f, 115.242f, 524.746f, -126.059f, 531.379f, 133.246f, 535.746f, 10, 0, 1, 1, 1, 1, -1, 1, 24, 384.25f, 449.746f, 383.648f, 447.191f, 381.813f, 446.309f, 379.246f, -445.746f, 377.609f, 446.629f, 374.754f, 450.047f, 372.25f, 447.746f, 372.156f, 448.305f, 371.301f, -448.371f, 371.25f, 448.75f, 370.41f, 450.086f, 370.711f, 451.238f, 370.25f, 451.746f, 369.734f, -453.516f, 368.953f, 455.016f, 369.25f, 456.746f, 371.145f, 457.359f, 371.801f, 459.457f, 371.25f, -461.75f, 371.203f, 461.68f, 370.73f, 461.895f, 371.25f, 462.746f, 371.156f, 462.633f, 371.504f, -462.883f, 372.25f, 462.746f, 371.652f, 463.031f, 371.492f, 462.773f, 371.25f, 462.746f, 370.699f, -462.91f, 370.836f, 463.613f, 371.25f, 463.75f, 371.621f, 465.957f, 373.836f, 466.25f, 375.246f, -464.746f, 375.602f, 465.559f, 376.16f, 465.348f, 376.246f, 465.75f, 376.586f, 466.016f, 377.031f, -466.594f, 377.246f, 466.746f, 377.82f, 468.266f, 379.613f, 467.047f, 380.25f, 467.746f, 381.672f, -468.629f, 382.844f, 469.398f, 384.25f, 468.75f, 386.02f, 467.621f, 387.898f, 466.285f, 389.246f, -464.746f, 389.848f, 463.453f, 390.113f, 462.047f, 390.246f, 460.746f, 390.008f, 460.281f, 388.488f, -460.668f, 388.246f, 459.75f, 387.402f, 457.723f, 389.414f, 457.152f, 390.246f, 455.746f, 390.465f, -455.297f, 390.176f, 454.961f, 390.246f, 454.75f, 389.375f, 454.711f, 388.516f, 454.922f, 388.246f, -454.75f, 389.734f, 450.91f, 386.703f, 450.164f, 384.25f, 449.746f, 10, 0, 1, -1, 1, 1, 1, 1, 11, 373.25f, 427.746f, 373.551f, 429.891f, -371.789f, 431.82f, 373.25f, 433.746f, 373.27f, 433.551f, 373.41f, 433.305f, 373.25f, 433.746f, -373.707f, 433.305f, 373.852f, 433.551f, 374.25f, 433.746f, 375.645f, 431.258f, 379.66f, 430.238f, -379.246f, 426.75f, 379.48f, 426.617f, 378.285f, 425.605f, 379.246f, 424.75f, 377.285f, 423.414f, -377.223f, 420.809f, 376.246f, 418.746f, 374.836f, 419.051f, 373.504f, 419.449f, 372.25f, 419.75f, -372.625f, 421.691f, 372.496f, 423.543f, 373.25f, 424.75f, 373.879f, 425.766f, 373.563f, 426.949f, -373.25f, 427.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -15, 190.246f, 437.75f, 190.246f, 437.75f, 172.195f, 426.727f, 187.246f, 443.75f, 197.34f, -454.156f, 208.25f, 460.746f, 208.25f, 460.746f, 208.25f, 460.742f, 219.777f, 465.156f, 223.246f, -466.746f, 227.699f, 467.797f, 244.418f, 473.52f, 248.25f, 473.746f, 251.457f, 474.398f, 262.02f, -478.797f, 269.246f, 474.75f, 276.977f, 470, 286.246f, 464.746f, 286.246f, 464.746f, 286.246f, -464.742f, 267.738f, 474.398f, 264.246f, 471.746f, 259.816f, 469.117f, 251.898f, 469.559f, 245.246f, -465.75f, 245.246f, 465.75f, 229.02f, 461.195f, 225.25f, 458.746f, 221.977f, 456.797f, 210.539f, -444.035f, 209.246f, 444.746f, 207.02f, 445.797f, 209.219f, 446.238f, 210.246f, 449.746f, 211.859f, -452.398f, 209.656f, 454.156f, 201.246f, 446.75f, 192.059f, 440.078f, 190.246f, 437.75f, 190.246f, -437.75f, 10, 0, 0, 0, 0, 0, 0, 0, 11, -199.246f, 444.746f, 199.246f, 444.742f, 200.434f, 458.785f, 210.246f, 456.746f, 210.246f, 456.746f, -218.809f, 461.539f, 222.246f, 463.75f, 222.246f, 463.75f, 230.758f, 465.578f, 232.246f, 466.746f, -252.523f, 475.824f, 268.715f, 470.855f, 269.246f, 471.746f, 269.918f, 473.316f, 291.504f, 465.488f, -295.25f, 460.746f, 295.906f, 460.508f, 284.219f, 467.152f, 273.25f, 468.75f, 264.453f, 471.008f, -240.691f, 468.961f, 228.25f, 462.746f, 225.422f, 461.211f, 215.582f, 454.848f, 213.246f, 454.75f, -210.016f, 455.094f, 199.246f, 444.746f, 199.246f, 444.746f, 10, 0, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 11, 194.25f, 416.746f, 194.25f, 416.742f, 177.977f, -418.957f, 196.25f, 420.746f, 196.25f, 420.742f, 216.258f, 422.918f, 220.246f, 428.75f, 220.246f, -428.75f, 235.617f, 438.758f, 238.25f, 438.746f, 241.777f, 439.637f, 274.777f, 447.559f, 275.246f, -449.746f, 275.656f, 452.836f, 281.816f, 452.836f, 283.25f, 451.746f, 285.34f, 451.078f, 284.457f, -449.758f, 281.25f, 448.75f, 278.297f, 447.996f, 243.977f, 429.957f, 237.25f, 428.75f, 229.898f, -427.316f, 217.137f, 418.957f, 212.246f, 417.75f, 206.578f, 416.316f, 194.25f, 416.746f, 194.25f, -416.746f, 10, 0, 0, 0, 0, 0, 0, 0, 11, -216.25f, 424.75f, 216.25f, 424.75f, 206.73f, 425.367f, 216.25f, 426.75f, 216.25f, 426.75f, -225.887f, 430.035f, 228.25f, 432.75f, 228.25f, 432.75f, 235.801f, 438.145f, 237.25f, 438.746f, -238.957f, 438.594f, 254.313f, 442.652f, 254.246f, 443.75f, 254.762f, 445.355f, 292.234f, 459.191f, -297.246f, 455.746f, 300.301f, 453.371f, 289.406f, 455.219f, 279.246f, 450.75f, 277.32f, 449.684f, -240.082f, 433.637f, 236.25f, 432.75f, 232.871f, 432.285f, 226.34f, 428.008f, 223.246f, 427.746f, -220.934f, 426.656f, 216.25f, 424.75f, 216.25f, 424.75f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 207.25f, 421.75f, 207.25f, 421.75f, 213.18f, -422.477f, 212.246f, 420.746f, 210.539f, 418.957f, 208.25f, 419.75f, 208.25f, 419.75f, 207.25f, -421.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -199.246f, 420.746f, 199.246f, 420.742f, 205.258f, 420.719f, 204.25f, 418.746f, 202.617f, 417.195f, -200.246f, 417.75f, 200.246f, 417.75f, 199.246f, 420.746f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 188.246f, 418.746f, 188.246f, 418.742f, 193.816f, -418.957f, 192.25f, 416.746f, 191.18f, 415.438f, 188.246f, 416.746f, 188.246f, 416.746f, 188.246f, -418.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -179.246f, 417.75f, 179.246f, 417.75f, 185.457f, 418.078f, 184.25f, 416.746f, 182.816f, 414.559f, -180.246f, 415.75f, 180.246f, 415.75f, 179.246f, 417.75f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 222.246f, 460.746f, 222.246f, 460.742f, 226.816f, -461.195f, 225.25f, 459.75f, 224.18f, 457.676f, 220.246f, 457.75f, 220.246f, 457.75f, 222.246f, -460.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -211.246f, 454.75f, 211.246f, 454.75f, 218.133f, 457.391f, 215.25f, 453.746f, 214.059f, 451.957f, -211.246f, 452.75f, 211.246f, 452.75f, 211.246f, 454.75f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 198.246f, 449.746f, 198.246f, 449.742f, 204.379f, -450.195f, 203.25f, 448.75f, 201.738f, 446.676f, 199.246f, 447.746f, 199.246f, 447.746f, 198.246f, -449.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -190.246f, 442.746f, 190.246f, 442.742f, 196.02f, 443.598f, 194.25f, 441.75f, 193.379f, 440.078f, -190.246f, 440.746f, 190.246f, 440.746f, 190.246f, 442.746f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 183.25f, 437.75f, 183.25f, 437.75f, 188.539f, -438.316f, 187.246f, 436.746f, 185.898f, 434.797f, 183.25f, 435.75f, 183.25f, 435.75f, 183.25f, -437.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -226.25f, 430.75f, 226.25f, 430.75f, 233.422f, 431.426f, 231.246f, 428.75f, 229.906f, 426.742f, -226.25f, 427.746f, 226.25f, 427.746f, 226.25f, 430.75f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 237.25f, 435.75f, 237.25f, 435.75f, 244.863f, -436.707f, 243.246f, 434.746f, 241.348f, 432.02f, 238.25f, 432.75f, 238.25f, 432.75f, 237.25f, -435.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -249.25f, 440.746f, 249.25f, 440.742f, 256.742f, 441.547f, 255.246f, 438.746f, 253.227f, 436.859f, -249.25f, 437.75f, 249.25f, 437.75f, 249.25f, 440.746f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 260.25f, 445.746f, 260.25f, 445.746f, 268.18f, -446.824f, 266.246f, 444.746f, 264.668f, 442.141f, 261.25f, 443.75f, 261.25f, 443.75f, 260.25f, -445.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -230.25f, 465.75f, 230.25f, 465.75f, 237.82f, 466.625f, 236.25f, 464.746f, 234.309f, 461.941f, -230.25f, 461.75f, 230.25f, 461.75f, 230.25f, 465.75f, 10, 0, 0, 0, -0, 0, 0, 0, 4, 241.25f, 469.746f, 241.25f, 469.746f, 248.82f, -470.145f, 247.246f, 467.746f, 245.309f, 465.461f, 240.25f, 465.75f, 240.25f, 465.75f, 241.25f, -469.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, -216.25f, 425.746f, 216.25f, 425.746f, 221.977f, 425.996f, 220.246f, 423.746f, 219.34f, 422.477f, -216.25f, 423.746f, 216.25f, 423.746f, 216.25f, 425.746f, 10, 0, 0.6f, 0.15f, -0, 0.6f, 0.15f, 0, 5, 135.25f, 534.75f, 135.25f, 534.75f, 130.898f, -525, 130.25f, 521.746f, 130.25f, 521.742f, 131.34f, 531.156f, 132.246f, 533.746f, 133.977f, -535.559f, 135.25f, 534.75f, 135.25f, 534.75f, 10, 0, 0.6f, 0.15f, 0, -0.6f, 0.15f, 0, 5, 115.246f, 519.746f, 115.242f, 519.742f, 111.977f, 503.438f, -112.25f, 500.746f, 112.25f, 500.746f, 111.098f, 513.117f, 111.246f, 514.75f, 111.977f, 515.758f, -115.246f, 519.746f, 115.246f, 519.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 6, 138.246f, 601.746f, 138.246f, 597.75f, 135.25f, 597.75f, 135.25f, -597.75f, 151.359f, 583.738f, 152.25f, 575.75f, 152.25f, 575.75f, 152.898f, 584.398f, 138.246f, -601.746f, 10, 0, 0, 0, 0, 0, 0, 0, 28, -143.246f, 599.75f, 142.285f, 600.402f, 142.527f, 601.223f, 142.246f, 601.746f, 141.188f, 602.078f, -143.508f, 602.141f, 143.246f, 602.75f, 142.836f, 604.254f, 143.039f, 604.277f, 143.246f, 605.746f, -142.844f, 606.34f, 143.488f, 608.031f, 144.246f, 608.75f, 145.504f, 610.332f, 144.047f, 613.559f, -146.25f, 615.75f, 146.188f, 615.582f, 146.598f, 616.191f, 147.25f, 616.746f, 147.637f, 617.711f, -148.941f, 618.246f, 150.246f, 618.746f, 150.336f, 619.461f, 150.113f, 620.371f, 150.246f, 620.746f, -151.523f, 620.141f, 152.891f, 620.285f, 153.246f, 619.75f, 152.715f, 617.027f, 151.254f, 615.137f, -150.246f, 613.75f, 150.344f, 612.527f, 149.84f, 611.828f, 149.246f, 610.75f, 148.059f, 608.336f, -148.266f, 605.207f, 148.246f, 601.746f, 148.07f, 601.992f, 147.73f, 601.906f, 147.25f, 601.746f, -148.129f, 599.277f, 148.77f, 596.859f, 149.246f, 594.746f, 150.141f, 593.387f, 150.66f, 592.402f, -151.25f, 591.75f, 150.945f, 590.625f, 151.059f, 589.711f, 150.246f, 588.75f, 152.848f, 585.754f, -151.41f, 582.84f, 152.25f, 578.75f, 152.922f, 578.27f, 154.785f, 576.164f, 154.246f, 576.746f, -151.512f, 577.297f, 151.387f, 577.734f, 151.25f, 578.75f, 151.031f, 579.25f, 150.668f, 580.762f, -150.246f, 581.746f, 150.336f, 581.605f, 150.148f, 583.68f, 150.246f, 583.746f, 148.398f, 586.434f, -149.895f, 586.238f, 148.246f, 588.75f, 146.816f, 589.582f, 145.754f, 590.797f, 144.246f, 591.75f, -144.301f, 592.297f, 145.559f, 593.094f, 145.25f, 593.75f, 144.156f, 594.746f, 142.887f, 595.59f, -143.246f, 596.746f, 143.43f, 597.992f, 143.578f, 599.156f, 143.246f, 599.75f, 10, 0, -0, 0, 0, 0, 0, 0, 11, 139.246f, 597.75f, 139.246f, -597.75f, 139.258f, 590.559f, 142.246f, 588.75f, 144.539f, 587.039f, 143.219f, 587.918f, 139.246f, -588.75f, 136.18f, 590.559f, 137.246f, 591.75f, 137.246f, 591.75f, 137.242f, 591.75f, 134.418f, -591, 137.246f, 588.75f, 139.699f, 586.598f, 143.656f, 583.957f, 142.246f, 583.746f, 140.137f, -583.957f, 131.777f, 588.359f, 132.246f, 591.75f, 131.777f, 594.52f, 130.25f, 598.746f, 130.25f, -598.746f, 130.25f, 598.742f, 131.887f, 599.906f, 137.246f, 599.75f, 137.242f, 599.75f, 138.707f, -599.027f, 139.246f, 597.75f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 138.246f, 577.75f, 138.246f, 577.75f, 128.566f, 580.648f, 108.25f, 576.746f, -108.25f, 576.742f, 118.172f, 579.203f, 139.246f, 576.746f, 150.148f, 575.324f, 138.246f, 577.75f, -138.246f, 577.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 138.246f, 577.75f, 138.246f, 577.75f, 128.566f, 580.648f, 108.25f, 576.746f, 108.25f, -576.742f, 118.172f, 579.203f, 139.246f, 576.746f, 150.148f, 575.324f, 138.246f, 577.75f, 138.246f, -577.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -140.25f, 577.75f, 140.25f, 577.75f, 131.176f, 581.527f, 110.246f, 579.746f, 110.246f, 579.746f, -120.695f, 580.984f, 141.25f, 576.746f, 152.215f, 574.355f, 140.25f, 577.75f, 140.25f, 577.75f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 140.25f, -577.75f, 140.25f, 577.75f, 131.176f, 581.527f, 110.246f, 579.746f, 110.246f, 579.746f, 120.695f, -580.984f, 141.25f, 576.746f, 152.215f, 574.355f, 140.25f, 577.75f, 140.25f, 577.75f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 142.246f, 577.75f, -142.242f, 577.75f, 133.453f, 582.086f, 113.25f, 581.746f, 113.25f, 581.746f, 122.965f, 582.328f, -143.246f, 576.746f, 153.902f, 573.371f, 142.246f, 577.75f, 142.246f, 577.75f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 142.246f, 577.75f, 142.242f, -577.75f, 133.453f, 582.086f, 113.25f, 581.746f, 113.25f, 581.746f, 122.965f, 582.328f, 143.246f, -576.746f, 153.902f, 573.371f, 142.246f, 577.75f, 142.246f, 577.75f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 143.246f, 577.75f, 143.242f, 577.75f, -136.102f, 582.047f, 117.25f, 583.746f, 117.25f, 583.742f, 126.715f, 583.066f, 144.246f, 576.746f, -153.77f, 572.66f, 143.246f, 577.75f, 143.246f, 577.75f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 143.246f, 577.75f, 143.242f, 577.75f, 136.102f, -582.047f, 117.25f, 583.746f, 117.25f, 583.742f, 126.715f, 583.066f, 144.246f, 576.746f, 153.77f, -572.66f, 143.246f, 577.75f, 143.246f, 577.75f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 270.25f, 565.746f, 270.25f, 565.742f, 269.398f, 565.031f, -269.246f, 566.75f, 269.871f, 567.629f, 300.898f, 582.117f, 305.25f, 581.746f, 305.25f, 581.746f, -271.602f, 567.316f, 270.25f, 565.746f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 270.25f, 565.746f, 270.25f, 565.742f, 269.398f, 565.031f, 269.246f, -566.75f, 269.871f, 567.629f, 300.898f, 582.117f, 305.25f, 581.746f, 305.25f, 581.746f, 271.602f, -567.316f, 270.25f, 565.746f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 266.246f, 564.75f, 266.246f, 564.75f, 265.727f, 564.25f, 266.246f, 565.746f, -265.992f, 566.879f, 295.785f, 583.758f, 300.246f, 583.746f, 300.246f, 583.742f, 267.742f, 566.699f, -266.246f, 564.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 266.246f, 564.75f, 266.246f, 564.75f, 265.727f, 564.25f, 266.246f, 565.746f, 265.992f, -566.879f, 295.785f, 583.758f, 300.246f, 583.746f, 300.246f, 583.742f, 267.742f, 566.699f, 266.246f, -564.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -263.25f, 563.746f, 263.25f, 563.742f, 262.164f, 562.676f, 262.25f, 563.746f, 262.254f, 565.316f, -284.055f, 582.363f, 295.25f, 584.75f, 295.25f, 584.75f, 275.016f, 575.484f, 263.25f, 563.746f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 263.25f, -563.746f, 263.25f, 563.742f, 262.164f, 562.676f, 262.25f, 563.746f, 262.254f, 565.316f, 284.055f, -582.363f, 295.25f, 584.75f, 295.25f, 584.75f, 275.016f, 575.484f, 263.25f, 563.746f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 260.25f, 561.746f, -260.25f, 561.742f, 259.09f, 560.711f, 259.25f, 561.746f, 259.176f, 563.086f, 278.793f, 578.43f, -288.246f, 580.75f, 288.246f, 580.75f, 270.656f, 572.238f, 260.25f, 561.746f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 260.25f, 561.746f, 260.25f, -561.742f, 259.09f, 560.711f, 259.25f, 561.746f, 259.176f, 563.086f, 278.793f, 578.43f, 288.246f, -580.75f, 288.246f, 580.75f, 270.656f, 572.238f, 260.25f, 561.746f, 10, 0, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 11, 225.25f, 398.746f, 225.25f, 398.742f, -208.34f, 401.355f, 227.25f, 402.75f, 227.25f, 402.75f, 246.617f, 405.316f, 251.25f, 410.75f, -251.25f, 410.75f, 265.977f, 421.156f, 269.246f, 421.75f, 272.137f, 422.035f, 290.18f, 425.996f, -290.246f, 428.75f, 291.059f, 431.277f, 297.656f, 433.918f, 299.246f, 432.75f, 301.18f, 432.156f, -301.18f, 422.035f, 298.246f, 420.746f, 295.02f, 420.277f, 274.34f, 412.355f, 267.246f, 410.75f, -260.258f, 409.719f, 247.5f, 401.355f, 242.246f, 399.75f, 236.938f, 398.719f, 225.25f, 398.746f, -225.25f, 398.746f, 10, 0, 0, 0, 0, 0, 0, 0, -11, 305.25f, 439.75f, 305.25f, 439.75f, 302.059f, 438.098f, 300.246f, 434.746f, 300.246f, -434.746f, 293.699f, 423.578f, 278.246f, 419.75f, 278.246f, 419.75f, 252.777f, 410.156f, 244.246f, -407.746f, 244.246f, 407.742f, 229.457f, 402.457f, 221.246f, 403.746f, 221.246f, 403.746f, 213.617f, -403.117f, 220.246f, 401.746f, 220.246f, 401.746f, 242.656f, 403.559f, 246.246f, 405.746f, 246.242f, -405.742f, 263.559f, 411.258f, 267.246f, 413.75f, 270.156f, 416.977f, 290.18f, 422.477f, 292.25f, -424.75f, 295.02f, 426.879f, 305.797f, 436.117f, 305.25f, 439.75f, 10, 0, 0, -0, 0, 0, 0, 0, 4, 241.25f, 404.75f, 241.25f, 404.75f, -246.52f, 405.445f, 245.246f, 403.746f, 243.984f, 402.035f, 241.25f, 402.75f, 241.25f, 402.75f, -241.25f, 404.75f, 10, 0, 0, 0, 0, 0, 0, 0, -4, 233.246f, 403.746f, 233.246f, 403.746f, 238.598f, 403.957f, 237.25f, 402.75f, 236.063f, -400.547f, 233.246f, 401.746f, 233.246f, 401.746f, 233.246f, 403.746f, 10, 0, 0, -0, 0, 0, 0, 0, 4, 221.246f, 402.75f, 221.246f, 402.75f, -227.125f, 402.586f, 226.25f, 400.75f, 224.59f, 399.176f, 222.246f, 399.75f, 222.246f, 399.75f, -221.246f, 402.75f, 10, 0, 0, 0, 0, 0, 0, 0, -4, 213.246f, 401.746f, 213.242f, 401.746f, 218.73f, 401.984f, 217.25f, 400.75f, 216.191f, -398.578f, 213.246f, 399.75f, 213.246f, 399.75f, 213.246f, 401.746f, 10, 0, 0, -0, 0, 0, 0, 0, 4, 259.25f, 413.75f, 259.25f, 413.75f, -266.609f, 413.664f, 265.246f, 411.746f, 263.234f, 409.129f, 259.25f, 410.75f, 259.25f, 410.75f, -259.25f, 413.75f, 10, 0, 0, 0, 0, 0, 0, 0, -4, 270.25f, 417.75f, 270.25f, 417.75f, 276.855f, 421.832f, 276.246f, 416.746f, 275.973f, -413.453f, 271.25f, 415.75f, 271.25f, 415.75f, 270.25f, 417.75f, 10, 0, 0, -0, 0, 0, 0, 0, 4, 280.246f, 421.75f, 280.242f, 421.75f, -288.223f, 425.367f, 286.246f, 419.75f, 285.457f, 416.664f, 281.25f, 418.746f, 281.25f, 418.746f, -280.246f, 421.75f, 10, 0, 0, 0, 0, 0, 0, 0, -4, 291.246f, 426.75f, 291.242f, 426.75f, 295.605f, 431.996f, 297.246f, 424.75f, 297.227f, -421.875f, 291.246f, 423.746f, 291.246f, 423.746f, 291.246f, 426.75f, 10, 0, 0, -0, 0, 0, 0, 0, 4, 249.25f, 408.75f, 249.25f, 408.75f, -255.266f, 408.652f, 254.246f, 406.75f, 252.73f, 405.242f, 250.25f, 405.746f, 250.25f, 405.746f, -249.25f, 408.75f, 10, 0, 1, 1, 1, 1, 1, 1, -5, 288.246f, 541.746f, 288.246f, 541.742f, 287.875f, 541.203f, 288.246f, 542.75f, 287.875f, -543.559f, 307.109f, 558.148f, 317.25f, 559.746f, 317.25f, 559.746f, 299.125f, 552.27f, 288.246f, -541.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, 5, -288.246f, 541.746f, 288.246f, 541.742f, 287.875f, 541.203f, 288.246f, 542.75f, 287.875f, 543.559f, -307.109f, 558.148f, 317.25f, 559.746f, 317.25f, 559.746f, 299.125f, 552.27f, 288.246f, 541.746f, -10, 0, 0, 0, 0, 0, 0, 0, 10, 292.25f, -471.746f, 292.25f, 471.742f, 316.141f, 447.117f, 326.25f, 442.746f, 326.25f, 442.742f, 336.379f, -430.836f, 332.246f, 401.746f, 332.246f, 401.746f, 328.461f, 393.879f, 325.25f, 416.746f, 325.25f, -416.742f, 328.461f, 444.477f, 316.25f, 426.75f, 316.25f, 426.75f, 306.898f, 437.766f, 314.25f, -437.75f, 314.25f, 437.75f, 317.461f, 435.238f, 318.25f, 436.746f, 318.34f, 438.758f, 309.539f, -453.719f, 290.246f, 469.746f, 271.699f, 485.398f, 292.25f, 471.746f, 292.25f, 471.746f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 227.25f, 428.75f, -227.25f, 428.75f, 227.477f, 431.059f, 229.25f, 429.746f, 231.438f, 429.297f, 335.059f, 422.477f, -370.25f, 395.75f, 370.25f, 395.75f, 320.098f, 421.598f, 227.25f, 428.75f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 227.25f, 428.75f, 227.25f, -428.75f, 227.477f, 431.059f, 229.25f, 429.746f, 231.438f, 429.297f, 335.059f, 422.477f, 370.25f, -395.75f, 370.25f, 395.75f, 320.098f, 421.598f, 227.25f, 428.75f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 239.25f, 433.746f, 239.25f, 433.742f, -238.918f, 435.898f, 241.25f, 434.746f, 242.879f, 434.137f, 393.141f, 435.238f, 419.246f, 399.75f, -419.246f, 399.75f, 394.898f, 427.316f, 239.25f, 433.746f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 239.25f, 433.746f, 239.25f, 433.742f, 238.918f, -435.898f, 241.25f, 434.746f, 242.879f, 434.137f, 393.141f, 435.238f, 419.246f, 399.75f, 419.246f, -399.75f, 394.898f, 427.316f, 239.25f, 433.746f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 252.25f, 438.746f, 252.25f, 438.742f, 251.68f, 440.297f, -253.246f, 439.75f, 255.637f, 438.535f, 446.379f, 452.836f, 472.25f, 416.746f, 472.25f, 416.742f, -461.777f, 445.355f, 252.25f, 438.746f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 252.25f, 438.746f, 252.25f, 438.742f, 251.68f, 440.297f, 253.246f, -439.75f, 255.637f, 438.535f, 446.379f, 452.836f, 472.25f, 416.746f, 472.25f, 416.742f, 461.777f, -445.355f, 252.25f, 438.746f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 263.25f, 443.75f, 263.25f, 443.75f, 262.68f, 445.578f, 264.246f, 444.746f, -266.637f, 443.816f, 401.059f, 486.277f, 427.25f, 450.75f, 427.25f, 450.75f, 412.277f, 477.699f, -263.25f, 443.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 263.25f, 443.75f, 263.25f, 443.75f, 262.68f, 445.578f, 264.246f, 444.746f, 266.637f, -443.816f, 401.059f, 486.277f, 427.25f, 450.75f, 427.25f, 450.75f, 412.277f, 477.699f, 263.25f, -443.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -199.246f, 418.746f, 199.246f, 418.742f, 198.879f, 420.496f, 201.246f, 419.75f, 202.84f, 418.738f, -222.418f, 416.316f, 224.246f, 373.75f, 224.242f, 373.75f, 216.699f, 419.836f, 199.246f, 418.746f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 199.246f, -418.746f, 199.246f, 418.742f, 198.879f, 420.496f, 201.246f, 419.75f, 202.84f, 418.738f, 222.418f, -416.316f, 224.246f, 373.75f, 224.242f, 373.75f, 216.699f, 419.836f, 199.246f, 418.746f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 189.246f, 416.746f, -189.246f, 416.742f, 189.199f, 418.738f, 191.246f, 417.75f, 193.156f, 416.977f, 208.777f, 422.035f, -205.25f, 379.746f, 205.25f, 379.746f, 207.02f, 418.078f, 189.246f, 416.746f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 189.246f, 416.746f, 189.246f, -416.742f, 189.199f, 418.738f, 191.246f, 417.75f, 193.156f, 416.977f, 208.777f, 422.035f, 205.25f, -379.746f, 205.25f, 379.746f, 207.02f, 418.078f, 189.246f, 416.746f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 180.246f, 416.746f, 180.242f, 416.742f, -180.398f, 418.297f, 182.25f, 417.75f, 184.359f, 416.535f, 201.297f, 415.879f, 187.246f, 390.746f, -187.246f, 390.746f, 198.219f, 417.637f, 180.246f, 416.746f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 180.246f, 416.746f, 180.242f, 416.742f, 180.398f, -418.297f, 182.25f, 417.75f, 184.359f, 416.535f, 201.297f, 415.879f, 187.246f, 390.746f, 187.246f, -390.746f, 198.219f, 417.637f, 180.246f, 416.746f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 232.246f, 464.746f, 232.246f, 464.742f, 232.187f, 462.887f, -234.246f, 463.75f, 251.566f, 478.113f, 287.254f, 542.906f, 348.25f, 548.746f, 348.25f, 548.746f, -306.367f, 562.426f, 232.246f, 464.746f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 232.246f, 464.746f, 232.246f, 464.742f, 232.187f, 462.887f, 234.246f, -463.75f, 251.566f, 478.113f, 287.254f, 542.906f, 348.25f, 548.746f, 348.25f, 548.746f, 306.367f, -562.426f, 232.246f, 464.746f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 245.246f, 466.746f, 245.246f, 466.742f, 243.496f, 468.379f, 245.246f, 468.75f, -247.605f, 469.754f, 371.293f, 549.508f, 414.25f, 540.75f, 414.25f, 540.75f, 384.688f, 549.004f, -245.246f, 466.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 245.246f, 466.746f, 245.246f, 466.742f, 243.496f, 468.379f, 245.246f, 468.75f, 247.605f, -469.754f, 371.293f, 549.508f, 414.25f, 540.75f, 414.25f, 540.75f, 384.688f, 549.004f, 245.246f, -466.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -222.246f, 460.746f, 222.246f, 460.742f, 221.512f, 458.594f, 223.246f, 459.75f, 233.266f, 465.301f, -237.242f, 528.234f, 285.25f, 529.75f, 285.25f, 529.75f, 249.523f, 545.801f, 222.246f, 460.746f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 222.246f, -460.746f, 222.246f, 460.742f, 221.512f, 458.594f, 223.246f, 459.75f, 233.266f, 465.301f, 237.242f, -528.234f, 285.25f, 529.75f, 285.25f, 529.75f, 249.523f, 545.801f, 222.246f, 460.746f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 200.246f, 447.746f, -200.246f, 447.746f, 198.973f, 446.812f, 201.246f, 446.75f, 212.391f, 448.555f, 235.937f, 493.953f, -285.25f, 488.746f, 285.25f, 488.742f, 249.656f, 504.148f, 200.246f, 447.746f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 200.246f, 447.746f, 200.246f, -447.746f, 198.973f, 446.812f, 201.246f, 446.75f, 212.391f, 448.555f, 235.937f, 493.953f, 285.25f, -488.746f, 285.25f, 488.742f, 249.656f, 504.148f, 200.246f, 447.746f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 212.246f, 454.75f, 212.246f, 454.75f, -211.625f, 453.348f, 213.246f, 453.746f, 224.461f, 457.637f, 238.852f, 506.711f, 288.246f, 510.746f, -288.246f, 510.742f, 250.363f, 519.348f, 212.246f, 454.75f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 212.246f, 454.75f, 212.246f, 454.75f, 211.625f, -453.348f, 213.246f, 453.746f, 224.461f, 457.637f, 238.852f, 506.711f, 288.246f, 510.746f, 288.246f, -510.742f, 250.363f, 519.348f, 212.246f, 454.75f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 192.25f, 442.746f, 192.25f, 442.742f, 191.453f, 441.449f, -193.25f, 441.75f, 202.32f, 442.863f, 221.395f, 479.633f, 261.25f, 474.75f, 261.25f, 474.75f, -232.508f, 487.891f, 192.25f, 442.746f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 192.25f, 442.746f, 192.25f, 442.742f, 191.453f, 441.449f, 193.25f, -441.75f, 202.32f, 442.863f, 221.395f, 479.633f, 261.25f, 474.75f, 261.25f, 474.75f, 232.508f, -487.891f, 192.25f, 442.746f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 184.25f, 435.75f, 184.25f, 435.75f, 182.949f, 434.945f, 184.25f, 434.746f, -189.281f, 435.414f, 222.984f, 471.801f, 243.246f, 454.75f, 243.246f, 454.75f, 230.082f, 475.344f, -184.25f, 435.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 184.25f, 435.75f, 184.25f, 435.75f, 182.949f, 434.945f, 184.25f, 434.746f, 189.281f, -435.414f, 222.984f, 471.801f, 243.246f, 454.75f, 243.246f, 454.75f, 230.082f, 475.344f, 184.25f, -435.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -260.25f, 470.75f, 260.25f, 470.75f, 259.219f, 472.699f, 261.25f, 472.75f, 263.469f, 473.547f, -396.242f, 537.031f, 438.25f, 522.746f, 438.25f, 522.746f, 409.465f, 534.84f, 260.25f, 470.75f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 260.25f, -470.75f, 260.25f, 470.75f, 259.219f, 472.699f, 261.25f, 472.75f, 263.469f, 473.547f, 396.242f, -537.031f, 438.25f, 522.746f, 438.25f, 522.746f, 409.465f, 534.84f, 260.25f, 470.75f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 223.246f, 400.75f, -223.246f, 400.75f, 223.52f, 402.457f, 225.25f, 401.746f, 227.477f, 400.695f, 244.418f, 400.035f, -231.246f, 375.75f, 231.246f, 375.75f, 241.34f, 401.797f, 223.246f, 400.75f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 223.246f, 400.75f, 223.246f, -400.75f, 223.52f, 402.457f, 225.25f, 401.746f, 227.477f, 400.695f, 244.418f, 400.035f, 231.246f, -375.75f, 231.246f, 375.75f, 241.34f, 401.797f, 223.246f, 400.75f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 235.246f, 401.746f, 235.242f, 401.746f, -234.957f, 404.219f, 237.25f, 403.746f, 238.918f, 402.457f, 258.5f, 400.035f, 260.25f, 357.746f, -260.25f, 357.746f, 252.777f, 403.559f, 235.246f, 401.746f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 235.246f, 401.746f, 235.242f, 401.746f, 234.957f, -404.219f, 237.25f, 403.746f, 238.918f, 402.457f, 258.5f, 400.035f, 260.25f, 357.746f, 260.25f, -357.746f, 252.777f, 403.559f, 235.246f, 401.746f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 242.246f, 403.746f, 242.246f, 403.746f, 242.437f, 405.977f, -244.246f, 404.75f, 246.398f, 404.219f, 273.457f, 400.477f, 299.246f, 364.75f, 299.246f, 364.75f, -260.258f, 405.316f, 242.246f, 403.746f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 242.246f, 403.746f, 242.246f, 403.746f, 242.437f, 405.977f, 244.246f, -404.75f, 246.398f, 404.219f, 273.457f, 400.477f, 299.246f, 364.75f, 299.246f, 364.75f, 260.258f, -405.316f, 242.246f, 403.746f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 251.25f, 405.746f, 251.25f, 405.742f, 250.566f, 408.164f, 252.25f, 407.746f, -254.723f, 406.945f, 277.199f, 409.031f, 319.25f, 371.75f, 319.25f, 371.75f, 268.316f, 409.875f, -251.25f, 405.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 251.25f, 405.746f, 251.25f, 405.742f, 250.566f, 408.164f, 252.25f, 407.746f, 254.723f, -406.945f, 277.199f, 409.031f, 319.25f, 371.75f, 319.25f, 371.75f, 268.316f, 409.875f, 251.25f, -405.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -262.25f, 410.75f, 262.25f, 410.75f, 262.004f, 413.004f, 264.246f, 412.746f, 266.164f, 411.785f, -304.48f, 406.832f, 361.25f, 368.746f, 361.25f, 368.746f, 279.754f, 414.715f, 262.25f, 410.75f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 262.25f, -410.75f, 262.25f, 410.75f, 262.004f, 413.004f, 264.246f, 412.746f, 266.164f, 411.785f, 304.48f, -406.832f, 361.25f, 368.746f, 361.25f, 368.746f, 279.754f, 414.715f, 262.25f, 410.75f, 10, -0, 1, 1, 1, 1, 1, 1, 5, 218.25f, 423.746f, -218.25f, 423.746f, 217.797f, 425.777f, 220.246f, 424.75f, 221.758f, 424.016f, 280.5f, 421.156f, -314.25f, 391.75f, 314.25f, 391.75f, 275.547f, 418.93f, 218.25f, 423.746f, 10, 0.11f, -0, 0, 0, 0, 0, 0, 5, 218.25f, 423.746f, 218.25f, -423.746f, 217.797f, 425.777f, 220.246f, 424.75f, 221.758f, 424.016f, 280.5f, 421.156f, 314.25f, -391.75f, 314.25f, 391.75f, 275.547f, 418.93f, 218.25f, 423.746f, 10, 0, 1, -1, 1, 1, 1, 1, 5, 207.25f, 419.75f, 207.25f, 419.75f, -206.797f, 421.379f, 209.246f, 420.746f, 210.758f, 419.617f, 237.816f, 415.879f, 264.246f, 379.746f, -264.246f, 379.746f, 224.617f, 420.719f, 207.25f, 419.75f, 10, 0.11f, 0, 0, -0, 0, 0, 0, 5, 207.25f, 419.75f, 207.25f, 419.75f, 206.797f, -421.379f, 209.246f, 420.746f, 210.758f, 419.617f, 237.816f, 415.879f, 264.246f, 379.746f, 264.246f, -379.746f, 224.617f, 420.719f, 207.25f, 419.75f, 10, 0, 1, 1, 1, -1, 1, 1, 5, 274.25f, 415.75f, 274.25f, 415.75f, 273.828f, 418.031f, -276.246f, 417.75f, 278.066f, 417.125f, 316.645f, 414.992f, 376.246f, 380.75f, 376.246f, 380.75f, -290.746f, 418.625f, 274.25f, 415.75f, 10, 0.11f, 0, 0, 0, 0, -0, 0, 5, 274.25f, 415.75f, 274.25f, 415.75f, 273.828f, 418.031f, 276.246f, -417.75f, 278.066f, 417.125f, 316.645f, 414.992f, 376.246f, 380.75f, 376.246f, 380.75f, 290.746f, -418.625f, 274.25f, 415.75f, 10, 0, 1, 1, 1, 1, 1, -1, 5, 283.25f, 418.746f, 283.25f, 418.742f, 283.07f, 420.672f, 285.25f, 419.75f, -287.309f, 419.762f, 325.883f, 417.633f, 385.25f, 383.746f, 385.25f, 383.742f, 300.648f, 421.703f, -283.25f, 418.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, -5, 283.25f, 418.746f, 283.25f, 418.742f, 283.07f, 420.672f, 285.25f, 419.75f, 287.309f, -419.762f, 325.883f, 417.633f, 385.25f, 383.746f, 385.25f, 383.742f, 300.648f, 421.703f, 283.25f, -418.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, -294.25f, 424.75f, 294.25f, 424.75f, 293.629f, 426.172f, 296.25f, 425.746f, 297.867f, 425.262f, -345.242f, 420.492f, 444.246f, 382.75f, 444.246f, 382.75f, 311.207f, 427.203f, 294.25f, 424.75f, -10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 294.25f, -424.75f, 294.25f, 424.75f, 293.629f, 426.172f, 296.25f, 425.746f, 297.867f, 425.262f, 345.242f, -420.492f, 444.246f, 382.75f, 444.246f, 382.75f, 311.207f, 427.203f, 294.25f, 424.75f, 10, -0, 0, 0, 0, 0, 0, 0, 4, 172.25f, 416.746f, -172.25f, 416.742f, 177.539f, 417.195f, 176.246f, 415.75f, 174.898f, 413.676f, 172.25f, 414.746f, -172.25f, 414.746f, 172.25f, 416.746f, 10, 0, 0, 0, 0, 0, -0, 0, 4, 205.25f, 401.746f, 205.25f, 401.746f, 211.418f, 401.797f, 210.246f, -399.75f, 208.777f, 398.277f, 206.25f, 398.746f, 206.25f, 398.746f, 205.25f, 401.746f, 10, -0, 0, 0, 0, 0, 0, 0, 4, 196.25f, 401.746f, -196.25f, 401.746f, 201.738f, 402.238f, 200.246f, 400.75f, 199.098f, 398.719f, 196.25f, 399.75f, -196.25f, 399.75f, 196.25f, 401.746f, 10, 0, 0, 0, 0, 0, -0, 0, 4, 91.25f, 414.746f, 91.25f, 414.746f, 96.6602f, 413.344f, 95.25f, -411.746f, 93.0156f, 410.879f, 91.25f, 412.746f, 91.25f, 412.746f, 91.25f, 414.746f, 10, -0, 0, 0, 0, 0, 0, 0, 4, 93.2461f, 425.746f, -93.2422f, 425.746f, 98.8633f, 423.902f, 97.25f, 422.746f, 95.2148f, 421.441f, 93.2461f, 422.746f, -93.2461f, 422.746f, 93.2461f, 425.746f, 10, 0, 0, 0, 0, 0, -0, 0, 4, 85.25f, 429.746f, 85.25f, 429.742f, 90.9414f, 428.742f, 89.2461f, -427.746f, 87.2969f, 426.281f, 85.25f, 427.746f, 85.25f, 427.746f, 85.25f, 429.746f, 10, -0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 173.25f, 347.75f, -173.25f, 347.75f, 171.379f, 347.676f, 167.25f, 345.75f, 164.777f, 345.477f, 152.457f, 341.516f, -146.25f, 330.746f, 146.25f, 330.742f, 159.938f, 341.078f, 173.25f, 347.75f, 10, 0, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 9, 269.246f, 245.746f, 269.781f, -245.484f, 269.84f, 245.02f, 270.25f, 244.75f, 270.887f, 244.957f, 272.242f, 244.625f, 272.25f, -245.746f, 271.172f, 250.063f, 270.211f, 255.492f, 265.246f, 257.746f, 264.961f, 257.789f, 263.375f, -257.332f, 263.25f, 256.746f, 263.156f, 254.684f, 263.027f, 253.203f, 263.25f, 251.75f, 263.695f, -250.027f, 266.07f, 250.016f, 267.246f, 251.75f, 268.109f, 249.699f, 268.582f, 247.672f, 269.246f, -245.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 9, -257.246f, 240.75f, 258.262f, 239.004f, 258.121f, 236.961f, 259.25f, 236.746f, 260.492f, 236.016f, -262.527f, 237.09f, 262.25f, 238.746f, 261.188f, 240.539f, 260.758f, 243, 259.25f, 244.75f, -259.012f, 245.281f, 259.277f, 245.867f, 259.25f, 245.746f, 258.445f, 247.57f, 257.188f, 248.379f, -255.246f, 247.746f, 254.41f, 245.594f, 255.676f, 243.25f, 257.246f, 241.75f, 257.5f, 241.203f, -257.316f, 240.793f, 257.246f, 240.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 11, 214.25f, 246.746f, 213.758f, 246.684f, 213.719f, 247.191f, 214.25f, -247.746f, 214.484f, 248.68f, 215.355f, 249.914f, 215.25f, 250.746f, 214.602f, 252.203f, 213.375f, -252, 212.246f, 251.75f, 211.41f, 250.281f, 211.355f, 248.273f, 210.246f, 246.746f, 210.379f, -246.355f, 210.438f, 245.723f, 210.246f, 245.746f, 209.43f, 244.832f, 208.945f, 243.152f, 209.246f, -242.75f, 209.109f, 242.18f, 208.91f, 231.281f, 209.246f, 231.75f, 209.836f, 232.379f, 213.188f, -243.086f, 213.246f, 243.75f, 213.328f, 244.871f, 214.133f, 245.383f, 214.25f, 246.746f, 10, -0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 7, 185.25f, 253.75f, -188.574f, 256.488f, 191.641f, 259.746f, 191.246f, 263.75f, 191.027f, 264.902f, 189.074f, 264.32f, -189.246f, 263.75f, 187.988f, 259.402f, 185.746f, 256.477f, 183.25f, 253.75f, 180.504f, 251.594f, -178.457f, 244.617f, 178.246f, 243.75f, 182.266f, 249.84f, 184.746f, 252.859f, 185.25f, 253.75f, -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 10, 170.246f, -260.746f, 171.32f, 260.707f, 170.988f, 261.246f, 171.246f, 261.746f, 172.273f, 263.215f, 173.707f, -264.586f, 173.25f, 266.746f, 173.73f, 266.805f, 173.313f, 267.145f, 173.25f, 266.746f, 172.641f, -266.695f, 172.262f, 266.551f, 172.25f, 266.746f, 169.91f, 263.715f, 168.371f, 260.777f, 167.25f, -257.746f, 166.582f, 257.289f, 165.324f, 252.352f, 165.246f, 251.75f, 165.934f, 252.133f, 167.824f, -256.734f, 168.25f, 256.746f, 169.445f, 257.613f, 169.457f, 259.391f, 170.246f, 260.746f, 10, -0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 189.246f, 238.746f, -189.641f, 239.758f, 191.371f, 241.078f, 191.246f, 241.75f, 191.117f, 243.078f, 191.633f, 244.664f, -190.246f, 243.75f, 189.246f, 242.867f, 185.453f, 241.383f, 185.25f, 234.746f, 185.129f, 234.363f, -188.398f, 237.328f, 189.246f, 238.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 19, 205.25f, 257.746f, 205.477f, 258.434f, 206.258f, 257.91f, 207.25f, -257.746f, 207.473f, 258.609f, 208.148f, 259.223f, 208.25f, 259.746f, 209.535f, 262.301f, 211.48f, -264.305f, 211.246f, 266.746f, 209.996f, 268.484f, 209.25f, 266.238f, 208.25f, 264.746f, 207.102f, -266.988f, 206.004f, 264.926f, 204.25f, 264.746f, 204.496f, 264.324f, 204.262f, 264.707f, 204.25f, -264.746f, 202.887f, 264.195f, 202.137f, 263.004f, 201.246f, 261.746f, 200.852f, 261.996f, 200.406f, -262.195f, 200.246f, 261.746f, 199.527f, 261.383f, 198.457f, 261.027f, 198.246f, 260.746f, 196.93f, -257.297f, 193.473f, 254.992f, 191.246f, 246.746f, 191.816f, 245.695f, 196.359f, 254.004f, 197.25f, -254.75f, 197.816f, 256.086f, 197.945f, 252.945f, 199.246f, 253.75f, 199.406f, 253.707f, 199.609f, -253.445f, 200.246f, 253.75f, 199.973f, 253.605f, 200.211f, 253.855f, 200.246f, 253.75f, 200.637f, -254.176f, 200.492f, 254.789f, 200.246f, 254.75f, 202.074f, 256.039f, 201.98f, 257.215f, 203.25f, -258.746f, 203.344f, 257.711f, 204.508f, 258.5f, 205.25f, 257.746f, 10, 0, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 271.25f, 197.75f, 271.25f, 197.75f, -278.957f, 220.297f, 274.25f, 232.75f, 274.25f, 232.75f, 286.656f, 208.855f, 281.25f, 196.75f, -281.25f, 196.75f, 281.156f, 207.977f, 277.246f, 213.746f, 277.246f, 213.746f, 272.359f, 199.398f, -271.25f, 197.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -5, 254.246f, 200.75f, 254.246f, 200.75f, 260.477f, 210.398f, 251.25f, 230.75f, 251.25f, -230.75f, 250.797f, 208.195f, 243.246f, 195.746f, 243.246f, 195.742f, 258.937f, 218.316f, 254.246f, -200.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, -243.246f, 202.746f, 243.246f, 202.746f, 243.316f, 224.918f, 244.246f, 227.746f, 244.246f, 227.742f, -239.578f, 209.957f, 228.25f, 199.75f, 228.25f, 199.75f, 244.199f, 212.598f, 243.246f, 202.746f, -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 233.246f, -237.746f, 233.246f, 237.746f, 239.578f, 223.156f, 228.25f, 202.746f, 228.25f, 202.746f, 235.617f, -216.336f, 230.25f, 223.746f, 230.25f, 223.746f, 233.199f, 227.777f, 233.246f, 237.746f, 10, -0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 8, 212.246f, 203.746f, -212.246f, 203.746f, 210.758f, 220.516f, 212.246f, 222.75f, 212.246f, 222.75f, 212.957f, 229.977f, -212.246f, 230.75f, 212.246f, 230.75f, 216.918f, 237.898f, 217.25f, 229.75f, 217.25f, 229.75f, -218.68f, 221.176f, 222.246f, 215.746f, 222.246f, 215.746f, 225.719f, 210.176f, 225.25f, 202.746f, -225.25f, 202.746f, 214.5f, 236.355f, 212.246f, 203.746f, 10, 0, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 0.8f, 5, 208.25f, 233.75f, 208.25f, 233.75f, 200.637f, -221.836f, 198.246f, 200.75f, 198.246f, 200.75f, 197.117f, 207.758f, 201.246f, 223.746f, 201.246f, -223.746f, 205.918f, 240.535f, 208.25f, 233.75f, 10, 0, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 6, 184.25f, 211.75f, 184.25f, 211.75f, 189.418f, 217.879f, -191.246f, 223.746f, 191.242f, 223.746f, 194.918f, 240.758f, 188.246f, 231.75f, 188.246f, 231.75f, -188.098f, 222.496f, 179.246f, 214.746f, 179.246f, 214.746f, 184.359f, 216.996f, 184.25f, 211.75f, -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 177.246f, -217.746f, 177.246f, 217.742f, 181.277f, 236.578f, 182.25f, 237.746f, 182.25f, 237.746f, 184.137f, -241.195f, 181.25f, 237.746f, 181.25f, 237.746f, 171.379f, 216.559f, 167.25f, 209.75f, 167.25f, -209.75f, 175.777f, 219.418f, 177.246f, 217.746f, 10, 0, 0.8f, 0.8f, 0.8f, -0.8f, 0.8f, 0.8f, 4, 171.246f, 235.746f, 171.246f, 235.746f, 183.918f, 260.336f, -160.246f, 231.75f, 160.246f, 231.75f, 172.039f, 242.738f, 171.246f, 235.746f, 10, 0, -0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 154.246f, 251.75f, 154.242f, -251.75f, 159.5f, 272.438f, 162.25f, 271.746f, 162.25f, 271.746f, 171.379f, 282.117f, 164.246f, -270.75f, 164.242f, 270.75f, 157.52f, 259.898f, 158.25f, 248.746f, 158.25f, 248.746f, 157.52f, -259.676f, 154.246f, 251.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -0.8f, 5, 517.246f, 264.746f, 517.242f, 264.742f, 504.348f, 275.297f, 501.25f, 278.75f, -501.25f, 278.75f, 516.449f, 258.797f, 516.25f, 250.746f, 516.25f, 250.742f, 519.199f, 259.348f, -517.246f, 264.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, -5, 523.25f, 288.746f, 523.25f, 288.742f, 500.5f, 305, 496.25f, 312.75f, 496.25f, -312.75f, 525.797f, 280.797f, 526.246f, 275.746f, 526.242f, 275.742f, 526.348f, 285.75f, 523.25f, -288.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, -542.246f, 457.75f, 542.246f, 457.75f, 529.098f, 466.699f, 527.25f, 464.746f, 527.25f, 464.742f, -539, 457.348f, 542.246f, 447.746f, 542.246f, 447.746f, 540.098f, 457.898f, 542.246f, 457.75f, -10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 4, 551.25f, -369.75f, 532.25f, 382.75f, 532.25f, 382.75f, 553.297f, 363.848f, 554.25f, 359.746f, 551.25f, -369.75f, 10, 1.1f, 0, 0, 0, 0, 0, 0, 2, -122.246f, 393.75f, 146.25f, 388.75f, 10, 1.1f, 0, 0, 0, 0, -0, 0, 2, 177.246f, 215.746f, 177.246f, 215.746f, 176.547f, 219.75f, 166.246f, -207.75f, 10, 1.1f, 0, 0, 0, 0, 0, 0, 2, -183.25f, 210.75f, 183.25f, 210.75f, 185.348f, 217.547f, 178.246f, 212.746f, 10, 1.1f, -0, 0, 0, 0, 0, 0, 2, 242.246f, 200.75f, 242.246f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 0, +792, 0, 0, 612, 0, 612, 792, 10, 0, 1, +1, 1, 1, 1, 1, 5, 85.25f, 487.75f, 85.25f, 487.75f, +85.5742f, 485.199f, 84.25f, 484.746f, 83.7617f, 485.242f, 65.6641f, 538.125f, 43.2461f, 535.746f, +43.2422f, 535.746f, 62.6445f, 543.746f, 85.25f, 487.75f, 10, 0.1892f, 0, 0, +0, 0, 0, 0, 5, 85.25f, 487.75f, 85.25f, 487.75f, 85.5742f, +485.199f, 84.25f, 484.746f, 83.7617f, 485.242f, 65.6641f, 538.125f, 43.2461f, 535.746f, 43.2422f, +535.746f, 62.6445f, 543.746f, 85.25f, 487.75f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 89.2461f, 490.75f, 89.2461f, 490.75f, 88.7422f, 488.613f, +88.2461f, 488.746f, 87.0508f, 489.27f, 88.0234f, 545.156f, 66.2461f, 550.746f, 66.2461f, 550.742f, +87.0977f, 551.469f, 89.2461f, 490.75f, 10, 0.1892f, 0, 0, 0, 0, +0, 0, 5, 89.2461f, 490.75f, 89.2461f, 490.75f, 88.7422f, 488.613f, 88.2461f, +488.746f, 87.0508f, 489.27f, 88.0234f, 545.156f, 66.2461f, 550.746f, 66.2461f, 550.742f, 87.0977f, +551.469f, 89.2461f, 490.75f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 119.25f, 443.75f, 119.25f, 443.75f, 121.387f, 442.992f, 121.246f, 442.746f, +120.352f, 441.504f, 66.2578f, 455.586f, 56.25f, 435.75f, 56.25f, 435.75f, 59.9062f, 456.168f, +119.25f, 443.75f, 10, 0.1892f, 0, 0, 0, 0, 0, 0, +5, 119.25f, 443.75f, 119.25f, 443.75f, 121.387f, 442.992f, 121.246f, 442.746f, 120.352f, +441.504f, 66.2578f, 455.586f, 56.25f, 435.75f, 56.25f, 435.75f, 59.9062f, 456.168f, 119.25f, +443.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +116.246f, 432.75f, 116.246f, 432.75f, 118.539f, 432.383f, 118.25f, 431.746f, 118.023f, 430.641f, +62.25f, 426.965f, 58.25f, 404.75f, 58.25f, 404.75f, 56.0391f, 425.516f, 116.246f, 432.75f, +10, 0.1892f, 0, 0, 0, 0, 0, 0, 5, 116.246f, +432.75f, 116.246f, 432.75f, 118.539f, 432.383f, 118.25f, 431.746f, 118.023f, 430.641f, 62.25f, +426.965f, 58.25f, 404.75f, 58.25f, 404.75f, 56.0391f, 425.516f, 116.246f, 432.75f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 112.25f, 438.746f, +112.25f, 438.742f, 113.82f, 438.164f, 113.25f, 437.75f, 113.059f, 436.52f, 57.3437f, 441.016f, +50.2461f, 419.75f, 50.2461f, 419.75f, 50.9883f, 440.492f, 112.25f, 438.746f, 10, 0.1892f, +0, 0, 0, 0, 0, 0, 5, 112.25f, 438.746f, 112.25f, +438.742f, 113.82f, 438.164f, 113.25f, 437.75f, 113.059f, 436.52f, 57.3437f, 441.016f, 50.2461f, +419.75f, 50.2461f, 419.75f, 50.9883f, 440.492f, 112.25f, 438.746f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 100.246f, 458.746f, 100.246f, 458.746f, +101.527f, 457.406f, 101.25f, 456.746f, 100.121f, 456.262f, 52.0039f, 484.699f, 36.25f, 467.746f, +36.25f, 467.746f, 46.0586f, 487.012f, 100.246f, 458.746f, 10, 0.1892f, 0, 0, +0, 0, 0, 0, 5, 100.246f, 458.746f, 100.246f, 458.746f, 101.527f, +457.406f, 101.25f, 456.746f, 100.121f, 456.262f, 52.0039f, 484.699f, 36.25f, 467.746f, 36.25f, +467.746f, 46.0586f, 487.012f, 100.246f, 458.746f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 92.2461f, 454.75f, 92.2422f, 454.75f, 93.3906f, 452.969f, +93.2461f, 452.75f, 92.125f, 451.672f, 41.0976f, 474.484f, 27.25f, 456.746f, 27.25f, 456.746f, +34.9258f, 476.105f, 92.2461f, 454.75f, 10, 0.1892f, 0, 0, 0, 0, +0, 0, 5, 92.2461f, 454.75f, 92.2422f, 454.75f, 93.3906f, 452.969f, 93.2461f, +452.75f, 92.125f, 451.672f, 41.0976f, 474.484f, 27.25f, 456.746f, 27.25f, 456.746f, 34.9258f, +476.105f, 92.2461f, 454.75f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 89.2461f, 449.746f, 89.2461f, 449.742f, 90.6992f, 448.723f, 90.25f, 447.746f, +89.6211f, 447.262f, 35.9609f, 462.906f, 25.25f, 442.746f, 25.25f, 442.742f, 29.625f, 463.676f, +89.2461f, 449.746f, 10, 0.1892f, 0, 0, 0, 0, 0, 0, +5, 89.2461f, 449.746f, 89.2461f, 449.742f, 90.6992f, 448.723f, 90.25f, 447.746f, 89.6211f, +447.262f, 35.9609f, 462.906f, 25.25f, 442.746f, 25.25f, 442.742f, 29.625f, 463.676f, 89.2461f, +449.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +100.246f, 448.75f, 100.246f, 448.75f, 101.969f, 447.469f, 101.25f, 446.75f, 100.43f, 446.512f, +56.3516f, 480.887f, 39.2461f, 466.746f, 39.2461f, 466.742f, 50.75f, 483.941f, 100.246f, 448.75f, +10, 0.1892f, 0, 0, 0, 0, 0, 0, 5, 100.246f, +448.75f, 100.246f, 448.75f, 101.969f, 447.469f, 101.25f, 446.75f, 100.43f, 446.512f, 56.3516f, +480.887f, 39.2461f, 466.746f, 39.2461f, 466.742f, 50.75f, 483.941f, 100.246f, 448.75f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 79.25f, 480.746f, +79.25f, 480.746f, 79.6367f, 479.02f, 79.25f, 478.746f, 77.8789f, 478.578f, 46.418f, 524.777f, +25.25f, 516.75f, 25.25f, 516.75f, 42.0195f, 529.398f, 79.25f, 480.746f, 10, 0.1892f, +0, 0, 0, 0, 0, 0, 5, 79.25f, 480.746f, 79.25f, +480.746f, 79.6367f, 479.02f, 79.25f, 478.746f, 77.8789f, 478.578f, 46.418f, 524.777f, 25.25f, +516.75f, 25.25f, 516.75f, 42.0195f, 529.398f, 79.25f, 480.746f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 79.25f, 473.746f, 79.25f, 473.742f, +80.8164f, 471.527f, 80.25f, 470.75f, 79.1914f, 470.723f, 38.5078f, 509.051f, 19.25f, 496.75f, +19.25f, 496.75f, 33.2148f, 512.609f, 79.25f, 473.746f, 10, 0.1892f, 0, 0, +0, 0, 0, 0, 5, 79.25f, 473.746f, 79.25f, 473.742f, 80.8164f, +471.527f, 80.25f, 470.75f, 79.1914f, 470.723f, 38.5078f, 509.051f, 19.25f, 496.75f, 19.25f, +496.75f, 33.2148f, 512.609f, 79.25f, 473.746f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 79.25f, 468.75f, 79.25f, 468.75f, 80.8516f, 466.828f, +80.25f, 466.746f, 79.3086f, 465.875f, 35.2305f, 500.246f, 17.25f, 485.75f, 17.25f, 485.75f, +29.6289f, 503.301f, 79.25f, 468.75f, 10, 0.1892f, 0, 0, 0, 0, +0, 0, 5, 79.25f, 468.75f, 79.25f, 468.75f, 80.8516f, 466.828f, 80.25f, +466.746f, 79.3086f, 465.875f, 35.2305f, 500.246f, 17.25f, 485.75f, 17.25f, 485.75f, 29.6289f, +503.301f, 79.25f, 468.75f, 10, 0, 1, 1, 1, 1, 1, +1, 88, 77.2461f, 466.746f, 77.7383f, 459.973f, 78.8242f, 452.746f, 80.25f, 449.746f, +80.25f, 449.742f, 76.7773f, 435.676f, 86.25f, 420.746f, 86.25f, 420.742f, 86.0195f, 413.238f, +88.2461f, 409.746f, 88.2461f, 409.742f, 92.1797f, 400.477f, 97.25f, 399.75f, 101.73f, 398.887f, +111.324f, 395.508f, 122.246f, 393.75f, 122.246f, 393.75f, 141.02f, 378.477f, 137.246f, 364.75f, +137.242f, 364.75f, 137.059f, 346.355f, 133.246f, 344.75f, 133.246f, 344.75f, 145.859f, 356.918f, +135.25f, 338.75f, 130.25f, 317.746f, 130.25f, 317.742f, 158.617f, 341.516f, 141.25f, 321.746f, +130.25f, 292.75f, 130.25f, 292.75f, 152.02f, 312.918f, 144.246f, 303.75f, 140.25f, 293.746f, +140.25f, 293.746f, 188.098f, 323.918f, 154.246f, 291.746f, 154.242f, 291.746f, 163.02f, 295.316f, +168.25f, 291.746f, 168.25f, 291.746f, 175.34f, 293.559f, 174.25f, 291.746f, 174.25f, 291.746f, +151.578f, 280.355f, 147.25f, 259.746f, 147.25f, 259.746f, 156.859f, 271.117f, 153.246f, 258.746f, +154.246f, 246.746f, 154.242f, 246.746f, 158.18f, 270.238f, 157.25f, 228.746f, 157.25f, 228.742f, +178.859f, 248.676f, 166.246f, 225.746f, 166.246f, 207.75f, 166.246f, 207.75f, 182.816f, 225.355f, +176.246f, 211.75f, 176.246f, 211.75f, 186.777f, 220.957f, 182.25f, 203.746f, 182.25f, 203.746f, +181.5f, 192.797f, 186.25f, 204.746f, 186.25f, 204.746f, 203.938f, 238.777f, 197.25f, 209.75f, +197.25f, 209.75f, 196.457f, 188.836f, 201.246f, 204.746f, 201.246f, 204.746f, 202.18f, 193.676f, +212.246f, 185.75f, 212.246f, 185.75f, 210.977f, 241.637f, 225.25f, 201.746f, 229.25f, 183.746f, +229.25f, 183.742f, 232.539f, 194.117f, 232.246f, 199.75f, 232.246f, 199.75f, 248.379f, 217.879f, +241.25f, 190.746f, 241.25f, 190.746f, 257.617f, 216.117f, 254.246f, 201.746f, 254.246f, 201.746f, +245.738f, 183.996f, 247.246f, 178.75f, 247.242f, 178.75f, 265.977f, 216.996f, 267.246f, 218.75f, +267.246f, 218.75f, 265.098f, 172.117f, 277.246f, 211.75f, 277.246f, 211.75f, 283.137f, 198.516f, +280.246f, 193.746f, 280.242f, 193.746f, 288.859f, 202.477f, 288.246f, 205.746f, 288.246f, 205.742f, +293.039f, 215.016f, 296.25f, 199.75f, 296.25f, 199.75f, 298.098f, 189.719f, 300.246f, 192.746f, +300.246f, 192.746f, 304.258f, 166.836f, 305.25f, 191.746f, 305.25f, 191.746f, 307.34f, 206.879f, +299.246f, 219.75f, 299.246f, 219.75f, 300.297f, 223.156f, 297.246f, 227.746f, 297.246f, 227.742f, +312.18f, 203.797f, 304.25f, 235.746f, 304.25f, 235.746f, 316.578f, 226.676f, 318.25f, 226.746f, +318.25f, 226.746f, 302.937f, 252.195f, 312.246f, 246.746f, 312.242f, 246.746f, 306.898f, 258.355f, +326.25f, 244.75f, 326.25f, 244.75f, 309.098f, 262.758f, 328.25f, 251.75f, 328.25f, 251.75f, +337.258f, 245.156f, 329.25f, 255.75f, 329.25f, 255.75f, 313.059f, 273.758f, 337.25f, 253.75f, +337.25f, 253.75f, 350.02f, 235.918f, 351.25f, 232.75f, 351.25f, 232.75f, 339.898f, 264.957f, +335.246f, 267.75f, 335.242f, 267.75f, 344.301f, 308.078f, 389.246f, 290.75f, 389.246f, 290.75f, +397.098f, 271.996f, 402.246f, 291.746f, 402.242f, 291.746f, 416.02f, 299.277f, 428.25f, 268.75f, +428.25f, 268.75f, 432.738f, 283.879f, 432.246f, 286.746f, 432.246f, 286.742f, 439.34f, 285.637f, +438.25f, 286.746f, 438.25f, 286.742f, 452.98f, 282.117f, 454.246f, 282.746f, 454.246f, 282.746f, +461.777f, 275.516f, 462.246f, 279.75f, 462.242f, 279.75f, 472.34f, 276.398f, 470.25f, 280.746f, +470.25f, 280.746f, 479.82f, 263.195f, 480.246f, 258.746f, 483.25f, 274.75f, 485.25f, 271.746f, +485.25f, 271.746f, 486.859f, 279.918f, 486.25f, 280.746f, 485.098f, 282.559f, 507.98f, 273.758f, +513.246f, 250.746f, 515.246f, 241.75f, 515.242f, 241.75f, 522.059f, 257.918f, 520.246f, 262.75f, +520.246f, 262.75f, 526.02f, 261.438f, 526.246f, 256.746f, 526.242f, 256.746f, 530.859f, 282.117f, +525.25f, 288.746f, 525.25f, 288.742f, 530.418f, 289.598f, 531.246f, 285.75f, 531.246f, 293.746f, +531.246f, 293.746f, 539.66f, 292.676f, 539.246f, 295.746f, 539.242f, 295.742f, 544.5f, 299.719f, +546.246f, 294.75f, 546.242f, 294.75f, 533.059f, 333.156f, 553.246f, 311.75f, 553.246f, 311.75f, +561.219f, 300.156f, 557.246f, 320.75f, 553.301f, 341.516f, 548.898f, 343.277f, 554.25f, 343.746f, +554.25f, 343.742f, 555.059f, 347.676f, 553.246f, 349.75f, 550.66f, 351.195f, 554.25f, 349.75f, +554.25f, 349.75f, 554.25f, 349.75f, 559.461f, 345.035f, 553.246f, 368.746f, 553.246f, 368.746f, +560.777f, 367.477f, 547.25f, 399.75f, 547.25f, 399.75f, 550.66f, 402.238f, 546.246f, 411.746f, +546.242f, 411.742f, 555.059f, 406.637f, 558.25f, 408.75f, 558.25f, 408.75f, 557.699f, 410.156f, +554.25f, 414.746f, 554.25f, 414.746f, 530.418f, 474.84f, 553.246f, 450.75f, 553.246f, 450.75f, +565.895f, 435.73f, 559.246f, 460.746f, 559.242f, 460.742f, 548.832f, 487.223f, 549.25f, 491.746f, +77.2461f, 466.746f, 10, 1.1f, 0, 0, 0, 0, 0, 0, +88, 77.2461f, 466.746f, 77.7383f, 459.973f, 78.8242f, 452.746f, 80.25f, 449.746f, 80.25f, +449.742f, 76.7773f, 435.676f, 86.25f, 420.746f, 86.25f, 420.742f, 86.0195f, 413.238f, 88.2461f, +409.746f, 88.2461f, 409.742f, 92.1797f, 400.477f, 97.25f, 399.75f, 101.73f, 398.887f, 111.324f, +395.508f, 122.246f, 393.75f, 122.246f, 393.75f, 141.02f, 378.477f, 137.246f, 364.75f, 137.242f, +364.75f, 137.059f, 346.355f, 133.246f, 344.75f, 133.246f, 344.75f, 145.859f, 356.918f, 135.25f, +338.75f, 130.25f, 317.746f, 130.25f, 317.742f, 158.617f, 341.516f, 141.25f, 321.746f, 130.25f, +292.75f, 130.25f, 292.75f, 152.02f, 312.918f, 144.246f, 303.75f, 140.25f, 293.746f, 140.25f, +293.746f, 188.098f, 323.918f, 154.246f, 291.746f, 154.242f, 291.746f, 163.02f, 295.316f, 168.25f, +291.746f, 168.25f, 291.746f, 175.34f, 293.559f, 174.25f, 291.746f, 174.25f, 291.746f, 151.578f, +280.355f, 147.25f, 259.746f, 147.25f, 259.746f, 156.859f, 271.117f, 153.246f, 258.746f, 154.246f, +246.746f, 154.242f, 246.746f, 158.18f, 270.238f, 157.25f, 228.746f, 157.25f, 228.742f, 178.859f, +248.676f, 166.246f, 225.746f, 166.246f, 207.75f, 166.246f, 207.75f, 182.816f, 225.355f, 176.246f, +211.75f, 176.246f, 211.75f, 186.777f, 220.957f, 182.25f, 203.746f, 182.25f, 203.746f, 181.5f, +192.797f, 186.25f, 204.746f, 186.25f, 204.746f, 203.938f, 238.777f, 197.25f, 209.75f, 197.25f, +209.75f, 196.457f, 188.836f, 201.246f, 204.746f, 201.246f, 204.746f, 202.18f, 193.676f, 212.246f, +185.75f, 212.246f, 185.75f, 210.977f, 241.637f, 225.25f, 201.746f, 229.25f, 183.746f, 229.25f, +183.742f, 232.539f, 194.117f, 232.246f, 199.75f, 232.246f, 199.75f, 248.379f, 217.879f, 241.25f, +190.746f, 241.25f, 190.746f, 257.617f, 216.117f, 254.246f, 201.746f, 254.246f, 201.746f, 245.738f, +183.996f, 247.246f, 178.75f, 247.242f, 178.75f, 265.977f, 216.996f, 267.246f, 218.75f, 267.246f, +218.75f, 265.098f, 172.117f, 277.246f, 211.75f, 277.246f, 211.75f, 283.137f, 198.516f, 280.246f, +193.746f, 280.242f, 193.746f, 288.859f, 202.477f, 288.246f, 205.746f, 288.246f, 205.742f, 293.039f, +215.016f, 296.25f, 199.75f, 296.25f, 199.75f, 298.098f, 189.719f, 300.246f, 192.746f, 300.246f, +192.746f, 304.258f, 166.836f, 305.25f, 191.746f, 305.25f, 191.746f, 307.34f, 206.879f, 299.246f, +219.75f, 299.246f, 219.75f, 300.297f, 223.156f, 297.246f, 227.746f, 297.246f, 227.742f, 312.18f, +203.797f, 304.25f, 235.746f, 304.25f, 235.746f, 316.578f, 226.676f, 318.25f, 226.746f, 318.25f, +226.746f, 302.937f, 252.195f, 312.246f, 246.746f, 312.242f, 246.746f, 306.898f, 258.355f, 326.25f, +244.75f, 326.25f, 244.75f, 309.098f, 262.758f, 328.25f, 251.75f, 328.25f, 251.75f, 337.258f, +245.156f, 329.25f, 255.75f, 329.25f, 255.75f, 313.059f, 273.758f, 337.25f, 253.75f, 337.25f, +253.75f, 350.02f, 235.918f, 351.25f, 232.75f, 351.25f, 232.75f, 339.898f, 264.957f, 335.246f, +267.75f, 335.242f, 267.75f, 344.301f, 308.078f, 389.246f, 290.75f, 389.246f, 290.75f, 397.098f, +271.996f, 402.246f, 291.746f, 402.242f, 291.746f, 416.02f, 299.277f, 428.25f, 268.75f, 428.25f, +268.75f, 432.738f, 283.879f, 432.246f, 286.746f, 432.246f, 286.742f, 439.34f, 285.637f, 438.25f, +286.746f, 438.25f, 286.742f, 452.98f, 282.117f, 454.246f, 282.746f, 454.246f, 282.746f, 461.777f, +275.516f, 462.246f, 279.75f, 462.242f, 279.75f, 472.34f, 276.398f, 470.25f, 280.746f, 470.25f, +280.746f, 479.82f, 263.195f, 480.246f, 258.746f, 483.25f, 274.75f, 485.25f, 271.746f, 485.25f, +271.746f, 486.859f, 279.918f, 486.25f, 280.746f, 485.098f, 282.559f, 507.98f, 273.758f, 513.246f, +250.746f, 515.246f, 241.75f, 515.242f, 241.75f, 522.059f, 257.918f, 520.246f, 262.75f, 520.246f, +262.75f, 526.02f, 261.438f, 526.246f, 256.746f, 526.242f, 256.746f, 530.859f, 282.117f, 525.25f, +288.746f, 525.25f, 288.742f, 530.418f, 289.598f, 531.246f, 285.75f, 531.246f, 293.746f, 531.246f, +293.746f, 539.66f, 292.676f, 539.246f, 295.746f, 539.242f, 295.742f, 544.5f, 299.719f, 546.246f, +294.75f, 546.242f, 294.75f, 533.059f, 333.156f, 553.246f, 311.75f, 553.246f, 311.75f, 561.219f, +300.156f, 557.246f, 320.75f, 553.301f, 341.516f, 548.898f, 343.277f, 554.25f, 343.746f, 554.25f, +343.742f, 555.059f, 347.676f, 553.246f, 349.75f, 550.66f, 351.195f, 554.25f, 349.75f, 554.25f, +349.75f, 554.25f, 349.75f, 559.461f, 345.035f, 553.246f, 368.746f, 553.246f, 368.746f, 560.777f, +367.477f, 547.25f, 399.75f, 547.25f, 399.75f, 550.66f, 402.238f, 546.246f, 411.746f, 546.242f, +411.742f, 555.059f, 406.637f, 558.25f, 408.75f, 558.25f, 408.75f, 557.699f, 410.156f, 554.25f, +414.746f, 554.25f, 414.746f, 530.418f, 474.84f, 553.246f, 450.75f, 553.246f, 450.75f, 565.895f, +435.73f, 559.246f, 460.746f, 559.242f, 460.742f, 548.832f, 487.223f, 549.25f, 491.746f, 77.2461f, +466.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 44, +549.25f, 491.746f, 550.379f, 491.531f, 552.805f, 490.293f, 554.25f, 488.746f, 554.25f, 488.742f, +561.66f, 476.598f, 556.25f, 496.75f, 556.25f, 496.75f, 545.82f, 528.52f, 555.246f, 515.746f, +555.246f, 515.742f, 562.098f, 508.277f, 558.25f, 522.746f, 554.328f, 541.309f, 551.25f, 548.746f, +551.25f, 548.746f, 551.25f, 548.746f, 564.301f, 543.039f, 535.246f, 586.75f, 544.246f, 582.75f, +544.246f, 582.75f, 522.938f, 626.199f, 499.25f, 631.746f, 490.25f, 638.746f, 490.25f, 638.742f, +532.621f, 680.316f, 518.25f, 720.75f, 518.25f, 720.75f, 511.059f, 726.52f, 500.246f, 716.75f, +500.246f, 716.75f, 493.461f, 711.117f, 487.246f, 712.75f, 487.246f, 712.75f, 452.98f, 711.559f, +451.25f, 711.746f, 448.578f, 711.559f, 410.301f, 752.477f, 338.25f, 732.746f, 338.25f, 732.742f, +332.418f, 730.918f, 327.25f, 731.75f, 327.25f, 731.75f, 307.34f, 749.84f, 253.246f, 724.746f, +253.246f, 724.746f, 242.656f, 722.559f, 241.25f, 722.746f, 239.137f, 722.559f, 236.059f, 722.559f, +227.25f, 715.746f, 218.457f, 708.477f, 218.02f, 707.598f, 216.25f, 705.75f, 216.25f, 705.75f, +197.777f, 693.52f, 192.25f, 692.75f, 192.25f, 692.75f, 179.738f, 685.598f, 175.25f, 674.75f, +171.246f, 673.746f, 171.246f, 673.742f, 169.18f, 665.359f, 168.25f, 663.75f, 168.25f, 663.75f, +163.457f, 660.078f, 162.25f, 653.746f, 162.25f, 653.742f, 152.898f, 647.316f, 153.246f, 642.746f, +153.242f, 642.742f, 151.578f, 636.758f, 150.246f, 631.746f, 150.246f, 631.742f, 142.777f, 626.199f, +143.246f, 622.75f, 143.242f, 622.75f, 135.297f, 607.719f, 136.25f, 599.75f, 136.25f, 599.75f, +129.578f, 600.68f, 126.246f, 597.75f, 126.242f, 597.75f, 125.617f, 592.758f, 124.25f, 592.746f, +124.25f, 592.746f, 120.777f, 591, 123.25f, 586.75f, 123.25f, 586.75f, 121.656f, 583.52f, +121.246f, 581.746f, 121.246f, 581.746f, 122.098f, 578.68f, 117.25f, 572.746f, 117.25f, 572.742f, +110.219f, 551.84f, 112.25f, 545.75f, 112.25f, 545.75f, 112.859f, 540.84f, 110.246f, 538.75f, +110.246f, 538.75f, 105.816f, 539.52f, 115.246f, 526.746f, 115.242f, 526.742f, 115.938f, 525, +112.25f, 522.746f, 112.25f, 522.746f, 93.5f, 518.398f, 91.25f, 500.746f, 91.25f, 500.746f, +75.8984f, 484.078f, 76.2461f, 478.746f, 75.8984f, 475.824f, 76.1953f, 472.359f, 77.2461f, 467.746f, +77.2461f, 467.746f, 76.3398f, 458.117f, 106.25f, 456.746f, 137.059f, 456.355f, 549.25f, 491.746f, +549.25f, 491.746f, 10, 1.1f, 0, 0, 0, 0, 0, 0, +44, 549.25f, 491.746f, 550.379f, 491.531f, 552.805f, 490.293f, 554.25f, 488.746f, 554.25f, +488.742f, 561.66f, 476.598f, 556.25f, 496.75f, 556.25f, 496.75f, 545.82f, 528.52f, 555.246f, +515.746f, 555.246f, 515.742f, 562.098f, 508.277f, 558.25f, 522.746f, 554.328f, 541.309f, 551.25f, +548.746f, 551.25f, 548.746f, 551.25f, 548.746f, 564.301f, 543.039f, 535.246f, 586.75f, 544.246f, +582.75f, 544.246f, 582.75f, 522.938f, 626.199f, 499.25f, 631.746f, 490.25f, 638.746f, 490.25f, +638.742f, 532.621f, 680.316f, 518.25f, 720.75f, 518.25f, 720.75f, 511.059f, 726.52f, 500.246f, +716.75f, 500.246f, 716.75f, 493.461f, 711.117f, 487.246f, 712.75f, 487.246f, 712.75f, 452.98f, +711.559f, 451.25f, 711.746f, 448.578f, 711.559f, 410.301f, 752.477f, 338.25f, 732.746f, 338.25f, +732.742f, 332.418f, 730.918f, 327.25f, 731.75f, 327.25f, 731.75f, 307.34f, 749.84f, 253.246f, +724.746f, 253.246f, 724.746f, 242.656f, 722.559f, 241.25f, 722.746f, 239.137f, 722.559f, 236.059f, +722.559f, 227.25f, 715.746f, 218.457f, 708.477f, 218.02f, 707.598f, 216.25f, 705.75f, 216.25f, +705.75f, 197.777f, 693.52f, 192.25f, 692.75f, 192.25f, 692.75f, 179.738f, 685.598f, 175.25f, +674.75f, 171.246f, 673.746f, 171.246f, 673.742f, 169.18f, 665.359f, 168.25f, 663.75f, 168.25f, +663.75f, 163.457f, 660.078f, 162.25f, 653.746f, 162.25f, 653.742f, 152.898f, 647.316f, 153.246f, +642.746f, 153.242f, 642.742f, 151.578f, 636.758f, 150.246f, 631.746f, 150.246f, 631.742f, 142.777f, +626.199f, 143.246f, 622.75f, 143.242f, 622.75f, 135.297f, 607.719f, 136.25f, 599.75f, 136.25f, +599.75f, 129.578f, 600.68f, 126.246f, 597.75f, 126.242f, 597.75f, 125.617f, 592.758f, 124.25f, +592.746f, 124.25f, 592.746f, 120.777f, 591, 123.25f, 586.75f, 123.25f, 586.75f, 121.656f, +583.52f, 121.246f, 581.746f, 121.246f, 581.746f, 122.098f, 578.68f, 117.25f, 572.746f, 117.25f, +572.742f, 110.219f, 551.84f, 112.25f, 545.75f, 112.25f, 545.75f, 112.859f, 540.84f, 110.246f, +538.75f, 110.246f, 538.75f, 105.816f, 539.52f, 115.246f, 526.746f, 115.242f, 526.742f, 115.938f, +525, 112.25f, 522.746f, 112.25f, 522.746f, 93.5f, 518.398f, 91.25f, 500.746f, 91.25f, +500.746f, 75.8984f, 484.078f, 76.2461f, 478.746f, 75.8984f, 475.824f, 76.1953f, 472.359f, 77.2461f, +467.746f, 77.2461f, 467.746f, 76.3398f, 458.117f, 106.25f, 456.746f, 137.059f, 456.355f, 549.25f, +491.746f, 549.25f, 491.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, +0.15f, 18, 93.2461f, 466.746f, 65.3398f, 510.477f, 81.2461f, 448.75f, 81.2461f, 448.75f, +90.8594f, 410.598f, 233.246f, 451.746f, 233.246f, 451.746f, 233.246f, 451.742f, 419.098f, 485.398f, +431.246f, 489.746f, 443.738f, 494.199f, 548.246f, 486.746f, 548.246f, 486.746f, 542.246f, 505.75f, +471.02f, 556.68f, 449.898f, 531.156f, 435.246f, 535.746f, 419.98f, 539.957f, 422.621f, 529.398f, +419.246f, 528.746f, 415.578f, 527.637f, 372.461f, 554.918f, 365.246f, 553.75f, 358.379f, 553.156f, +330.504f, 579.285f, 347.25f, 544.746f, 364.539f, 506.957f, 282.699f, 501.238f, 264.246f, 513.746f, +245.738f, 525.879f, 272.25f, 493.746f, 272.25f, 493.746f, 292.379f, 471.316f, 254.246f, 489.746f, +254.246f, 489.746f, 216.699f, 503.879f, 190.297f, 475.719f, 187.246f, 474.75f, 183.258f, 473.957f, +177.977f, 470.438f, 177.246f, 477.746f, 176.219f, 484.52f, 167.957f, 502.891f, 133.246f, 473.746f, +111.098f, 455.695f, 96.25f, 479.75f, 96.25f, 479.75f, 93.2461f, 466.746f, 10, 0, +0.91f, 0.5f, 0.228f, 0.91f, 0.5f, 0.228f, 19, 367.246f, 551.75f, 359.82f, +551.238f, 331.914f, 577.352f, 348.25f, 542.75f, 366.641f, 503.719f, 284.141f, 499.316f, 265.246f, +511.746f, 247.18f, 523.957f, 273.25f, 491.746f, 273.25f, 491.746f, 293.82f, 469.398f, 256.246f, +487.75f, 256.246f, 487.75f, 218.137f, 501.957f, 191.738f, 473.797f, 188.246f, 472.75f, 184.699f, +472.039f, 179.418f, 468.516f, 178.246f, 475.746f, 177.656f, 482.598f, 169.543f, 500.785f, 134.25f, +471.746f, 111.18f, 452.957f, 96.25f, 476.75f, 96.25f, 476.75f, 93.2461f, 465.75f, 65.3164f, +509.219f, 82.2461f, 444.746f, 82.2461f, 444.746f, 91.5781f, 407.238f, 235.246f, 449.746f, 235.246f, +449.746f, 235.242f, 449.742f, 420.539f, 483.477f, 433.246f, 487.75f, 445.18f, 492.277f, 549.25f, +485.75f, 549.25f, 485.75f, 543.25f, 504.746f, 471.578f, 555.398f, 451.34f, 529.238f, 436.25f, +533.746f, 421.418f, 538.039f, 424.059f, 527.477f, 420.246f, 526.746f, 417.02f, 525.719f, 373.898f, +552.996f, 367.246f, 551.75f, 10, 0, 0.919f, 0.55f, 0.305f, 0.919f, 0.55f, +0.305f, 19, 368.246f, 549.75f, 361.258f, 549.316f, 334.051f, 575.75f, 350.25f, 540.75f, +367.641f, 500.695f, 285.578f, 497.398f, 267.246f, 509.75f, 248.617f, 522.035f, 275.246f, 489.746f, +275.246f, 489.746f, 295.258f, 467.477f, 257.246f, 485.75f, 257.246f, 485.75f, 219.578f, 500.035f, +193.18f, 471.875f, 189.246f, 470.75f, 186.137f, 470.117f, 180.859f, 466.598f, 180.246f, 473.746f, +179.098f, 480.676f, 171.125f, 498.68f, 136.25f, 469.746f, 111.258f, 450.215f, 97.25f, 472.75f, +97.25f, 472.75f, 93.2461f, 463.75f, 66.6172f, 506.637f, 82.2461f, 441.75f, 82.2461f, 441.75f, +92.2969f, 403.879f, 236.25f, 447.746f, 236.25f, 447.746f, 236.25f, 447.746f, 421.98f, 481.559f, +434.246f, 485.75f, 446.617f, 490.355f, 549.25f, 483.75f, 549.25f, 483.75f, 543.25f, 502.746f, +472.141f, 554.117f, 452.777f, 527.316f, 438.25f, 531.75f, 422.859f, 536.117f, 425.5f, 525.559f, +422.246f, 524.746f, 418.457f, 523.797f, 375.34f, 551.078f, 368.246f, 549.75f, 10, 0, +0.928f, 0.6f, 0.382f, 0.928f, 0.6f, 0.382f, 19, 369.25f, 548.746f, 362.699f, +547.398f, 335.496f, 573.832f, 351.25f, 538.75f, 369.738f, 497.285f, 286.43f, 495.867f, 268.246f, +507.75f, 250.059f, 520.117f, 276.246f, 487.75f, 276.246f, 487.75f, 296.699f, 465.559f, 259.25f, +483.75f, 259.25f, 483.75f, 221.02f, 498.117f, 194.617f, 469.957f, 191.246f, 468.75f, 187.578f, +468.199f, 182.301f, 464.676f, 181.25f, 471.746f, 180.539f, 478.758f, 172.711f, 496.574f, 137.246f, +467.746f, 111.336f, 447.477f, 97.25f, 469.746f, 97.25f, 469.746f, 93.2461f, 461.75f, 68.7969f, +502.516f, 83.2461f, 438.746f, 83.2461f, 438.746f, 93.0195f, 400.516f, 237.25f, 445.746f, 237.25f, +445.746f, 237.25f, 445.746f, 423.418f, 479.637f, 435.246f, 483.75f, 448.059f, 488.438f, 550.246f, +481.75f, 550.246f, 481.75f, 544.246f, 501.75f, 472.699f, 552.84f, 454.219f, 525.398f, 439.25f, +529.75f, 424.301f, 534.199f, 426.938f, 523.637f, 423.246f, 522.746f, 419.898f, 521.879f, 376.777f, +549.156f, 369.25f, 548.746f, 10, 0, 0.937f, 0.65f, 0.46f, 0.937f, 0.65f, +0.46f, 19, 371.25f, 546.746f, 364.141f, 545.477f, 337.492f, 572.156f, 352.25f, 536.75f, +371.18f, 493.559f, 288.457f, 493.559f, 270.25f, 505.75f, 251.5f, 518.195f, 278.246f, 485.75f, +278.246f, 485.75f, 298.141f, 463.637f, 260.25f, 481.75f, 260.25f, 481.75f, 222.457f, 496.195f, +196.059f, 468.035f, 192.25f, 466.746f, 189.02f, 466.277f, 183.738f, 462.758f, 183.25f, 469.746f, +181.98f, 476.836f, 174.297f, 494.473f, 139.246f, 466.746f, 111.418f, 444.738f, 97.25f, 466.746f, +97.25f, 466.746f, 93.2461f, 460.746f, 70.9766f, 498.617f, 84.25f, 434.746f, 84.25f, 434.746f, +93.7383f, 397.156f, 239.25f, 444.746f, 239.25f, 444.746f, 239.25f, 444.742f, 424.859f, 477.715f, +437.25f, 481.75f, 449.5f, 486.516f, 550.246f, 479.75f, 550.246f, 479.75f, 544.246f, 500.746f, +473.262f, 551.559f, 455.66f, 523.477f, 440.25f, 527.75f, 425.738f, 532.277f, 428.379f, 521.715f, +425.25f, 520.75f, 421.34f, 519.957f, 378.219f, 547.238f, 371.25f, 546.746f, 10, 0, +0.946f, 0.7f, 0.537f, 0.946f, 0.7f, 0.537f, 19, 372.25f, 544.746f, 365.578f, +543.559f, 337.02f, 569.352f, 354.246f, 534.75f, 375.258f, 492.078f, 289.898f, 491.637f, 271.25f, +503.75f, 252.938f, 516.277f, 279.246f, 483.75f, 279.246f, 483.75f, 299.578f, 461.719f, 261.25f, +479.75f, 261.25f, 479.75f, 223.898f, 494.277f, 197.5f, 466.117f, 194.25f, 464.746f, 190.457f, +464.355f, 185.18f, 460.836f, 184.25f, 467.746f, 183.418f, 474.918f, 175.879f, 492.367f, 140.25f, +464.746f, 111.5f, 441.996f, 98.2461f, 462.746f, 98.2461f, 462.746f, 92.2461f, 458.746f, 72.9375f, +495.156f, 85.25f, 431.746f, 85.25f, 431.746f, 94.457f, 393.797f, 240.25f, 442.746f, 240.25f, +442.746f, 240.25f, 442.742f, 426.301f, 475.797f, 438.25f, 479.75f, 450.941f, 484.598f, 551.25f, +477.746f, 551.25f, 477.746f, 545.25f, 498.75f, 473.82f, 550.277f, 457.102f, 521.559f, 442.246f, +525.75f, 427.18f, 530.355f, 429.82f, 519.797f, 426.25f, 518.75f, 422.781f, 518.039f, 379.66f, +545.316f, 372.25f, 544.746f, 10, 0, 0.955f, 0.75f, 0.614f, 0.955f, 0.75f, +0.614f, 19, 374.25f, 542.75f, 367.02f, 541.637f, 338.043f, 567.223f, 355.246f, 532.746f, +378.02f, 488.836f, 291.34f, 489.715f, 273.25f, 501.75f, 254.379f, 514.355f, 281.25f, 481.75f, +281.25f, 481.75f, 301.02f, 459.797f, 263.25f, 478.746f, 263.25f, 478.746f, 225.34f, 492.355f, +198.938f, 464.195f, 195.25f, 463.75f, 191.898f, 462.438f, 186.617f, 458.918f, 185.25f, 465.75f, +184.859f, 472.996f, 177.465f, 490.262f, 141.25f, 462.746f, 111.578f, 439.258f, 98.2461f, 459.75f, +98.2461f, 459.75f, 92.2461f, 456.746f, 75.1172f, 490.156f, 85.25f, 428.75f, 85.25f, 428.75f, +95.1797f, 390.438f, 242.246f, 440.746f, 242.246f, 440.746f, 242.246f, 440.742f, 427.738f, 473.875f, +440.25f, 478.746f, 452.379f, 482.676f, 551.25f, 475.746f, 551.25f, 475.746f, 545.25f, 497.746f, +474.379f, 548.996f, 458.539f, 519.637f, 443.246f, 523.75f, 428.621f, 528.438f, 431.258f, 517.875f, +427.25f, 516.75f, 424.219f, 516.117f, 381.102f, 543.398f, 374.25f, 542.75f, 10, 0, +0.964f, 0.8f, 0.691f, 0.964f, 0.8f, 0.691f, 19, 375.246f, 540.75f, 368.461f, +539.719f, 338.273f, 564.66f, 357.246f, 530.746f, 381.219f, 487.355f, 292.777f, 487.797f, 274.25f, +499.746f, 255.82f, 512.438f, 282.25f, 479.75f, 282.25f, 479.75f, 302.457f, 457.879f, 264.246f, +476.75f, 264.246f, 476.75f, 226.777f, 490.438f, 200.379f, 462.277f, 197.25f, 461.75f, 193.34f, +460.516f, 188.059f, 456.996f, 187.246f, 463.75f, 186.297f, 471.078f, 179.047f, 488.156f, 143.246f, +460.746f, 111.656f, 436.516f, 99.2461f, 456.746f, 99.2461f, 456.746f, 92.2461f, 454.75f, 76.8555f, +486.477f, 86.25f, 424.75f, 86.25f, 424.75f, 95.8984f, 387.074f, 243.246f, 438.746f, 243.246f, +438.746f, 243.246f, 438.742f, 429.18f, 471.957f, 441.246f, 476.75f, 453.82f, 480.758f, 552.25f, +474.75f, 552.25f, 474.75f, 546.246f, 496.75f, 474.941f, 547.719f, 459.98f, 517.719f, 445.246f, +521.746f, 430.059f, 526.516f, 432.699f, 515.957f, 429.25f, 514.75f, 425.66f, 514.195f, 382.539f, +541.477f, 375.246f, 540.75f, 10, 0, 0.973f, 0.85f, 0.769f, 0.973f, 0.85f, +0.769f, 19, 377.246f, 538.75f, 369.898f, 537.797f, 339.715f, 562.738f, 358.25f, 528.746f, +382.66f, 485.437f, 294.219f, 485.875f, 275.246f, 497.746f, 257.258f, 510.516f, 283.25f, 477.746f, +283.25f, 477.746f, 303.898f, 455.957f, 266.246f, 474.75f, 266.246f, 474.75f, 228.219f, 488.516f, +201.816f, 460.355f, 198.246f, 459.75f, 194.777f, 458.598f, 189.5f, 455.078f, 188.246f, 461.75f, +187.738f, 469.156f, 180.633f, 486.051f, 144.246f, 458.746f, 111.738f, 433.777f, 99.2461f, 452.75f, +99.2461f, 452.75f, 92.2461f, 453.746f, 77.7188f, 482.578f, 87.2461f, 421.75f, 87.2461f, 421.75f, +96.6172f, 383.715f, 245.246f, 436.746f, 245.246f, 436.746f, 245.246f, 436.746f, 430.621f, 470.035f, +443.246f, 474.75f, 455.258f, 478.836f, 552.25f, 472.75f, 552.25f, 472.75f, 547.25f, 495.746f, +475.5f, 546.438f, 461.418f, 515.797f, 446.246f, 519.746f, 431.5f, 524.598f, 434.141f, 514.035f, +430.246f, 512.75f, 427.098f, 512.277f, 383.98f, 539.555f, 377.246f, 538.75f, 10, 0, +0.982f, 0.9f, 0.846f, 0.982f, 0.9f, 0.846f, 19, 378.246f, 536.75f, 371.34f, +535.879f, 341.578f, 561.055f, 360.25f, 526.746f, 384.098f, 482.195f, 295.66f, 483.957f, 277.246f, +496.75f, 258.699f, 508.598f, 285.25f, 475.746f, 285.25f, 475.746f, 305.34f, 454.035f, 267.246f, +472.75f, 267.246f, 472.75f, 229.66f, 486.598f, 203.258f, 458.438f, 199.246f, 457.75f, 196.219f, +456.676f, 190.937f, 453.156f, 190.246f, 459.75f, 189.18f, 467.238f, 182.219f, 483.949f, 146.25f, +456.746f, 111.82f, 431.035f, 99.2461f, 449.746f, 99.2461f, 449.746f, 92.2461f, 451.746f, 78.3594f, +478.238f, 87.2461f, 417.75f, 87.2461f, 417.75f, 97.3399f, 380.355f, 246.246f, 434.746f, 246.246f, +434.746f, 246.242f, 434.746f, 432.059f, 468.117f, 444.246f, 472.75f, 456.699f, 476.918f, 553.246f, +470.75f, 553.246f, 470.75f, 547.25f, 493.746f, 476.059f, 545.156f, 462.859f, 513.879f, 448.25f, +518.75f, 432.938f, 522.676f, 435.578f, 512.117f, 432.246f, 510.746f, 428.539f, 510.355f, 385.418f, +537.637f, 378.246f, 536.75f, 10, 0, 0.991f, 0.95f, 0.923f, 0.991f, 0.95f, +0.923f, 19, 380.25f, 534.75f, 372.777f, 533.957f, 344.207f, 559.746f, 361.25f, 524.746f, +384.66f, 478.078f, 297.098f, 482.035f, 278.246f, 494.75f, 260.141f, 506.676f, 286.246f, 473.746f, +286.246f, 473.746f, 306.777f, 452.117f, 269.246f, 470.75f, 269.246f, 470.75f, 231.098f, 484.676f, +204.699f, 456.516f, 201.246f, 455.746f, 197.66f, 454.758f, 192.379f, 451.238f, 191.246f, 458.746f, +190.621f, 465.316f, 183.801f, 481.844f, 147.25f, 454.75f, 111.898f, 428.297f, 100.246f, 446.75f, +100.246f, 446.75f, 92.2461f, 449.746f, 78.5586f, 475.656f, 88.2461f, 414.746f, 88.2461f, 414.746f, +98.0586f, 376.996f, 248.25f, 432.75f, 248.25f, 432.75f, 248.25f, 432.75f, 433.5f, 466.195f, +446.246f, 470.75f, 458.141f, 474.996f, 553.246f, 468.75f, 553.246f, 468.75f, 548.246f, 492.75f, +476.621f, 543.879f, 464.301f, 511.957f, 449.25f, 516.75f, 434.379f, 520.758f, 437.02f, 510.195f, +433.246f, 509.75f, 429.98f, 508.438f, 386.859f, 535.719f, 380.25f, 534.75f, 10, 0, +1, 1, 1, 1, 1, 1, 18, 92.2461f, 448.75f, 78.5391f, +472.637f, 89.2461f, 411.746f, 89.2461f, 411.746f, 98.7773f, 373.637f, 249.25f, 430.75f, 249.25f, +430.75f, 249.25f, 430.75f, 434.938f, 464.277f, 447.25f, 468.75f, 459.578f, 473.078f, 553.246f, +466.746f, 553.246f, 466.746f, 548.246f, 491.746f, 477.18f, 542.598f, 465.738f, 510.039f, 451.25f, +514.75f, 435.82f, 518.84f, 438.461f, 508.277f, 435.246f, 507.75f, 431.418f, 506.52f, 388.301f, +533.797f, 381.25f, 532.746f, 374.219f, 532.039f, 346.477f, 558.227f, 363.25f, 522.746f, 387.23f, +470.762f, 295.941f, 481.848f, 280.246f, 492.75f, 261.578f, 504.758f, 288.246f, 471.746f, 288.246f, +471.746f, 308.219f, 450.195f, 270.25f, 468.75f, 270.25f, 468.75f, 232.539f, 482.758f, 206.137f, +454.598f, 202.246f, 453.746f, 199.098f, 452.836f, 193.816f, 449.316f, 193.25f, 456.746f, 192.059f, +463.398f, 185.387f, 479.738f, 149.246f, 452.75f, 111.977f, 425.559f, 100.246f, 442.746f, 100.246f, +442.746f, 92.2461f, 448.75f, 10, 0, 0, 0, 0, 0, 0, +0, 7, 138.246f, 415.75f, 138.246f, 415.75f, 130.457f, 402.676f, 153.246f, 387.746f, +153.242f, 387.742f, 154.879f, 386.617f, 135.25f, 390.746f, 135.25f, 390.746f, 128.258f, 393.438f, +126.246f, 404.75f, 126.242f, 404.75f, 121.219f, 409.719f, 116.246f, 415.75f, 110.656f, 422.035f, +138.246f, 415.75f, 138.246f, 415.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 8, 292.25f, 467.746f, 292.25f, 467.746f, 311.848f, 438.297f, 311.246f, +432.75f, 309.758f, 421.598f, 309.539f, 411.035f, 313.246f, 406.75f, 316.578f, 402.238f, 326.25f, +365.746f, 326.25f, 365.746f, 326.25f, 365.742f, 325.82f, 364.398f, 339.25f, 405.746f, 339.25f, +405.742f, 352.219f, 423.797f, 330.25f, 443.75f, 330.25f, 443.75f, 291.5f, 475.719f, 292.25f, +467.746f, 10, 0, 0, 0, 0, 0, 0, 0, 15, +160.246f, 385.746f, 160.246f, 385.742f, 172.699f, 378.035f, 157.25f, 343.746f, 164.246f, 346.746f, +164.242f, 346.746f, 163.02f, 334.035f, 159.246f, 331.75f, 167.25f, 334.75f, 167.25f, 334.75f, +172.699f, 326.117f, 168.25f, 320.75f, 168.25f, 320.75f, 186.777f, 312.035f, 186.25f, 304.746f, +186.25f, 304.746f, 192.938f, 313.797f, 188.246f, 320.75f, 184.137f, 327.879f, 176.219f, 323.477f, +177.246f, 343.746f, 167.25f, 339.746f, 167.25f, 339.742f, 173.578f, 349.879f, 173.25f, 356.75f, +165.246f, 354.746f, 165.242f, 354.742f, 181.793f, 383.512f, 170.246f, 384.75f, 163.457f, 385.957f, +160.246f, 385.746f, 160.246f, 385.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 5, 196.25f, 367.75f, 196.25f, 367.75f, 199.098f, 372.316f, 196.25f, +371.75f, 192.938f, 370.559f, 158.617f, 354.277f, 152.25f, 343.746f, 152.25f, 343.742f, 189.859f, +370.559f, 196.25f, 367.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 5, 207.25f, 358.75f, 207.25f, 358.75f, 210.539f, 363.516f, 207.25f, 362.75f, +204.379f, 361.758f, 170.059f, 345.477f, 163.25f, 334.75f, 163.25f, 334.75f, 201.297f, 361.758f, +207.25f, 358.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +5, 222.246f, 375.75f, 222.246f, 375.75f, 225.059f, 380.238f, 222.246f, 379.746f, 218.898f, +378.477f, 184.578f, 362.195f, 178.246f, 351.75f, 178.246f, 351.75f, 215.816f, 378.477f, 222.246f, +375.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, +196.25f, 327.75f, 196.25f, 327.75f, 196.457f, 334.035f, 193.25f, 332.746f, 190.297f, 332.277f, +150.699f, 312.918f, 144.246f, 302.746f, 144.246f, 302.746f, 190.297f, 330.516f, 196.25f, 327.75f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 198.246f, +339.746f, 198.246f, 339.742f, 199.098f, 344.598f, 196.25f, 343.746f, 193.816f, 343.719f, 164.777f, +330.957f, 158.25f, 320.75f, 158.25f, 320.75f, 190.738f, 344.156f, 198.246f, 339.746f, 10, +0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 24, 182.25f, 286.746f, +171.246f, 278.75f, 171.246f, 278.75f, 182.379f, 286.957f, 186.25f, 285.75f, 186.25f, 285.75f, +178.859f, 273.316f, 178.246f, 267.75f, 178.246f, 267.75f, 189.418f, 281.676f, 195.25f, 280.746f, +195.25f, 280.746f, 203.938f, 280.797f, 204.25f, 268.75f, 204.25f, 268.75f, 210.098f, 280.355f, +213.246f, 279.75f, 213.242f, 279.75f, 214.938f, 272.879f, 213.246f, 265.75f, 213.242f, 265.75f, +218.02f, 273.758f, 222.246f, 271.746f, 222.246f, 271.746f, 229.457f, 274.195f, 228.25f, 261.746f, +228.25f, 261.742f, 228.578f, 249.996f, 227.25f, 246.746f, 227.25f, 246.746f, 233.859f, 275.957f, +236.25f, 276.75f, 236.25f, 276.75f, 245.297f, 277.719f, 250.25f, 267.75f, 250.25f, 267.75f, +246.18f, 276.398f, 251.25f, 273.746f, 251.25f, 273.742f, 263.34f, 272.438f, 267.246f, 264.746f, +267.246f, 264.742f, 259.379f, 278.156f, 265.246f, 274.75f, 265.246f, 274.75f, 273.02f, 274.637f, +274.25f, 267.75f, 274.25f, 267.75f, 283.578f, 244.277f, 286.246f, 242.75f, 286.246f, 242.75f, +277.418f, 266.277f, 279.246f, 266.746f, 279.242f, 266.742f, 276.977f, 279.477f, 282.25f, 262.75f, +282.25f, 262.75f, 279.18f, 278.598f, 285.25f, 277.746f, 291.5f, 276.836f, 296.34f, 265.836f, +305.25f, 268.75f, 305.25f, 268.75f, 316.141f, 262.316f, 318.25f, 338.75f, 182.25f, 286.746f, +10, 0, 0, 0, 0, 0, 0, 0, 15, 187.246f, +388.75f, 187.246f, 388.75f, 203.5f, 395.637f, 247.246f, 388.75f, 247.242f, 388.75f, 255.418f, +388.598f, 263.25f, 398.746f, 270.379f, 407.957f, 299.859f, 415.879f, 307.25f, 413.75f, 317.25f, +406.75f, 318.25f, 405.746f, 318.25f, 405.742f, 331.98f, 393.879f, 332.246f, 385.746f, 332.859f, +377.156f, 316.578f, 324.355f, 306.25f, 306.746f, 295.457f, 289.156f, 284.898f, 275.516f, 264.246f, +277.746f, 264.246f, 277.742f, 240.898f, 282.559f, 212.246f, 277.746f, 212.246f, 277.742f, 180.617f, +279.918f, 177.246f, 288.746f, 174.457f, 297.516f, 190.246f, 313.746f, 190.246f, 313.746f, 190.246f, +313.746f, 194.699f, 323.477f, 193.25f, 339.746f, 192.059f, 355.156f, 192.5f, 385.957f, 187.246f, +388.75f, 10, 0, 0.9f, 0.4f, 0.55f, 0.9f, 0.4f, 0.55f, 8, +211.246f, 386.75f, 220.656f, 366.598f, 188.246f, 294.75f, 188.246f, 294.75f, 185.898f, 293.117f, +202.023f, 286.469f, 213.246f, 288.746f, 225.219f, 292.059f, 269.246f, 287.75f, 269.246f, 287.75f, +295.457f, 304.559f, 309.246f, 353.75f, 309.246f, 353.75f, 309.246f, 353.75f, 320.98f, 379.797f, +301.246f, 383.746f, 282.258f, 386.836f, 211.246f, 386.75f, 211.246f, 386.75f, 10, 0, +0.7f, 0.2f, 0.35f, 0.7f, 0.2f, 0.35f, 6, 209.246f, 352.746f, 212.844f, +366.922f, 214.586f, 379.902f, 211.246f, 386.75f, 211.246f, 386.75f, 280.059f, 379.797f, 292.25f, +402.75f, 297.043f, 411.34f, 313.277f, 377.598f, 313.246f, 366.75f, 313.242f, 366.75f, 243.539f, +351.195f, 227.25f, 363.746f, 209.246f, 352.746f, 10, 0, 0.65f, 0.15f, 0.3f, +0.65f, 0.15f, 0.3f, 13, 214.25f, 334.75f, 214.25f, 334.75f, 216.258f, 326.996f, +213.246f, 322.75f, 213.242f, 322.75f, 211.859f, 321.719f, 210.246f, 321.746f, 210.246f, 321.742f, +211.859f, 317.316f, 218.25f, 315.746f, 218.25f, 315.746f, 220.656f, 310.719f, 223.246f, 310.746f, +225.938f, 309.836f, 231.219f, 303.676f, 235.246f, 304.746f, 240.02f, 306.316f, 252.25f, 310.746f, +252.25f, 310.746f, 252.25f, 310.742f, 258.5f, 314.238f, 268.246f, 310.746f, 268.242f, 310.742f, +270.789f, 311.16f, 271.25f, 315.746f, 271.809f, 320.727f, 275.219f, 324.797f, 277.246f, 326.746f, +279.617f, 329.195f, 290.18f, 343.277f, 289.246f, 343.746f, 287.539f, 344.156f, 214.25f, 334.75f, +214.25f, 334.75f, 10, 0, 1, 0.45f, 0.5f, 1, 0.45f, 0.5f, +12, 209.246f, 387.746f, 209.246f, 387.742f, 206.137f, 363.516f, 209.246f, 354.746f, 213.18f, +345.035f, 212.297f, 342.836f, 211.246f, 338.75f, 210.539f, 334.035f, 215.379f, 323.035f, 221.246f, +316.75f, 234.246f, 314.75f, 234.246f, 314.75f, 251.457f, 318.637f, 261.25f, 315.746f, 261.25f, +315.746f, 271.473f, 314.078f, 275.246f, 330.746f, 275.246f, 330.742f, 280.5f, 337.559f, 288.246f, +340.75f, 296.34f, 343.719f, 304.258f, 389.477f, 300.246f, 398.746f, 295.457f, 407.078f, 279.617f, +411.918f, 262.25f, 394.746f, 244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 10, +1.1f, 0, 0, 0, 0, 0, 0, 12, 209.246f, 387.746f, +209.246f, 387.742f, 206.137f, 363.516f, 209.246f, 354.746f, 213.18f, 345.035f, 212.297f, 342.836f, +211.246f, 338.75f, 210.539f, 334.035f, 215.379f, 323.035f, 221.246f, 316.75f, 234.246f, 314.75f, +234.246f, 314.75f, 251.457f, 318.637f, 261.25f, 315.746f, 261.25f, 315.746f, 271.473f, 314.078f, +275.246f, 330.746f, 275.246f, 330.742f, 280.5f, 337.559f, 288.246f, 340.75f, 296.34f, 343.719f, +304.258f, 389.477f, 300.246f, 398.746f, 295.457f, 407.078f, 279.617f, 411.918f, 262.25f, 394.746f, +244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 10, 0, 1, 1, +0.8f, 1, 1, 0.8f, 7, 211.246f, 305.75f, 211.246f, 305.75f, 210.098f, +308.078f, 205.25f, 308.746f, 205.25f, 308.742f, 180.617f, 312.477f, 171.246f, 325.75f, 171.246f, +325.75f, 163.898f, 332.277f, 168.25f, 319.746f, 168.25f, 319.742f, 180.18f, 297.078f, 187.246f, +293.746f, 187.246f, 293.746f, 205.699f, 289.598f, 211.246f, 305.75f, 10, 0.55f, 0, +0, 0, 0, 0, 0, 7, 211.246f, 305.75f, 211.246f, 305.75f, +210.098f, 308.078f, 205.25f, 308.746f, 205.25f, 308.742f, 180.617f, 312.477f, 171.246f, 325.75f, +171.246f, 325.75f, 163.898f, 332.277f, 168.25f, 319.746f, 168.25f, 319.742f, 180.18f, 297.078f, +187.246f, 293.746f, 187.246f, 293.746f, 205.699f, 289.598f, 211.246f, 305.75f, 10, 0, +0.8f, 0.25f, 0.3f, 0.8f, 0.25f, 0.3f, 9, 299.246f, 375.75f, 299.641f, +384.941f, 301.789f, 394.418f, 300.246f, 398.746f, 292.766f, 412.461f, 274.098f, 406.535f, 262.25f, +394.746f, 244.418f, 377.598f, 242.219f, 396.078f, 209.246f, 387.746f, 209.246f, 387.742f, 207.297f, +372.797f, 208.25f, 361.746f, 208.25f, 361.742f, 249.258f, 374.516f, 250.25f, 368.746f, 250.25f, +368.746f, 251.898f, 371.879f, 262.25f, 371.75f, 272.137f, 371.879f, 297.152f, 373.168f, 299.246f, +375.75f, 10, 2.2f, 0.65f, 0.1f, 0.15f, 0.65f, 0.1f, 0.15f, 3, +251.25f, 387.746f, 251.25f, 387.742f, 256.738f, 381.996f, 253.246f, 371.75f, 253.246f, 371.75f, +236.938f, 353.836f, 239.25f, 338.75f, 10, 0, 1, 1, 0.8f, 1, +1, 0.8f, 5, 198.246f, 293.746f, 198.246f, 293.746f, 193.816f, 308.078f, 203.25f, +300.75f, 203.25f, 300.75f, 208.777f, 298.398f, 207.25f, 296.75f, 206.137f, 294.879f, 199.977f, +290.477f, 198.246f, 293.746f, 10, 0.55f, 0, 0, 0, 0, 0, +0, 5, 198.246f, 293.746f, 198.246f, 293.746f, 193.816f, 308.078f, 203.25f, 300.75f, +203.25f, 300.75f, 208.777f, 298.398f, 207.25f, 296.75f, 206.137f, 294.879f, 199.977f, 290.477f, +198.246f, 293.746f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, +5, 204.25f, 292.75f, 204.25f, 292.75f, 200.328f, 303.941f, 208.25f, 297.746f, 208.25f, +297.742f, 212.937f, 295.266f, 211.246f, 294.75f, 206.227f, 293.383f, 211.242f, 290.566f, 204.25f, +292.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 5, +204.25f, 292.75f, 204.25f, 292.75f, 200.328f, 303.941f, 208.25f, 297.746f, 208.25f, 297.742f, +212.937f, 295.266f, 211.246f, 294.75f, 206.227f, 293.383f, 211.242f, 290.566f, 204.25f, 292.75f, +10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 5, 209.246f, +292.75f, 209.246f, 292.75f, 205.609f, 303.941f, 213.246f, 297.746f, 213.242f, 297.742f, 218.168f, +295.414f, 216.25f, 294.75f, 212.824f, 293.383f, 216.523f, 290.566f, 209.246f, 292.75f, 10, +0.55f, 0, 0, 0, 0, 0, 0, 5, 209.246f, 292.75f, +209.246f, 292.75f, 205.609f, 303.941f, 213.246f, 297.746f, 213.242f, 297.742f, 218.168f, 295.414f, +216.25f, 294.75f, 212.824f, 293.383f, 216.523f, 290.566f, 209.246f, 292.75f, 10, 0, +1, 1, 0.8f, 1, 1, 0.8f, 5, 216.25f, 292.75f, 216.25f, +292.75f, 212.871f, 303.723f, 220.246f, 297.746f, 220.246f, 297.742f, 225.434f, 295.172f, 224.246f, +294.75f, 220.527f, 293.383f, 223.781f, 290.344f, 216.25f, 292.75f, 10, 0.55f, 0, +0, 0, 0, 0, 0, 5, 216.25f, 292.75f, 216.25f, 292.75f, +212.871f, 303.723f, 220.246f, 297.746f, 220.246f, 297.742f, 225.434f, 295.172f, 224.246f, 294.75f, +220.527f, 293.383f, 223.781f, 290.344f, 216.25f, 292.75f, 10, 0, 1, 1, +0.8f, 1, 1, 0.8f, 5, 224.246f, 292.75f, 224.242f, 292.75f, 220, +303.809f, 227.25f, 297.746f, 227.25f, 297.742f, 231.969f, 296.066f, 231.246f, 294.75f, 229.855f, +293.25f, 230.91f, 290.434f, 224.246f, 292.75f, 10, 0.55f, 0, 0, 0, +0, 0, 0, 5, 224.246f, 292.75f, 224.242f, 292.75f, 220, 303.809f, +227.25f, 297.746f, 227.25f, 297.742f, 231.969f, 296.066f, 231.246f, 294.75f, 229.855f, 293.25f, +230.91f, 290.434f, 224.246f, 292.75f, 10, 0, 1, 1, 0.8f, 1, +1, 0.8f, 5, 231.246f, 291.746f, 231.246f, 291.746f, 225.938f, 305.438f, 236.25f, +298.75f, 236.25f, 298.75f, 241.34f, 296.195f, 240.25f, 294.75f, 238.699f, 292.676f, 240.02f, +289.156f, 231.246f, 291.746f, 10, 0.55f, 0, 0, 0, 0, 0, +0, 5, 231.246f, 291.746f, 231.246f, 291.746f, 225.938f, 305.438f, 236.25f, 298.75f, +236.25f, 298.75f, 241.34f, 296.195f, 240.25f, 294.75f, 238.699f, 292.676f, 240.02f, 289.156f, +231.246f, 291.746f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, +4, 200.246f, 310.746f, 200.246f, 310.742f, 214.5f, 313.797f, 221.246f, 310.746f, 221.246f, +310.742f, 227.699f, 308.957f, 229.25f, 309.75f, 230.34f, 309.836f, 234.246f, 310.746f, 234.246f, +310.746f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, 4, +237.25f, 300.75f, 237.25f, 300.75f, 250.578f, 315.996f, 264.246f, 310.746f, 271.496f, 308.328f, +270.379f, 312.035f, 271.25f, 314.75f, 272.137f, 318.195f, 272.359f, 322.816f, 278.246f, 325.75f, +10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 7, 256.246f, +318.75f, 256.246f, 318.75f, 251.898f, 330.516f, 249.25f, 316.75f, 245.738f, 302.355f, 242.219f, +298.398f, 240.25f, 295.746f, 240.25f, 295.742f, 240.457f, 289.598f, 249.25f, 289.75f, 249.25f, +289.75f, 261.578f, 290.477f, 262.25f, 293.746f, 262.457f, 296.637f, 260.699f, 309.398f, 256.246f, +318.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 7, +256.246f, 318.75f, 256.246f, 318.75f, 251.898f, 330.516f, 249.25f, 316.75f, 245.738f, 302.355f, +242.219f, 298.398f, 240.25f, 295.746f, 240.25f, 295.742f, 240.457f, 289.598f, 249.25f, 289.75f, +249.25f, 289.75f, 261.578f, 290.477f, 262.25f, 293.746f, 262.457f, 296.637f, 260.699f, 309.398f, +256.246f, 318.75f, 10, 2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, +2, 271.25f, 310.746f, 271.25f, 310.742f, 275.656f, 313.355f, 278.246f, 311.75f, 10, +2.2f, 0.65f, 0.15f, 0.3f, 0.65f, 0.15f, 0.3f, 2, 279.246f, 328.746f, +279.242f, 328.742f, 282.039f, 334.148f, 287.246f, 334.75f, 10, 0, 0.7f, 0.7f, +0.7f, 0.7f, 0.7f, 0.7f, 6, 191.246f, 288.746f, 191.242f, 288.742f, 211.418f, +284.758f, 216.25f, 286.746f, 216.25f, 286.742f, 225.938f, 286.516f, 216.25f, 284.746f, 216.25f, +284.742f, 202.617f, 284.316f, 194.25f, 285.75f, 194.25f, 285.75f, 181.059f, 291.797f, 191.246f, +288.746f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 7, +207.25f, 390.746f, 207.25f, 390.746f, 226.379f, 390.797f, 228.25f, 389.75f, 228.25f, 389.75f, +236.5f, 356.035f, 232.246f, 347.75f, 232.246f, 347.75f, 231.219f, 344.598f, 228.25f, 350.746f, +228.25f, 350.742f, 207.898f, 386.836f, 204.25f, 388.75f, 200.859f, 391.238f, 205.699f, 390.797f, +207.25f, 390.746f, 10, 0.55f, 0, 0, 0, 0, 0, 0, +7, 207.25f, 390.746f, 207.25f, 390.746f, 226.379f, 390.797f, 228.25f, 389.75f, 228.25f, +389.75f, 236.5f, 356.035f, 232.246f, 347.75f, 232.246f, 347.75f, 231.219f, 344.598f, 228.25f, +350.746f, 228.25f, 350.742f, 207.898f, 386.836f, 204.25f, 388.75f, 200.859f, 391.238f, 205.699f, +390.797f, 207.25f, 390.746f, 10, 0, 1, 1, 0.8f, 1, 1, +0.8f, 7, 122.246f, 393.75f, 122.246f, 393.75f, 132, 391.898f, 146.25f, 388.75f, +146.25f, 388.75f, 151.137f, 364.398f, 154.246f, 358.75f, 158.18f, 353.836f, 154.219f, 353.836f, +150.246f, 356.75f, 146.297f, 359.996f, 130.02f, 375.398f, 128.25f, 379.746f, 125.617f, 385.078f, +122.246f, 393.75f, 122.246f, 393.75f, 10, 0.55f, 0, 0, 0, 0, +0, 0, 7, 122.246f, 393.75f, 122.246f, 393.75f, 132, 391.898f, 146.25f, +388.75f, 146.25f, 388.75f, 151.137f, 364.398f, 154.246f, 358.75f, 158.18f, 353.836f, 154.219f, +353.836f, 150.246f, 356.75f, 146.297f, 359.996f, 130.02f, 375.398f, 128.25f, 379.746f, 125.617f, +385.078f, 122.246f, 393.75f, 122.246f, 393.75f, 10, 0, 1, 1, 0.8f, +1, 1, 0.8f, 6, 146.25f, 388.75f, 146.25f, 388.75f, 152.637f, 387.094f, +153.246f, 384.75f, 154.855f, 382.223f, 152.25f, 378.75f, 152.25f, 378.75f, 152.25f, 378.75f, +151.324f, 374.961f, 150.246f, 377.75f, 148.68f, 379.719f, 145.52f, 388.145f, 146.25f, 388.75f, +10, 0.55f, 0, 0, 0, 0, 0, 0, 6, 146.25f, +388.75f, 146.25f, 388.75f, 152.637f, 387.094f, 153.246f, 384.75f, 154.855f, 382.223f, 152.25f, +378.75f, 152.25f, 378.75f, 152.25f, 378.75f, 151.324f, 374.961f, 150.246f, 377.75f, 148.68f, +379.719f, 145.52f, 388.145f, 146.25f, 388.75f, 10, 0, 0, 0, 0, +0, 0, 0, 10, 146.25f, 388.75f, 146.25f, 388.75f, 150.258f, 383.316f, +154.246f, 383.746f, 158.18f, 383.316f, 158.598f, 383.77f, 161.246f, 382.75f, 166.758f, 381.996f, +166.316f, 384.195f, 173.25f, 382.75f, 176.48f, 382.348f, 179.297f, 383.316f, 182.25f, 381.746f, +185.457f, 380.676f, 188.977f, 381.559f, 190.246f, 383.746f, 191.617f, 385.957f, 197.25f, 390.746f, +197.25f, 390.746f, 197.25f, 390.746f, 182.816f, 388.598f, 179.246f, 387.746f, 179.246f, 387.742f, +155.098f, 386.398f, 146.25f, 388.75f, 10, 0, 1, 1, 0.8f, 1, +1, 0.8f, 6, 195.25f, 388.75f, 195.25f, 388.75f, 188.262f, 384.969f, 188.246f, +382.75f, 187.383f, 379.688f, 193.25f, 375.75f, 193.25f, 375.75f, 193.25f, 375.75f, 196.625f, +370.559f, 197.25f, 372.746f, 197.941f, 375.836f, 196.238f, 388.379f, 195.25f, 388.75f, 10, +0.55f, 0, 0, 0, 0, 0, 0, 6, 195.25f, 388.75f, +195.25f, 388.75f, 188.262f, 384.969f, 188.246f, 382.75f, 187.383f, 379.688f, 193.25f, 375.75f, +193.25f, 375.75f, 193.25f, 375.75f, 196.625f, 370.559f, 197.25f, 372.746f, 197.941f, 375.836f, +196.238f, 388.379f, 195.25f, 388.75f, 10, 0, 1, 1, 0.8f, 1, +1, 0.8f, 5, 154.246f, 382.75f, 154.242f, 382.75f, 161.832f, 370.5f, 162.25f, +382.75f, 162.25f, 382.75f, 162.684f, 384.215f, 160.246f, 383.746f, 154.066f, 384.324f, 155.738f, +388.836f, 154.246f, 382.75f, 10, 0.55f, 0, 0, 0, 0, 0, +0, 5, 154.246f, 382.75f, 154.242f, 382.75f, 161.832f, 370.5f, 162.25f, 382.75f, +162.25f, 382.75f, 162.684f, 384.215f, 160.246f, 383.746f, 154.066f, 384.324f, 155.738f, 388.836f, +154.246f, 382.75f, 10, 0, 1, 1, 0.8f, 1, 1, 0.8f, +5, 162.25f, 382.75f, 162.25f, 382.75f, 170.734f, 370.227f, 170.246f, 382.75f, 170.242f, +382.75f, 170.043f, 383, 168.25f, 382.75f, 162.891f, 383.625f, 163.27f, 388.594f, 162.25f, +382.75f, 10, 0.55f, 0, 0, 0, 0, 0, 0, 5, +162.25f, 382.75f, 162.25f, 382.75f, 170.734f, 370.227f, 170.246f, 382.75f, 170.242f, 382.75f, +170.043f, 383, 168.25f, 382.75f, 162.891f, 383.625f, 163.27f, 388.594f, 162.25f, 382.75f, +10, 0, 1, 1, 0.8f, 1, 1, 0.8f, 5, 170.246f, +382.75f, 170.242f, 382.75f, 178.711f, 370.832f, 178.246f, 381.746f, 178.246f, 381.746f, 178.105f, +382.82f, 176.246f, 382.75f, 172.004f, 383.93f, 171.773f, 387.504f, 170.246f, 382.75f, 10, +0.55f, 0, 0, 0, 0, 0, 0, 5, 170.246f, 382.75f, +170.242f, 382.75f, 178.711f, 370.832f, 178.246f, 381.746f, 178.246f, 381.746f, 178.105f, 382.82f, +176.246f, 382.75f, 172.004f, 383.93f, 171.773f, 387.504f, 170.246f, 382.75f, 10, 0, +1, 1, 0.8f, 1, 1, 0.8f, 5, 177.246f, 382.75f, 177.246f, +382.75f, 186.207f, 369.719f, 186.25f, 380.75f, 186.25f, 380.75f, 188.398f, 381.992f, 186.25f, +381.746f, 180.078f, 383.051f, 180.957f, 387.953f, 177.246f, 382.75f, 10, 0.55f, 0, +0, 0, 0, 0, 0, 5, 177.246f, 382.75f, 177.246f, 382.75f, +186.207f, 369.719f, 186.25f, 380.75f, 186.25f, 380.75f, 188.398f, 381.992f, 186.25f, 381.746f, +180.078f, 383.051f, 180.957f, 387.953f, 177.246f, 382.75f, 10, 0, 0.9f, 0.9f, +0.7f, 0.9f, 0.9f, 0.7f, 6, 137.246f, 378.75f, 129.25f, 379.746f, 126.441f, +385.738f, 124.25f, 392.746f, 124.25f, 392.746f, 124.25f, 392.746f, 131.117f, 391.402f, 145.25f, +388.75f, 145.25f, 388.75f, 145.832f, 384.672f, 147.25f, 378.75f, 137.246f, 378.75f, 10, +0, 0.9f, 0.9f, 0.7f, 0.9f, 0.9f, 0.7f, 7, 209.246f, 383.746f, +207.469f, 386.437f, 206.02f, 388.371f, 205.25f, 388.75f, 201.992f, 390.891f, 206.547f, 390.477f, +208.25f, 390.746f, 208.25f, 390.746f, 226.02f, 390.477f, 228.25f, 389.75f, 228.25f, 389.75f, +228.668f, 387.18f, 229.25f, 383.746f, 229.25f, 383.742f, 218.32f, 385.66f, 209.246f, 383.746f, +10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 10, 268.246f, +535.746f, 298.758f, 531.289f, 326.832f, 570.492f, 329.25f, 580.75f, 330.703f, 591.789f, 319.25f, +604.75f, 319.25f, 604.75f, 321.023f, 608.246f, 315.699f, 623.734f, 310.246f, 633.75f, 304.082f, +644.063f, 286.594f, 642.992f, 267.246f, 643.75f, 249.875f, 645.031f, 229.547f, 619.379f, 228.25f, +617.75f, 226.641f, 615.508f, 233.418f, 573.398f, 235.246f, 566.75f, 236.32f, 560.813f, 233.246f, +531.75f, 233.246f, 531.75f, 271.082f, 541.781f, 237.773f, 540, 268.246f, 535.746f, 10, +0, 0.92f, 0.56f, 0.32f, 0.92f, 0.56f, 0.32f, 10, 229.25f, 616.746f, +227.469f, 614.828f, 234.121f, 573.484f, 235.246f, 567.75f, 236.973f, 561.129f, 234.246f, 532.746f, +234.246f, 532.746f, 270.063f, 542.387f, 238.398f, 540.695f, 268.246f, 536.75f, 298.273f, 532.141f, +325.836f, 570.633f, 327.25f, 580.75f, 329.637f, 591.543f, 318.25f, 604.75f, 318.25f, 604.75f, +320.133f, 607.699f, 314.906f, 622.906f, 309.246f, 632.75f, 303.504f, 642.867f, 286.332f, 641.813f, +267.246f, 642.746f, 250.277f, 643.816f, 230.32f, 618.629f, 229.25f, 616.746f, 10, 0, +0.94f, 0.67f, 0.49f, 0.94f, 0.67f, 0.49f, 10, 229.25f, 615.75f, 228.297f, +614.152f, 234.824f, 573.574f, 236.25f, 567.75f, 237.625f, 561.445f, 235.246f, 533.746f, 235.246f, +533.746f, 269.371f, 543.539f, 239.023f, 541.391f, 268.246f, 536.75f, 297.793f, 532.996f, 324.844f, +570.773f, 326.25f, 580.75f, 328.574f, 591.297f, 318.25f, 603.746f, 318.25f, 603.746f, 319.246f, +607.156f, 314.113f, 622.078f, 308.246f, 631.746f, 302.922f, 641.668f, 286.066f, 640.637f, 267.246f, +641.75f, 250.684f, 642.602f, 231.094f, 617.883f, 229.25f, 615.75f, 10, 0, 0.96f, +0.78f, 0.66f, 0.96f, 0.78f, 0.66f, 10, 230.25f, 615.75f, 229.125f, 613.473f, +235.531f, 573.66f, 237.25f, 567.75f, 238.277f, 561.762f, 235.246f, 534.75f, 235.246f, 534.75f, +267.91f, 544.25f, 239.648f, 542.086f, 268.246f, 537.746f, 297.309f, 533.852f, 323.848f, 570.914f, +325.25f, 580.75f, 327.508f, 591.051f, 317.25f, 603.746f, 317.25f, 603.746f, 318.355f, 606.609f, +313.324f, 621.254f, 308.246f, 630.75f, 302.34f, 640.473f, 285.805f, 639.457f, 267.246f, 640.746f, +251.09f, 641.387f, 231.871f, 617.133f, 230.25f, 615.75f, 10, 0, 0.98f, 0.89f, +0.83f, 0.98f, 0.89f, 0.83f, 10, 231.246f, 614.746f, 229.949f, 612.797f, 236.234f, +573.75f, 237.25f, 567.75f, 238.926f, 562.082f, 236.25f, 534.75f, 236.25f, 534.75f, 266.891f, +544.965f, 240.273f, 542.781f, 268.246f, 538.75f, 296.824f, 534.703f, 322.855f, 571.055f, 324.246f, +580.75f, 326.445f, 590.805f, 316.25f, 602.75f, 316.25f, 602.75f, 317.469f, 606.063f, 312.531f, +620.426f, 307.25f, 629.746f, 301.762f, 639.273f, 285.543f, 638.281f, 267.246f, 639.75f, 251.492f, +640.172f, 232.645f, 616.387f, 231.246f, 614.746f, 10, 0, 1, 1, 1, +1, 1, 1, 10, 268.246f, 539.746f, 296.34f, 535.559f, 321.859f, 571.199f, +323.246f, 580.75f, 325.379f, 590.559f, 315.25f, 602.75f, 315.25f, 602.75f, 316.578f, 605.52f, +311.738f, 619.598f, 306.25f, 628.75f, 301.18f, 638.078f, 285.277f, 637.102f, 267.246f, 637.75f, +251.898f, 638.957f, 233.418f, 615.637f, 232.246f, 613.75f, 230.777f, 612.117f, 236.938f, 573.84f, +238.25f, 567.75f, 239.578f, 562.398f, 237.25f, 535.746f, 237.25f, 535.746f, 264.988f, 545.457f, +240.898f, 543.477f, 268.246f, 539.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 6, 319.25f, 576.746f, 319.25f, 576.742f, 289.078f, 568.559f, 276.246f, +570.746f, 276.246f, 570.746f, 258.937f, 577.578f, 249.25f, 553.75f, 249.25f, 553.75f, 245.297f, +545.68f, 243.246f, 543.746f, 240.898f, 541.277f, 319.25f, 576.746f, 319.25f, 576.746f, 10, +0, 0, 0, 0, 0, 0, 0, 11, 324.246f, 579.746f, +324.242f, 579.746f, 291.937f, 565.918f, 281.25f, 566.75f, 281.25f, 566.75f, 262.898f, 571.418f, +253.246f, 555.75f, 253.246f, 555.75f, 244.418f, 545.238f, 241.25f, 543.746f, 241.25f, 543.742f, +240.457f, 541.719f, 247.246f, 545.75f, 259.25f, 540.75f, 259.25f, 540.75f, 275.219f, 529.84f, +286.246f, 547.75f, 286.246f, 547.75f, 290.18f, 559.758f, 290.246f, 561.746f, 290.18f, 564.156f, +313.5f, 570.316f, 315.25f, 570.746f, 317.02f, 571.199f, 324.277f, 575.816f, 324.246f, 579.746f, +10, 0, 0.6f, 0.8f, 0.2f, 0.6f, 0.8f, 0.2f, 6, 271.25f, +539.746f, 264.141f, 539.832f, 254.93f, 544.086f, 255.246f, 550.746f, 254.93f, 557.832f, 264.141f, +564.723f, 271.25f, 564.75f, 279.258f, 564.723f, 285.387f, 559.152f, 285.25f, 552.746f, 285.387f, +545.402f, 279.258f, 539.832f, 271.25f, 539.746f, 10, 0, 0.4f, 0.6f, 0, +0.4f, 0.6f, 0, 6, 267.246f, 557.746f, 262.383f, 557.391f, 256.785f, 555.738f, +257.246f, 555.75f, 258.559f, 561.055f, 265.555f, 564.723f, 271.25f, 564.75f, 276.422f, 564.723f, +280.59f, 562.547f, 283.25f, 558.75f, 283.25f, 558.75f, 277.203f, 559.598f, 267.246f, 557.746f, +10, 0, 1, 1, 1, 1, 1, 1, 4, 281.25f, +558.75f, 281.25f, 558.75f, 276.098f, 561.957f, 276.246f, 559.746f, 276.246f, 559.746f, 280.059f, +554.699f, 281.25f, 558.75f, 10, 0, 0, 0, 0, 0, 0, +0, 6, 270.25f, 549.75f, 267.187f, 549.5f, 264.961f, 551.727f, 265.246f, 554.746f, +264.961f, 557.227f, 267.187f, 559.457f, 270.25f, 559.746f, 272.687f, 559.457f, 274.918f, 557.227f, +275.246f, 554.746f, 274.918f, 551.727f, 272.687f, 549.5f, 270.25f, 549.75f, 10, 0, +0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 15, 155.246f, 563.746f, 155.246f, +563.742f, 152.02f, 587.477f, 154.246f, 592.746f, 154.242f, 592.746f, 166.539f, 603.316f, 166.246f, +607.746f, 166.246f, 607.742f, 165.656f, 627.078f, 164.246f, 627.746f, 163.02f, 628.84f, 154.656f, +635.438f, 148.246f, 628.75f, 148.242f, 628.75f, 136.617f, 608.598f, 137.246f, 601.746f, 137.246f, +599.75f, 137.242f, 599.75f, 129.137f, 599.797f, 127.246f, 597.75f, 127.246f, 597.75f, 126.059f, +591.879f, 124.25f, 591.75f, 124.25f, 591.75f, 121.656f, 588.797f, 124.25f, 585.746f, 124.25f, +585.742f, 121.656f, 583.078f, 122.246f, 578.75f, 130.25f, 574.746f, 130.25f, 574.742f, 132.656f, +558.438f, 144.246f, 552.746f, 149.859f, 550.156f, 153.34f, 557.559f, 155.246f, 563.746f, 10, +0, 1, 1, 1, 1, 1, 1, 15, 154.246f, 565.746f, +154.242f, 565.742f, 151.27f, 587.172f, 153.246f, 591.75f, 153.242f, 591.75f, 164.34f, 601.426f, +164.246f, 604.75f, 164.242f, 604.75f, 163.547f, 622.809f, 162.25f, 623.746f, 161.172f, 624.395f, +153.645f, 630.336f, 147.25f, 623.746f, 147.25f, 623.746f, 137.41f, 606.18f, 138.246f, 599.75f, +138.246f, 597.75f, 138.246f, 597.75f, 130.68f, 598.258f, 129.25f, 596.746f, 129.25f, 596.742f, +127.906f, 591.129f, 126.246f, 590.746f, 126.242f, 590.746f, 123.945f, 588.359f, 126.246f, 585.746f, +126.242f, 585.742f, 123.945f, 583.211f, 124.25f, 579.746f, 132.246f, 575.75f, 132.246f, 575.75f, +133.848f, 561.035f, 144.246f, 555.75f, 149.324f, 553.582f, 152.457f, 560.242f, 154.246f, 565.746f, +10, 0, 0.925f, 0.588f, 0.363f, 0.925f, 0.588f, 0.363f, 15, 164.246f, +626.75f, 162.645f, 627.816f, 154.406f, 634.16f, 148.246f, 627.746f, 148.242f, 627.742f, 136.816f, +607.992f, 137.246f, 600.75f, 137.246f, 598.746f, 137.242f, 598.742f, 129.523f, 599.414f, 128.25f, +597.75f, 128.25f, 597.75f, 126.52f, 591.691f, 125.25f, 591.75f, 125.25f, 591.75f, 122.23f, +588.688f, 124.25f, 585.746f, 124.25f, 585.742f, 122.23f, 583.109f, 122.246f, 578.75f, 131.246f, +574.746f, 131.242f, 574.742f, 132.953f, 559.086f, 144.246f, 553.75f, 149.723f, 551.012f, 153.117f, +558.23f, 155.246f, 564.75f, 155.246f, 564.75f, 151.832f, 587.402f, 154.246f, 591.75f, 154.242f, +591.75f, 165.988f, 602.844f, 165.246f, 606.75f, 165.242f, 606.75f, 165.129f, 626.012f, 164.246f, +626.75f, 10, 0, 0.95f, 0.725f, 0.575f, 0.95f, 0.725f, 0.575f, 15, +163.25f, 625.746f, 162.27f, 626.793f, 154.152f, 632.887f, 148.246f, 625.746f, 148.242f, 625.746f, +137.016f, 607.387f, 138.246f, 600.75f, 138.246f, 598.746f, 138.246f, 598.742f, 129.906f, 599.027f, +128.25f, 596.746f, 128.25f, 596.742f, 126.98f, 591.504f, 125.25f, 590.746f, 125.25f, 590.746f, +122.801f, 588.578f, 125.25f, 585.746f, 125.25f, 585.742f, 122.801f, 583.145f, 123.25f, 578.75f, +131.246f, 574.746f, 131.242f, 574.742f, 133.254f, 559.734f, 144.246f, 554.746f, 149.59f, 551.867f, +152.898f, 558.898f, 155.246f, 564.75f, 155.246f, 564.75f, 151.645f, 587.324f, 154.246f, 591.75f, +154.242f, 591.75f, 165.438f, 602.371f, 165.246f, 605.746f, 165.242f, 605.742f, 164.602f, 624.945f, +163.25f, 625.746f, 10, 0, 0.975f, 0.863f, 0.788f, 0.975f, 0.863f, 0.788f, +15, 163.25f, 624.75f, 161.895f, 625.77f, 153.898f, 631.609f, 148.246f, 624.75f, 148.242f, +624.75f, 137.211f, 606.781f, 138.246f, 600.75f, 138.246f, 597.75f, 138.246f, 597.75f, 130.293f, +598.645f, 128.25f, 596.746f, 128.25f, 596.742f, 127.445f, 591.316f, 126.246f, 590.746f, 126.242f, +590.746f, 123.375f, 588.469f, 125.25f, 585.746f, 125.25f, 585.742f, 123.375f, 583.176f, 124.25f, +578.75f, 131.246f, 574.746f, 131.242f, 574.742f, 133.551f, 560.387f, 144.246f, 554.746f, 149.457f, +552.727f, 152.68f, 559.57f, 154.246f, 565.746f, 154.242f, 565.742f, 151.457f, 587.246f, 154.246f, +591.75f, 154.242f, 591.75f, 164.887f, 601.898f, 164.246f, 605.746f, 164.242f, 605.742f, 164.074f, +623.879f, 163.25f, 624.75f, 10, 0, 1, 1, 1, 1, 1, +1, 15, 154.246f, 566.75f, 154.242f, 566.75f, 151.27f, 587.172f, 153.246f, 591.75f, +153.242f, 591.75f, 164.34f, 601.426f, 164.246f, 604.75f, 164.242f, 604.75f, 163.547f, 622.809f, +162.25f, 623.746f, 161.523f, 624.746f, 153.645f, 630.336f, 147.25f, 623.746f, 147.25f, 623.746f, +137.41f, 606.18f, 138.246f, 599.75f, 138.246f, 597.75f, 138.246f, 597.75f, 130.68f, 598.258f, +129.25f, 596.746f, 129.25f, 596.742f, 127.906f, 591.129f, 126.246f, 590.746f, 126.242f, 590.746f, +123.945f, 588.359f, 126.246f, 585.746f, 126.242f, 585.742f, 123.945f, 583.211f, 124.25f, 579.746f, +132.246f, 575.75f, 132.246f, 575.75f, 133.848f, 561.035f, 144.246f, 555.75f, 149.324f, 553.582f, +152.457f, 560.352f, 154.246f, 566.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 5, 151.25f, 572.746f, 151.25f, 572.742f, 127.27f, 584.398f, 126.246f, +585.746f, 126.242f, 585.742f, 136.289f, 576.258f, 137.246f, 576.746f, 138.047f, 576.258f, 151.25f, +572.746f, 151.25f, 572.746f, 10, 0, 0, 0, 0, 0, 0, +0, 5, 132.246f, 579.746f, 132.246f, 579.746f, 152.457f, 576.039f, 152.25f, 570.746f, +152.457f, 567.996f, 152.191f, 553.234f, 146.25f, 554.746f, 137.059f, 557.559f, 141.02f, 573.398f, +132.246f, 579.746f, 10, 0, 0.6f, 0.8f, 0.2f, 0.6f, 0.8f, 0.2f, +5, 141.25f, 575.75f, 141.25f, 575.75f, 151.332f, 574.195f, 152.25f, 570.746f, 153.117f, +569.438f, 153.848f, 560.301f, 148.246f, 558.75f, 142.832f, 558.098f, 140.379f, 569.34f, 141.25f, +575.75f, 10, 0, 0, 0, 0, 0, 0, 0, 44, +236.25f, 528.746f, 235.504f, 530.93f, 236.949f, 530.785f, 239.25f, 531.75f, 241.117f, 532.039f, +254.539f, 536.219f, 255.246f, 538.75f, 256.297f, 541.938f, 271.25f, 536.75f, 271.25f, 536.75f, +272.797f, 536.219f, 277.246f, 533.746f, 277.246f, 533.746f, 282.918f, 532.039f, 290.246f, 531.75f, +290.246f, 531.75f, 292.816f, 530.5f, 296.25f, 527.75f, 296.25f, 527.75f, 312.617f, 516.199f, +326.25f, 523.75f, 326.25f, 523.75f, 348.258f, 531.379f, 341.25f, 550.746f, 341.25f, 550.746f, +338.359f, 560.199f, 342.246f, 563.746f, 342.246f, 563.746f, 342.098f, 568.117f, 350.25f, 560.75f, +350.25f, 560.75f, 352.879f, 556.457f, 354.246f, 550.746f, 354.246f, 550.746f, 362.559f, 538.637f, +359.25f, 557.746f, 359.25f, 557.746f, 359.039f, 559.316f, 355.961f, 563.277f, 356.246f, 564.75f, +355.961f, 565.918f, 354.246f, 569.75f, 354.246f, 569.75f, 350.68f, 573.398f, 353.246f, 580.75f, +353.246f, 580.75f, 355.301f, 596.277f, 353.246f, 594.746f, 353.246f, 594.746f, 351.559f, 596.277f, +341.25f, 585.746f, 341.25f, 585.746f, 339.02f, 581.539f, 332.246f, 579.746f, 332.246f, 579.746f, +329.34f, 577.797f, 325.25f, 579.746f, 325.25f, 579.746f, 322.738f, 579.777f, 316.25f, 571.75f, +316.25f, 571.75f, 319.66f, 572.297f, 322.301f, 567.457f, 325.25f, 566.75f, 327.578f, 567.02f, +329.559f, 569.879f, 331.246f, 570.746f, 333.078f, 571.199f, 336.25f, 564.75f, 336.25f, 564.75f, +336.598f, 561.957f, 330.25f, 556.75f, 330.25f, 556.75f, 330, 551.617f, 328.25f, 553.75f, +328.25f, 553.75f, 324.938f, 554.039f, 323.621f, 549.859f, 322.246f, 544.746f, 321.418f, 539.738f, +317.25f, 539.746f, 317.25f, 539.746f, 315.039f, 531.156f, 313.246f, 534.75f, 313.246f, 534.75f, +313.5f, 540.617f, 307.25f, 533.746f, 307.25f, 533.746f, 305.578f, 532.039f, 300.246f, 534.75f, +300.246f, 534.75f, 293.039f, 536.656f, 295.25f, 538.75f, 295.25f, 538.75f, 297.656f, 541.277f, +310.246f, 538.75f, 310.246f, 538.75f, 312.398f, 540.617f, 303.25f, 544.746f, 303.25f, 544.746f, +302.937f, 547, 304.25f, 551.75f, 304.25f, 551.75f, 305.359f, 555.359f, 313.246f, 561.746f, +313.246f, 561.746f, 323.18f, 562.84f, 320.246f, 564.75f, 320.246f, 564.75f, 313.277f, 570.316f, +307.25f, 561.746f, 307.25f, 561.746f, 304.477f, 555.137f, 285.25f, 538.75f, 285.25f, 538.75f, +280.059f, 534.898f, 282.918f, 542.379f, 278.246f, 538.75f, 274.117f, 534.898f, 251.25f, 544.746f, +251.25f, 544.746f, 238.738f, 546.109f, 235.734f, 528.793f, 232.246f, 531.75f, 232.246f, 531.75f, +237.813f, 522.855f, 236.25f, 528.746f, 10, 0, 0, 0, 0, 0, +0, 0, 12, 450.25f, 711.746f, 450.25f, 711.746f, 422.18f, 703.199f, 419.246f, +682.746f, 419.246f, 682.742f, 416.461f, 657.438f, 439.25f, 637.75f, 439.25f, 637.75f, 439.34f, +631.039f, 441.246f, 627.746f, 441.246f, 627.742f, 439.777f, 622.238f, 460.246f, 630.75f, 490.25f, +639.75f, 490.25f, 639.75f, 497.418f, 642.477f, 503.25f, 651.746f, 508.859f, 661.84f, 525.578f, +682.52f, 521.25f, 709.75f, 521.25f, 709.75f, 522.938f, 722.559f, 516.25f, 722.746f, 516.25f, +722.746f, 507.098f, 724.758f, 499.25f, 716.75f, 499.25f, 716.75f, 491.699f, 712.879f, 489.246f, +713.746f, 450.25f, 711.746f, 10, 0, 0, 0, 0, 0, 0, +0, 8, 510.25f, 712.75f, 510.25f, 712.75f, 512.73f, 722.91f, 507.25f, 717.746f, +507.25f, 717.742f, 499.664f, 711.293f, 491.246f, 711.746f, 491.242f, 711.746f, 475.465f, 708.875f, +470.25f, 694.75f, 470.25f, 694.75f, 466.266f, 664.828f, 475.25f, 658.746f, 475.25f, 658.746f, +480.305f, 650.309f, 488.25f, 657.75f, 495.793f, 664.828f, 512.844f, 698.082f, 510.25f, 712.75f, +10, 0, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 8, 510.25f, +712.75f, 510.25f, 712.75f, 512.309f, 722.313f, 507.25f, 716.75f, 507.25f, 716.75f, 499.48f, +710.906f, 491.246f, 710.746f, 491.242f, 710.742f, 475.719f, 708.531f, 471.246f, 694.75f, 471.242f, +694.75f, 466.691f, 665.289f, 475.25f, 658.746f, 475.25f, 658.746f, 480.469f, 651.031f, 488.25f, +657.75f, 495.68f, 665.289f, 512.387f, 697.961f, 510.25f, 712.75f, 10, 0, 0.4f, +0.4f, 0.4f, 0.4f, 0.4f, 0.4f, 8, 509.246f, 712.75f, 509.246f, 712.75f, +511.887f, 721.715f, 507.25f, 716.75f, 507.25f, 716.75f, 499.293f, 710.52f, 491.246f, 710.746f, +491.242f, 710.742f, 475.973f, 708.188f, 471.246f, 693.746f, 471.242f, 693.742f, 467.113f, 665.746f, +475.25f, 659.75f, 475.25f, 659.75f, 480.637f, 651.754f, 488.25f, 658.746f, 495.563f, 665.746f, +511.93f, 697.84f, 509.246f, 712.75f, 10, 0, 0.6f, 0.6f, 0.6f, 0.6f, +0.6f, 0.6f, 8, 509.246f, 711.746f, 509.246f, 711.746f, 511.465f, 721.113f, 506.246f, +715.746f, 506.242f, 715.742f, 499.109f, 710.133f, 491.246f, 709.75f, 491.242f, 709.75f, 476.23f, +707.844f, 471.246f, 693.746f, 471.242f, 693.742f, 467.535f, 666.203f, 476.246f, 660.746f, 476.246f, +660.742f, 480.805f, 652.477f, 488.25f, 659.75f, 495.449f, 666.203f, 511.477f, 697.719f, 509.246f, +711.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 8, +509.246f, 711.746f, 509.246f, 711.746f, 511.043f, 720.516f, 506.246f, 715.746f, 506.242f, 715.742f, +498.926f, 709.746f, 491.246f, 709.75f, 491.242f, 709.75f, 476.484f, 707.5f, 472.25f, 693.746f, +472.25f, 693.742f, 467.957f, 666.66f, 476.246f, 660.746f, 476.246f, 660.742f, 480.973f, 653.195f, +488.25f, 659.75f, 495.332f, 666.66f, 511.02f, 697.598f, 509.246f, 711.746f, 10, 0, +1, 1, 1, 1, 1, 1, 8, 508.25f, 710.746f, 508.25f, +710.742f, 510.621f, 719.918f, 506.246f, 714.75f, 506.242f, 714.75f, 498.738f, 709.359f, 491.246f, +709.75f, 491.242f, 709.75f, 476.738f, 707.156f, 472.25f, 693.746f, 472.25f, 693.742f, 468.379f, +667.117f, 476.246f, 661.75f, 476.246f, 661.75f, 481.141f, 653.918f, 488.25f, 660.746f, 495.219f, +667.117f, 510.563f, 697.477f, 508.25f, 710.746f, 10, 0, 0.6f, 0.15f, 0, +0.6f, 0.15f, 0, 24, 275.246f, 487.75f, 275.246f, 487.75f, 253.219f, 508.719f, +244.246f, 509.75f, 244.246f, 509.75f, 206.578f, 514, 190.246f, 493.746f, 190.246f, 493.742f, +209.656f, 516.637f, 240.25f, 510.746f, 240.25f, 510.742f, 216.258f, 515.316f, 202.246f, 511.746f, +202.242f, 511.746f, 184.137f, 511.797f, 173.25f, 496.75f, 170.246f, 490.75f, 170.242f, 490.75f, +174.898f, 507.398f, 195.25f, 513.746f, 195.25f, 513.746f, 220.219f, 519.277f, 232.246f, 513.746f, +232.246f, 513.746f, 208.34f, 521.477f, 197.25f, 519.746f, 197.25f, 519.742f, 163.898f, 521.918f, +150.246f, 492.75f, 150.246f, 492.75f, 154.219f, 508.719f, 170.246f, 516.75f, 170.242f, 516.75f, +185.457f, 526.316f, 208.25f, 522.746f, 208.25f, 522.746f, 223.738f, 519.719f, 229.25f, 516.75f, +235.18f, 514.438f, 233.859f, 517.52f, 224.246f, 522.746f, 224.242f, 522.746f, 218.457f, 533.797f, +203.25f, 533.746f, 203.25f, 533.746f, 155.977f, 529.398f, 144.246f, 515.746f, 144.246f, 515.742f, +159.5f, 528.52f, 171.246f, 531.75f, 171.246f, 531.75f, 195.578f, 540.398f, 205.25f, 539.746f, +205.25f, 539.742f, 232.098f, 538.418f, 240.25f, 542.75f, 240.25f, 542.75f, 228.137f, 537.316f, +231.246f, 533.746f, 235.18f, 530.277f, 242.656f, 521.918f, 242.246f, 520.75f, 242.656f, 519.277f, +269.277f, 494.969f, 273.25f, 489.746f, 275.246f, 487.75f, 10, 0, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 5, 428.25f, 273.746f, 428.25f, 273.742f, 410.848f, +314.348f, 397.246f, 324.746f, 397.246f, 324.746f, 425.699f, 307.199f, 429.25f, 287.75f, 429.25f, +287.75f, 429.547f, 276.398f, 428.25f, 273.746f, 10, 0, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 7, 479.25f, 265.75f, 479.25f, 265.75f, 450.449f, 326.449f, +430.246f, 352.746f, 430.246f, 352.742f, 477.949f, 311.598f, 483.25f, 282.746f, 484.246f, 276.75f, +480.246f, 278.75f, 480.242f, 278.75f, 480.148f, 269.25f, 479.25f, 265.75f, 10, 0, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 542.246f, 319.746f, 542.246f, +319.742f, 473, 384.75f, 471.246f, 387.746f, 471.242f, 387.742f, 537.898f, 314.898f, 541.25f, +306.746f, 541.25f, 306.742f, 539, 316.547f, 542.246f, 319.746f, 10, 0, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 334.246f, 271.746f, 334.246f, 271.746f, +355.848f, 328.648f, 377.246f, 303.75f, 377.246f, 303.75f, 393.25f, 292.898f, 392.25f, 289.75f, +392.25f, 289.75f, 388.297f, 296.75f, 368.246f, 295.746f, 368.242f, 295.742f, 347.598f, 299.5f, +334.246f, 271.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +5, 544.246f, 411.746f, 544.246f, 411.742f, 494.449f, 443.047f, 486.25f, 444.746f, 473.211f, +447.297f, 540.648f, 412.797f, 546.246f, 400.75f, 546.242f, 400.75f, 548.348f, 404, 544.246f, +411.746f, 10, 0, 0, 0, 0, 0, 0, 0, 63, +378.246f, 294.75f, 378.246f, 294.75f, 400.621f, 296.637f, 408.246f, 303.75f, 413.246f, 299.746f, +432.246f, 342.75f, 436.25f, 336.75f, 436.25f, 336.75f, 452.098f, 352.957f, 451.25f, 361.746f, +450.34f, 370.559f, 465.246f, 354.746f, 465.246f, 354.746f, 465.246f, 354.742f, 464.418f, 367.918f, +472.25f, 360.75f, 472.25f, 360.75f, 469.699f, 377.598f, 479.25f, 368.746f, 479.25f, 368.746f, +467.348f, 401.969f, 492.25f, 373.75f, 498.301f, 366.598f, 493.246f, 373.75f, 493.246f, 373.75f, +493.242f, 373.75f, 464.859f, 426.879f, 488.25f, 410.75f, 488.25f, 410.75f, 490.82f, 436.117f, +489.246f, 440.746f, 488.18f, 445.797f, 485.98f, 470.438f, 480.246f, 475.746f, 475.418f, 481.879f, +481.141f, 483.637f, 487.246f, 477.746f, 487.246f, 477.742f, 474.98f, 504.316f, 489.246f, 490.75f, +489.246f, 490.75f, 485.539f, 507.84f, 480.246f, 510.746f, 480.242f, 510.742f, 474.539f, 529.84f, +491.246f, 517.746f, 491.242f, 517.742f, 486.418f, 531.598f, 483.25f, 534.75f, 483.25f, 534.75f, +470.141f, 565.477f, 478.246f, 559.746f, 483.25f, 555.75f, 483.25f, 555.75f, 475.418f, 571.637f, +482.246f, 566.75f, 489.5f, 561.957f, 489.246f, 562.75f, 489.246f, 562.75f, 489.246f, 562.75f, +466.18f, 598.918f, 488.25f, 579.746f, 488.25f, 579.746f, 479.645f, 594.867f, 476.246f, 602.75f, +476.246f, 602.75f, 455.18f, 624.879f, 471.246f, 617.75f, 476.246f, 615.75f, 476.246f, 615.75f, +466.621f, 627.078f, 458.246f, 628.75f, 449.02f, 630.598f, 460.461f, 637.637f, 467.246f, 635.75f, +474.539f, 633.238f, 491.246f, 624.75f, 491.246f, 624.75f, 491.242f, 624.75f, 505.777f, 604.199f, +510.25f, 603.746f, 510.25f, 603.746f, 488.18f, 612.117f, 495.246f, 603.746f, 495.242f, 603.746f, +510.621f, 587.918f, 502.246f, 588.75f, 502.242f, 588.75f, 496.098f, 580.438f, 501.25f, 570.746f, +501.25f, 570.746f, 481.074f, 590.988f, 497.25f, 562.75f, 505.25f, 544.746f, 505.25f, 544.746f, +478.059f, 572.078f, 490.25f, 547.75f, 490.25f, 547.75f, 509.301f, 521.918f, 511.246f, 521.746f, +513.699f, 521.039f, 518.25f, 511.746f, 518.25f, 511.746f, 513.246f, 513.746f, 519.25f, 503.75f, +519.25f, 503.75f, 507.098f, 517.078f, 513.246f, 502.746f, 520.246f, 486.746f, 520.246f, 486.742f, +497.418f, 510.918f, 512.25f, 478.746f, 512.25f, 478.746f, 494.34f, 484.078f, 504.246f, 464.746f, +504.242f, 464.742f, 502.258f, 447.559f, 502.246f, 441.75f, 503.141f, 436.117f, 504.461f, 404.879f, +499.25f, 395.75f, 494.777f, 387.277f, 506.219f, 366.156f, 508.25f, 361.746f, 510.621f, 357.355f, +514.578f, 345.477f, 505.25f, 355.75f, 495.219f, 365.719f, 500.059f, 359.559f, 502.246f, 349.75f, +504.461f, 340.195f, 511.059f, 323.035f, 510.25f, 316.75f, 510.25f, 316.75f, 508.859f, 315.559f, +505.25f, 319.746f, 505.25f, 319.742f, 489.059f, 344.598f, 491.246f, 328.746f, 491.242f, 328.742f, +489.5f, 319.957f, 486.25f, 310.746f, 486.25f, 310.742f, 482.461f, 298.398f, 482.246f, 307.75f, +482.242f, 307.75f, 478.938f, 326.559f, 476.246f, 317.746f, 472.777f, 309.836f, 468.82f, 303.238f, +465.246f, 300.75f, 462.66f, 297.957f, 456.938f, 323.035f, 455.25f, 311.75f, 455.25f, 311.75f, +442.418f, 325.238f, 437.25f, 306.746f, 424.246f, 288.746f, 424.242f, 288.742f, 423.938f, 302.797f, +422.246f, 295.746f, 422.246f, 295.742f, 389.621f, 289.598f, 378.246f, 294.75f, 10, 0, +0, 0, 0, 0, 0, 0, 34, 340.25f, 686.746f, 340.25f, +686.742f, 327.578f, 695.719f, 323.246f, 695.746f, 318.777f, 694.84f, 353.539f, 704.957f, 399.246f, +674.75f, 399.246f, 674.75f, 404.141f, 671.52f, 408.246f, 671.746f, 408.246f, 671.742f, 411.621f, +669.316f, 408.246f, 665.75f, 408.246f, 665.75f, 398.859f, 654.797f, 411.246f, 642.746f, 411.246f, +642.742f, 431.418f, 635, 425.25f, 644.75f, 425.25f, 644.75f, 437.141f, 640.277f, 440.25f, +635.75f, 442.418f, 631.477f, 441.246f, 635.75f, 441.246f, 635.75f, 441.246f, 635.75f, 434.059f, +643.797f, 427.25f, 649.746f, 427.25f, 649.742f, 421.738f, 651.719f, 418.25f, 660.746f, 415.578f, +670.199f, 412.938f, 681.199f, 418.25f, 684.746f, 418.25f, 684.742f, 413.379f, 679.879f, 414.25f, +684.746f, 415.141f, 688.68f, 419.098f, 692.637f, 421.246f, 692.75f, 422.621f, 693.52f, 440.66f, +710.898f, 448.25f, 711.746f, 448.25f, 711.746f, 438.02f, 709.797f, 434.246f, 710.746f, 431.418f, +712, 402.16f, 724.539f, 395.25f, 725.75f, 395.25f, 725.75f, 377.078f, 733.117f, 390.246f, +730.746f, 390.242f, 730.742f, 429.66f, 726.738f, 449.25f, 711.746f, 449.25f, 711.746f, 441.758f, +721.457f, 421.246f, 728.746f, 421.246f, 728.742f, 397.098f, 743.02f, 358.25f, 737.746f, 358.25f, +737.742f, 338.801f, 734, 330.25f, 731.75f, 330.25f, 731.75f, 327.359f, 732.68f, 326.25f, +732.746f, 326.039f, 733.559f, 313.059f, 743.457f, 282.25f, 735.746f, 282.25f, 735.746f, 264, +730.699f, 254.246f, 725.75f, 254.246f, 725.75f, 237.816f, 724.098f, 234.246f, 720.75f, 234.246f, +720.75f, 213.398f, 704.52f, 211.246f, 703.75f, 209, 702.758f, 196.457f, 694.398f, 195.25f, +693.746f, 195.25f, 693.742f, 222.637f, 701.219f, 225.25f, 703.75f, 227.918f, 706.5f, 247.059f, +709.359f, 249.25f, 707.75f, 252.34f, 706.277f, 261.578f, 706.938f, 251.25f, 706.746f, 251.25f, +706.742f, 334.18f, 690, 335.246f, 687.75f, 335.938f, 685.598f, 340.25f, 686.746f, 340.25f, +686.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 13, +419.246f, 696.75f, 419.246f, 696.75f, 407.66f, 705.18f, 405.25f, 704.746f, 403.258f, 705.18f, +389.621f, 716.398f, 385.25f, 715.746f, 380.379f, 715.52f, 366.961f, 726.52f, 337.25f, 717.746f, +337.25f, 717.742f, 336.16f, 719.699f, 340.25f, 720.75f, 340.25f, 720.75f, 347.16f, 723, +347.25f, 723.75f, 347.25f, 723.75f, 369.82f, 728.277f, 377.246f, 724.746f, 377.246f, 724.746f, +387.859f, 721.457f, 394.25f, 714.75f, 394.25f, 714.75f, 407, 711.117f, 410.246f, 711.746f, +410.246f, 711.746f, 420.199f, 709.797f, 420.246f, 707.75f, 420.246f, 707.75f, 427.02f, 704.52f, +425.25f, 701.75f, 425.25f, 701.75f, 425.48f, 699.898f, 419.246f, 696.75f, 10, 0, +0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 38, 405.25f, 699.746f, 406.047f, +698.664f, 407.168f, 698.555f, 408.246f, 697.746f, 408.094f, 697.32f, 407.773f, 696.961f, 407.25f, +696.75f, 406.281f, 696.504f, 405.121f, 697.133f, 404.25f, 696.75f, 403.422f, 696.258f, 402.715f, +696.457f, 402.246f, 696.75f, 400.313f, 697.105f, 398.301f, 697.137f, 396.25f, 696.75f, 394.254f, +697.621f, 391.66f, 696.977f, 389.246f, 697.746f, 389.309f, 698.109f, 389.063f, 697.727f, 389.246f, +697.746f, 385.629f, 699.016f, 381.512f, 698.707f, 379.246f, 700.746f, 376.168f, 701.672f, 373.574f, +702.18f, 371.25f, 702.746f, 368.906f, 703.488f, 367.355f, 704.574f, 365.246f, 705.75f, 364.059f, +706.27f, 362.457f, 706.844f, 361.25f, 707.75f, 358.719f, 707.75f, 356.703f, 707.625f, 354.246f, +707.75f, 354.52f, 708.227f, 354.309f, 707.848f, 354.246f, 707.75f, 353.863f, 707.996f, 353.543f, +708.637f, 353.246f, 708.746f, 351.508f, 708.004f, 349.871f, 709.074f, 348.25f, 708.746f, 346.742f, +710.043f, 344.844f, 709.773f, 343.246f, 710.746f, 339.883f, 711.195f, 336.414f, 709.797f, 333.246f, +710.746f, 337.602f, 712.926f, 342.758f, 711.57f, 347.25f, 713.746f, 349.789f, 715.148f, 352.715f, +713.938f, 355.246f, 714.75f, 356.078f, 714.934f, 356.84f, 715.152f, 357.246f, 714.75f, 357.426f, +714.566f, 357.625f, 714.828f, 357.246f, 714.75f, 360.387f, 713.527f, 362.934f, 712.125f, 365.246f, +710.746f, 366.039f, 710.793f, 366.621f, 711.047f, 367.246f, 710.746f, 368.57f, 709.488f, 370.711f, +709.602f, 372.25f, 708.746f, 374.105f, 708.809f, 376.078f, 708.391f, 378.246f, 708.746f, 378.066f, +709.109f, 378.324f, 708.734f, 378.246f, 708.746f, 379.602f, 709.582f, 380.875f, 709.281f, 382.25f, +708.746f, 382.227f, 708.82f, 382.957f, 708.551f, 383.25f, 708.746f, 384.531f, 708.164f, 385.473f, +707.637f, 387.246f, 707.75f, 386.895f, 707.414f, 387.098f, 707.789f, 387.246f, 707.75f, 388.41f, +707.277f, 389.559f, 707.34f, 390.246f, 705.75f, 390.426f, 706.207f, 390.609f, 706.469f, 390.246f, +706.746f, 391.828f, 706.066f, 392.543f, 705.238f, 394.25f, 704.746f, 394.289f, 704.855f, 394.961f, +704.168f, 395.25f, 703.75f, 398.227f, 703.168f, 400.254f, 701.488f, 402.246f, 700.746f, 403.5f, +700.16f, 404.465f, 699.902f, 405.25f, 699.746f, 10, 0, 0.8f, 0.45f, 0.15f, +0.8f, 0.45f, 0.15f, 23, 321.246f, 714.75f, 318.094f, 716.91f, 315.488f, 718.125f, +313.246f, 719.746f, 312.605f, 720.234f, 312.207f, 720.051f, 312.246f, 719.746f, 310.879f, 720.852f, +309.902f, 721.492f, 309.246f, 722.746f, 308.227f, 722.68f, 307.324f, 722.664f, 307.25f, 722.746f, +303.969f, 724.371f, 301.074f, 724.984f, 298.246f, 726.746f, 299.066f, 727, 300.301f, 726.73f, +301.246f, 727.75f, 301.172f, 727.309f, 301.434f, 726.996f, 302.246f, 726.746f, 303.668f, 728.203f, +305.703f, 728.371f, 307.25f, 728.746f, 309.422f, 728.172f, 311.313f, 727.836f, 313.246f, 727.75f, +313.605f, 727.484f, 313.824f, 726.91f, 314.25f, 726.746f, 316.629f, 726.074f, 319.258f, 726.648f, +321.246f, 725.75f, 323.336f, 725.035f, 325.066f, 724.133f, 326.25f, 722.746f, 326.703f, 722.441f, +326.348f, 722.113f, 326.25f, 721.746f, 326.465f, 722.02f, 326.766f, 721.793f, 327.25f, 721.746f, +326.98f, 721.184f, 326.98f, 720.852f, 327.25f, 720.75f, 326.766f, 720.246f, 326.457f, 720.133f, +326.25f, 719.746f, 324.5f, 719.871f, 326.449f, 721.387f, 325.25f, 720.75f, 324.277f, 720, +325.098f, 718.453f, 324.246f, 716.75f, 323.973f, 717.27f, 323.719f, 717.512f, 324.246f, 717.746f, +324.098f, 717.363f, 323.434f, 717.043f, 323.246f, 716.75f, 322.824f, 715.898f, 321.836f, 714.344f, +321.246f, 714.75f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, +25, 285.25f, 706.746f, 281.645f, 707.801f, 278.293f, 707.676f, 275.246f, 708.746f, 274.898f, +709.109f, 274.656f, 708.727f, 274.25f, 708.746f, 273.082f, 709.41f, 272.07f, 710.473f, 271.25f, +711.746f, 269.883f, 712.602f, 268.059f, 712.176f, 266.246f, 712.75f, 266.301f, 712.848f, 266.078f, +713.41f, 266.246f, 713.746f, 264.406f, 713.625f, 263.387f, 714.672f, 262.25f, 715.746f, 264.809f, +716.172f, 267.461f, 716.137f, 270.25f, 716.75f, 270.293f, 716.582f, 270.453f, 716.227f, 270.25f, +715.746f, 270.746f, 716.227f, 270.891f, 716.469f, 271.25f, 716.75f, 271.254f, 716.309f, 271.586f, +715.953f, 272.25f, 715.746f, 272.469f, 716.824f, 273.082f, 716.617f, 273.25f, 716.75f, 273.836f, +716.563f, 273.973f, 716.227f, 274.25f, 715.746f, 274.27f, 716.227f, 274.41f, 716.57f, 274.25f, +716.75f, 274.707f, 716.57f, 274.852f, 716.227f, 275.246f, 715.746f, 275.148f, 716.227f, 275.289f, +716.469f, 275.246f, 716.75f, 276.199f, 715.758f, 277.172f, 716.367f, 278.246f, 715.746f, 279.219f, +715.922f, 279.512f, 714.656f, 280.246f, 714.75f, 285.879f, 712.895f, 290.43f, 710.535f, 295.25f, +707.75f, 295.566f, 708.078f, 295.801f, 707.805f, 295.25f, 707.75f, 295.973f, 707.379f, 296.316f, +707.477f, 296.25f, 707.75f, 297.688f, 706.523f, 298.832f, 705.922f, 299.246f, 704.746f, 299.84f, +704.34f, 299.477f, 703.895f, 299.246f, 703.75f, 294.348f, 705.047f, 289.941f, 705.715f, 285.25f, +706.746f, 10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 10, +270.25f, 658.746f, 268.117f, 659.637f, 267.477f, 661.871f, 266.246f, 663.75f, 266, 664.215f, +266.301f, 664.563f, 266.246f, 664.746f, 267.266f, 664.832f, 267.863f, 664.309f, 268.246f, 663.75f, +270.234f, 663.137f, 271.922f, 661.77f, 274.25f, 661.75f, 276.309f, 659.16f, 280.992f, 658.738f, +281.25f, 654.75f, 281, 654.074f, 279.43f, 655.082f, 279.246f, 653.746f, 276.262f, 655.242f, +273.633f, 655.129f, 271.25f, 656.746f, 270.336f, 657.16f, 270.699f, 657.66f, 270.25f, 658.746f, +10, 0, 0.8f, 0.45f, 0.15f, 0.8f, 0.45f, 0.15f, 6, 239.25f, +715.746f, 239.727f, 716.129f, 247.461f, 715.871f, 247.246f, 715.746f, 247.391f, 715.406f, 238.891f, +714.254f, 238.25f, 714.75f, 238.309f, 714.523f, 230.047f, 711.852f, 230.25f, 711.746f, 230.191f, +712.148f, 239.285f, 716.129f, 239.25f, 715.746f, 10, 0, 0, 0, 0, +0, 0, 0, 80, 256.246f, 705.75f, 256.246f, 705.75f, 240.238f, 703.418f, +235.246f, 701.75f, 230.559f, 700.777f, 210.098f, 692.418f, 207.25f, 689.746f, 207.25f, 689.746f, +192.059f, 684.277f, 173.25f, 662.746f, 173.25f, 662.742f, 181.719f, 666.02f, 184.25f, 668.75f, +184.25f, 668.75f, 199.098f, 682.957f, 199.246f, 679.75f, 199.246f, 679.75f, 212.297f, 689.559f, +211.246f, 686.746f, 211.246f, 686.742f, 238.477f, 699.457f, 236.25f, 695.746f, 236.25f, 695.742f, +260.039f, 701, 259.25f, 698.75f, 259.25f, 698.75f, 279.617f, 693.957f, 276.246f, 693.746f, +276.246f, 693.742f, 270.156f, 692.418f, 277.246f, 688.746f, 277.246f, 688.742f, 273.457f, 683.617f, +267.246f, 687.75f, 261.578f, 692.418f, 264.879f, 690, 259.25f, 688.746f, 259.25f, 688.742f, +256.52f, 688.02f, 251.25f, 692.75f, 251.25f, 692.75f, 245.297f, 697.477f, 235.246f, 693.746f, +235.242f, 693.742f, 201.957f, 679.656f, 200.246f, 678.746f, 200.246f, 678.746f, 195.797f, 675.918f, +193.25f, 671.746f, 193.25f, 671.742f, 186.777f, 667.117f, 183.25f, 665.75f, 183.25f, 665.75f, +169.398f, 652.816f, 168.25f, 651.746f, 168.25f, 651.742f, 164.34f, 645.559f, 163.25f, 644.75f, +163.25f, 644.75f, 170.5f, 649.297f, 172.25f, 651.746f, 172.25f, 651.742f, 188.098f, 662.5f, +194.25f, 663.75f, 194.25f, 663.75f, 198.879f, 666.68f, 200.246f, 667.746f, 200.246f, 667.746f, +215.598f, 678.34f, 220.246f, 678.746f, 220.246f, 678.746f, 230.34f, 672.617f, 233.246f, 680.746f, +233.246f, 680.746f, 239.359f, 682.297f, 245.246f, 680.746f, 245.246f, 680.746f, 249.039f, 683.84f, +248.25f, 686.746f, 248.25f, 686.742f, 249.918f, 688.238f, 251.25f, 683.75f, 251.25f, 683.75f, +254.758f, 680.098f, 260.25f, 682.746f, 260.25f, 682.742f, 264.437f, 682.52f, 262.25f, 679.75f, +262.25f, 679.75f, 257.398f, 675.699f, 244.246f, 675.746f, 244.246f, 675.742f, 230.777f, 674.816f, +212.246f, 666.75f, 212.246f, 666.75f, 179.957f, 655.02f, 170.246f, 643.75f, 170.242f, 643.75f, +162.797f, 633.898f, 157.25f, 632.75f, 157.25f, 632.75f, 150.477f, 631.699f, 144.246f, 623.746f, +144.246f, 623.746f, 154.656f, 629.938f, 164.246f, 629.746f, 164.242f, 629.742f, 168.957f, 632.578f, +165.246f, 628.75f, 165.242f, 628.75f, 160.816f, 620.258f, 162.25f, 614.746f, 162.25f, 614.746f, +161.918f, 608.598f, 161.246f, 606.75f, 161.246f, 606.75f, 152.457f, 592.758f, 152.25f, 589.75f, +152.457f, 587.477f, 153.777f, 576.699f, 154.246f, 575.75f, 154.656f, 575.379f, 153.117f, 577.797f, +157.25f, 574.746f, 161.477f, 572.52f, 164.559f, 570.758f, 165.246f, 567.75f, 166.316f, 564.598f, +163.238f, 573.617f, 163.25f, 575.75f, 162.797f, 577.578f, 158.18f, 585.5f, 159.246f, 587.746f, +159.242f, 587.742f, 160.156f, 587.039f, 161.246f, 585.746f, 161.246f, 585.742f, 160.379f, 586.156f, +161.246f, 589.75f, 161.246f, 589.75f, 161.918f, 595.84f, 163.25f, 599.75f, 165, 602.879f, +167.199f, 607.059f, 167.25f, 607.746f, 168.078f, 608.816f, 168.078f, 615.199f, 169.25f, 612.746f, +173.25f, 609.746f, 173.25f, 609.742f, 170.277f, 612.34f, 172.25f, 614.746f, 172.25f, 614.746f, +171.598f, 620.918f, 173.25f, 623.746f, 173.25f, 623.746f, 181.277f, 633.02f, 183.25f, 633.75f, +184.797f, 635.219f, 183.25f, 634.746f, 183.25f, 634.746f, 183.25f, 634.746f, 189.859f, 639.398f, +183.25f, 637.75f, 183.25f, 637.75f, 179.078f, 635.879f, 176.246f, 635.75f, 176.246f, 635.75f, +167.418f, 633.68f, 172.25f, 638.746f, 176.219f, 642.918f, 187.219f, 648.859f, 191.246f, 648.75f, +192.25f, 646.75f, 204.25f, 649.746f, 203.25f, 648.75f, 203.25f, 648.75f, 203.059f, 648.859f, +207.25f, 649.746f, 212.297f, 649.738f, 218.68f, 648.199f, 220.246f, 649.746f, 221.758f, 652.156f, +225.5f, 653.258f, 225.25f, 651.746f, 224.617f, 650.18f, 224.246f, 647.746f, 224.246f, 647.746f, +224.242f, 647.746f, 229.898f, 654.359f, 229.25f, 651.746f, 228.578f, 649.52f, 219.559f, 643.797f, +218.25f, 636.746f, 229.25f, 645.746f, 233.246f, 649.746f, 233.246f, 649.742f, 237.379f, 646.879f, +237.25f, 648.75f, 237.816f, 650.398f, 242.879f, 656.777f, 244.246f, 656.746f, 245.52f, 656.34f, +247.719f, 659.418f, 247.246f, 656.746f, 247.277f, 653.699f, 255.246f, 647.746f, 255.246f, 647.746f, +255.246f, 647.746f, 259.156f, 649.738f, 260.25f, 647.746f, 262.238f, 646.656f, 267.246f, 669.746f, +267.246f, 669.746f, 294.25f, 681.75f, 342.246f, 685.75f, 323.246f, 692.75f, 256.246f, 705.75f, +10, 2.2f, 0.3f, 0, 0, 0.3f, 0, 0, 3, 276.246f, +486.746f, 276.246f, 486.742f, 260.039f, 504.977f, 251.25f, 507.75f, 251.25f, 507.75f, 236.059f, +515.316f, 209.246f, 506.746f, 10, 2.2f, 0.3f, 0, 0, 0.3f, 0, +0, 3, 247.246f, 509.75f, 247.242f, 509.75f, 219.559f, 518.18f, 202.246f, 513.746f, +202.242f, 513.746f, 182.379f, 511.359f, 173.25f, 495.746f, 10, 2.2f, 0.3f, 0, +0, 0.3f, 0, 0, 4, 243.246f, 510.746f, 243.246f, 510.742f, 224.617f, +518.617f, 208.25f, 520.75f, 208.25f, 520.75f, 190.078f, 523.898f, 172.25f, 515.746f, 172.25f, +515.742f, 158.398f, 509.379f, 152.25f, 497.746f, 10, 2.2f, 0.3f, 0, 0, +0.3f, 0, 0, 4, 244.246f, 510.746f, 244.246f, 510.742f, 227.477f, 522.359f, +226.25f, 523.75f, 226.25f, 523.75f, 218.68f, 536, 204.25f, 536.75f, 204.25f, 536.75f, +180.84f, 535.559f, 162.25f, 526.746f, 10, 0, 0, 0, 0, 0, +0, 0, 169, 243.246f, 519.746f, 244.68f, 518.543f, 274.25f, 486.746f, 274.25f, +486.746f, 313.059f, 446.457f, 282.25f, 483.75f, 282.25f, 483.75f, 273.898f, 489.359f, 264.246f, +509.75f, 264.246f, 509.75f, 262.457f, 513.117f, 279.246f, 501.75f, 279.246f, 501.75f, 283.578f, +501.238f, 298.246f, 479.75f, 298.246f, 479.75f, 291.059f, 482.758f, 296.25f, 474.75f, 296.25f, +474.75f, 299.418f, 472.637f, 322.246f, 455.746f, 322.246f, 455.746f, 325.82f, 451.078f, 330.25f, +449.746f, 330.25f, 449.746f, 345.621f, 455.035f, 338.25f, 440.746f, 338.25f, 440.746f, 341.219f, +433.035f, 347.25f, 445.746f, 347.25f, 445.746f, 359.699f, 464.277f, 341.25f, 461.75f, 341.25f, +461.75f, 308.656f, 458.559f, 301.246f, 475.746f, 301.246f, 475.746f, 298.539f, 478.797f, 308.246f, +475.746f, 308.246f, 475.746f, 317.461f, 473.957f, 300.246f, 489.746f, 300.246f, 489.746f, 302.937f, +489.797f, 313.246f, 482.746f, 313.246f, 482.746f, 324.5f, 472.199f, 326.25f, 474.75f, 326.25f, +474.75f, 346.5f, 484.078f, 358.25f, 475.746f, 358.25f, 475.746f, 360.141f, 473.957f, 353.98f, +466.477f, 355.246f, 460.746f, 357.5f, 455.035f, 363.25f, 441.75f, 363.25f, 441.75f, 360.141f, +439.637f, 360.25f, 427.746f, 360.25f, 427.746f, 379.059f, 402.238f, 368.246f, 404.75f, 368.246f, +404.75f, 351.34f, 404.879f, 367.246f, 396.746f, 367.246f, 396.746f, 371.141f, 394.316f, 381.25f, +386.75f, 381.25f, 386.75f, 377.738f, 387.719f, 376.246f, 381.746f, 376.246f, 381.746f, 381.258f, +377.598f, 378.246f, 372.746f, 378.246f, 372.746f, 371.578f, 370.996f, 370.25f, 366.75f, 370.25f, +366.75f, 377.738f, 357.797f, 366.246f, 357.746f, 366.246f, 357.746f, 370.699f, 352.516f, 365.246f, +339.746f, 365.246f, 339.746f, 360.141f, 339.316f, 353.246f, 332.746f, 353.246f, 332.746f, 355.738f, +327.879f, 344.246f, 321.746f, 344.246f, 321.746f, 335.059f, 319.957f, 338.25f, 312.75f, 338.25f, +312.75f, 329.34f, 305.879f, 326.25f, 288.746f, 326.25f, 288.746f, 325.82f, 276.836f, 323.18f, +273.316f, 329.25f, 275.746f, 334.621f, 277.719f, 333.246f, 291.746f, 333.246f, 291.746f, 328.461f, +308.516f, 375.246f, 325.75f, 375.246f, 325.75f, 379.938f, 327.879f, 381.25f, 333.75f, 381.25f, +333.75f, 383.02f, 333.156f, 392.25f, 324.746f, 392.25f, 324.746f, 401.059f, 312.477f, 401.246f, +322.75f, 401.246f, 322.75f, 402.82f, 326.559f, 401.246f, 332.746f, 401.246f, 332.746f, 407.66f, +356.918f, 392.25f, 363.746f, 392.25f, 363.746f, 381.258f, 400.918f, 396.25f, 391.75f, 396.25f, +391.75f, 399.738f, 385.516f, 411.246f, 379.746f, 411.246f, 379.746f, 415.25f, 382.75f, 413.82f, +387.719f, 423.246f, 394.746f, 423.246f, 394.746f, 426.141f, 387.277f, 432.246f, 395.75f, 432.246f, +395.75f, 436.699f, 422.918f, 450.25f, 406.75f, 450.25f, 406.75f, 454.738f, 405.758f, 456.246f, +412.746f, 456.246f, 412.746f, 460.02f, 424.676f, 456.246f, 439.75f, 456.246f, 439.75f, 460.02f, +440.078f, 470.25f, 433.746f, 470.25f, 433.746f, 473.66f, 437.438f, 463.539f, 455.918f, 468.25f, +453.746f, 472.34f, 450.637f, 477.25f, 448.75f, 477.25f, 448.75f, 478.059f, 451.078f, 467.246f, +464.746f, 467.246f, 464.746f, 462.219f, 467.797f, 456.246f, 489.746f, 456.246f, 489.746f, 464.418f, +486.277f, 453.25f, 502.746f, 453.25f, 502.746f, 453.418f, 506.52f, 460.246f, 518.75f, 460.246f, +518.75f, 459.141f, 526.316f, 460.246f, 525.75f, 460.246f, 525.75f, 463.098f, 524.559f, 471.898f, +522.797f, 464.25f, 529.75f, 456.938f, 536.879f, 465.246f, 541.746f, 465.246f, 541.746f, 470.141f, +545.238f, 455.25f, 544.746f, 455.25f, 544.746f, 449.461f, 549.637f, 450.25f, 553.75f, 450.25f, +553.75f, 458.699f, 551.84f, 442.859f, 567.68f, 440.25f, 571.75f, 437.578f, 575.598f, 448.25f, +581.746f, 448.25f, 581.746f, 462.66f, 585.277f, 450.25f, 588.75f, 450.25f, 588.75f, 428.34f, +588.359f, 440.25f, 599.75f, 440.25f, 599.75f, 446.82f, 599.797f, 445.246f, 602.75f, 445.246f, +602.75f, 439.34f, 603.758f, 429.25f, 610.75f, 429.25f, 610.75f, 424.379f, 614.758f, 428.25f, +613.75f, 428.25f, 613.75f, 446.82f, 612.559f, 415.25f, 624.75f, 415.25f, 624.75f, 423.938f, +624.879f, 404.25f, 636.746f, 404.25f, 636.746f, 401.938f, 638.078f, 398.246f, 646.75f, 398.246f, +646.75f, 391.82f, 652.156f, 386.246f, 659.75f, 386.246f, 659.75f, 386.098f, 664.477f, 381.25f, +669.746f, 381.25f, 669.746f, 368.059f, 684.719f, 362.25f, 684.746f, 362.25f, 684.746f, 345.621f, +688.238f, 340.25f, 687.75f, 340.25f, 687.75f, 282.25f, 682.746f, 252.777f, 668.438f, 261.25f, +645.746f, 261.25f, 645.746f, 268.398f, 636.098f, 278.246f, 640.746f, 278.246f, 640.746f, 283.578f, +647.098f, 296.25f, 644.75f, 296.25f, 644.75f, 318.777f, 641.156f, 316.25f, 644.75f, 316.25f, +644.75f, 313.277f, 650.18f, 295.457f, 657, 295.25f, 657.75f, 295.02f, 658.316f, 285.25f, +661.75f, 285.25f, 661.75f, 282.039f, 663.379f, 277.246f, 673.746f, 277.246f, 673.746f, 273.68f, +677.238f, 291.246f, 670.75f, 291.246f, 670.75f, 289.738f, 669.758f, 298.246f, 665.75f, 298.246f, +665.75f, 317.02f, 666.457f, 328.25f, 654.75f, 328.25f, 654.75f, 340.559f, 636.316f, 341.25f, +645.746f, 341.25f, 645.746f, 343.859f, 655.68f, 331.246f, 678.746f, 331.246f, 678.746f, 331.32f, +681.199f, 340.25f, 673.746f, 340.25f, 673.746f, 341.879f, 676.137f, 343.246f, 669.746f, 343.246f, +669.746f, 342.98f, 667.117f, 347.25f, 658.746f, 347.25f, 658.746f, 350.238f, 644.02f, 354.246f, +651.746f, 354.246f, 651.746f, 359.25f, 641.75f, 360.801f, 638.957f, 354.246f, 630.75f, 354.246f, +630.75f, 353.98f, 627.52f, 354.859f, 627.738f, 348.25f, 619.75f, 342.539f, 611.02f, 346.246f, +605.746f, 346.246f, 605.746f, 344.738f, 598.918f, 354.246f, 599.75f, 354.246f, 599.75f, 357.277f, +596.938f, 361.25f, 596.746f, 361.25f, 596.746f, 363, 594.738f, 365.246f, 595.75f, 365.246f, +595.75f, 367.398f, 599.578f, 374.25f, 597.75f, 374.25f, 597.75f, 375.758f, 600.02f, 385.25f, +600.75f, 385.25f, 600.75f, 385.879f, 603.316f, 386.32f, 605.078f, 390.246f, 605.746f, 393.801f, +606.398f, 366.246f, 653.746f, 366.246f, 653.746f, 373.777f, 654.578f, 365.246f, 667.746f, 365.246f, +667.746f, 362.34f, 675.477f, 374.879f, 659.418f, 377.246f, 657.75f, 379.719f, 656.34f, 380.82f, +653.918f, 379.246f, 653.746f, 377.301f, 654.359f, 375.32f, 651.938f, 377.246f, 651.746f, 378.398f, +651.5f, 392.699f, 635, 396.25f, 623.746f, 400.18f, 612.559f, 406.777f, 608.156f, 413.246f, +601.746f, 420.418f, 594.957f, 419.246f, 568.746f, 419.246f, 568.746f, 419.098f, 558.656f, 425.25f, +546.746f, 425.25f, 546.746f, 427.898f, 542.816f, 423.246f, 522.746f, 423.246f, 522.746f, 421.078f, +520.379f, 422.246f, 519.746f, 422.246f, 519.746f, 423.719f, 518.18f, 431.246f, 503.75f, 431.246f, +503.75f, 429.219f, 503.879f, 433.246f, 499.746f, 433.246f, 499.746f, 438.898f, 493.316f, 432.246f, +496.75f, 432.246f, 496.75f, 425.258f, 498.379f, 433.246f, 487.75f, 433.246f, 487.75f, 434.277f, +485.617f, 424.246f, 490.75f, 424.246f, 490.75f, 414.258f, 491.34f, 427.25f, 483.75f, 427.25f, +483.75f, 436.48f, 475.5f, 424.246f, 480.746f, 424.246f, 480.746f, 418.879f, 482.316f, 422.246f, +474.75f, 422.246f, 474.75f, 425.918f, 473.078f, 445.246f, 465.75f, 445.246f, 465.75f, 445.277f, +461.195f, 442.246f, 455.746f, 442.246f, 455.746f, 442.418f, 451.297f, 440.25f, 447.746f, 440.25f, +447.746f, 438.68f, 438.535f, 438.25f, 437.75f, 438.25f, 437.75f, 433.398f, 437.438f, 425.25f, +422.746f, 425.25f, 422.746f, 423.277f, 419.398f, 412.246f, 405.746f, 412.246f, 405.746f, 409.859f, +398.496f, 390.246f, 406.75f, 390.246f, 406.75f, 382.801f, 402.676f, 385.25f, 406.75f, 385.25f, +406.75f, 384.559f, 408.836f, 390.246f, 415.75f, 390.246f, 415.75f, 397.539f, 418.297f, 394.25f, +429.746f, 394.25f, 429.746f, 399.078f, 431.719f, 386.758f, 434.797f, 387.246f, 435.75f, 387.199f, +437.438f, 393.25f, 438.746f, 393.25f, 438.746f, 402.379f, 441.176f, 397.246f, 443.75f, 397.246f, +443.75f, 396.879f, 448.219f, 400.246f, 454.75f, 400.246f, 454.75f, 412.938f, 455.258f, 400.246f, +472.75f, 400.246f, 472.75f, 388.301f, 481.438f, 387.246f, 487.75f, 387.246f, 487.75f, 401.059f, +496.84f, 392.039f, 510.477f, 392.25f, 514.75f, 392.48f, 518.398f, 394.25f, 541.746f, 394.25f, +541.746f, 391.598f, 548.977f, 388.246f, 563.746f, 388.246f, 563.746f, 390.719f, 569.656f, 399.246f, +583.746f, 399.246f, 583.746f, 401.938f, 588.137f, 411.621f, 593.418f, 409.246f, 596.746f, 406.777f, +600.02f, 398.246f, 597.75f, 398.246f, 597.75f, 389.621f, 599.578f, 390.246f, 593.75f, 390.246f, +593.75f, 388.52f, 592.758f, 387.246f, 587.746f, 387.246f, 587.746f, 386.848f, 578.531f, 377.246f, +571.75f, 377.246f, 571.75f, 364.758f, 564.816f, 375.246f, 560.75f, 375.246f, 560.75f, 381.48f, +553.156f, 370.25f, 552.746f, 370.25f, 552.746f, 358.598f, 554.918f, 367.246f, 543.746f, 367.246f, +543.746f, 379.5f, 529.617f, 376.246f, 526.746f, 376.246f, 526.746f, 364.98f, 525.438f, 379.246f, +515.746f, 379.246f, 515.746f, 379.242f, 515.742f, 377.961f, 517.52f, 378.246f, 515.746f, 378.398f, +513.559f, 381.699f, 508.938f, 382.25f, 506.746f, 383.461f, 504.539f, 379.246f, 504.746f, 379.246f, +504.746f, 379.719f, 493.758f, 363.25f, 498.75f, 363.25f, 498.75f, 363.25f, 498.75f, 362.777f, +498.379f, 361.25f, 497.746f, 359.258f, 497.938f, 346.938f, 498.816f, 340.25f, 500.746f, 334.18f, +503.656f, 326.25f, 503.75f, 326.25f, 503.75f, 326.25f, 503.75f, 322.301f, 501.68f, 314.25f, +501.75f, 305.578f, 502.117f, 297.246f, 498.75f, 297.246f, 498.75f, 291.937f, 499.477f, 301.398f, +504.316f, 301.246f, 503.75f, 301.84f, 503.879f, 308, 510.039f, 299.246f, 509.75f, 275.223f, +507.578f, 263.25f, 518.75f, 263.25f, 518.75f, 261.137f, 520.379f, 258.246f, 523.75f, 258.246f, +523.75f, 247.277f, 525.656f, 260.25f, 509.75f, 260.25f, 509.75f, 261.137f, 508.277f, 259.25f, +506.746f, 259.25f, 506.746f, 258.719f, 508.938f, 250.25f, 514.75f, 250.25f, 514.75f, 247.047f, +515.949f, 245.547f, 517.414f, 243.246f, 519.746f, 10, 0, 0.3f, 0, 0, +0.3f, 0, 0, 7, 216.25f, 532.746f, 216.25f, 532.742f, 229.457f, 526.758f, +232.246f, 523.75f, 235.18f, 520.598f, 250.25f, 507.75f, 250.25f, 507.75f, 250.25f, 507.75f, +244.637f, 510.258f, 242.246f, 511.746f, 238.918f, 514.219f, 227.25f, 522.746f, 227.25f, 522.746f, +227.25f, 522.746f, 222.859f, 529.84f, 216.25f, 532.746f, 10, 0, 0.6f, 0.8f, +0.2f, 0.6f, 0.8f, 0.2f, 6, 153.246f, 566.75f, 153.258f, 567.398f, 152.684f, +570.379f, 152.25f, 570.746f, 151.332f, 573.977f, 141.25f, 575.75f, 141.25f, 575.75f, 141.207f, +574.098f, 141.148f, 572.34f, 141.25f, 570.746f, 141.25f, 570.746f, 146.621f, 564.469f, 153.246f, +566.75f, 10, 0, 0.4f, 0.6f, 0, 0.4f, 0.6f, 0, 6, +153.246f, 567.75f, 152.395f, 567.281f, 152.871f, 570.461f, 152.25f, 570.746f, 151.555f, 573.977f, +141.25f, 575.75f, 141.25f, 575.75f, 141.207f, 574.207f, 141.148f, 572.449f, 141.25f, 570.746f, +141.25f, 570.746f, 145.961f, 565.02f, 153.246f, 567.75f, 10, 0, 0, 0, +0, 0, 0, 0, 6, 148.246f, 567.75f, 147.371f, 567.297f, 146.812f, +568.551f, 147.25f, 569.75f, 146.812f, 571.645f, 147.371f, 572.898f, 148.246f, 572.746f, 148.746f, +572.898f, 149.305f, 571.645f, 149.246f, 569.75f, 149.305f, 568.551f, 148.746f, 567.297f, 148.246f, +567.75f, 10, 0, 0, 0, 0, 0, 0, 0, 17, +98.2461f, 459.75f, 98.2422f, 459.75f, 91.7383f, 448.438f, 119.25f, 454.75f, 119.25f, 454.75f, +134.418f, 456.355f, 137.246f, 458.746f, 138.379f, 458.117f, 147.582f, 454.891f, 150.246f, 453.746f, +158.18f, 452.398f, 167.25f, 463.75f, 167.25f, 463.75f, 167.25f, 463.75f, 172.477f, 474.949f, +175.25f, 474.75f, 178.637f, 474.949f, 175.25f, 472.75f, 175.25f, 472.75f, 175.25f, 472.75f, +167.859f, 462.078f, 168.25f, 460.746f, 168.25f, 460.742f, 162.578f, 438.316f, 145.25f, 437.75f, +145.25f, 437.75f, 127.215f, 436.391f, 128.25f, 429.746f, 128.25f, 429.742f, 138.379f, 432.598f, +141.25f, 429.746f, 141.25f, 429.742f, 152.898f, 430.398f, 144.246f, 423.746f, 136.25f, 410.75f, +136.25f, 410.75f, 136.773f, 406.289f, 125.25f, 409.746f, 114.84f, 413.898f, 103.25f, 427.746f, +103.25f, 427.746f, 103.25f, 427.742f, 85.9648f, 444.094f, 98.2461f, 459.75f, 10, 0, +0.9f, 0.6f, 0.6f, 0.9f, 0.6f, 0.6f, 14, 96.25f, 454.75f, 96.25f, +454.75f, 94.3789f, 444.477f, 135.25f, 455.746f, 135.25f, 455.742f, 139.699f, 455.918f, 142.246f, +454.75f, 144.977f, 454.156f, 158.18f, 451.078f, 160.246f, 452.75f, 160.246f, 452.75f, 152.457f, +437.438f, 139.246f, 438.746f, 139.246f, 438.742f, 125.18f, 437.438f, 125.25f, 431.746f, 125.25f, +431.742f, 130.02f, 424.238f, 135.25f, 421.75f, 135.25f, 421.75f, 138.379f, 418.957f, 138.246f, +415.75f, 137.5f, 411.918f, 134.418f, 410.156f, 132.246f, 409.746f, 130.02f, 408.398f, 126.5f, +411.918f, 124.25f, 411.746f, 122.977f, 411.918f, 113.738f, 418.957f, 109.246f, 423.746f, 104.059f, +429.516f, 94.8164f, 442.719f, 95.25f, 445.746f, 95.6992f, 448.879f, 96.25f, 454.75f, 96.25f, +454.75f, 10, 0, 0.7f, 0.4f, 0.4f, 0.7f, 0.4f, 0.4f, 13, +100.246f, 435.75f, 102.957f, 431.496f, 106.477f, 426.879f, 109.246f, 423.746f, 113.738f, 418.957f, +122.977f, 411.918f, 124.25f, 411.746f, 126.5f, 411.918f, 130.02f, 408.398f, 132.246f, 409.746f, +134.418f, 410.156f, 137.5f, 411.918f, 138.246f, 415.75f, 138.379f, 418.957f, 135.25f, 421.75f, +135.25f, 421.75f, 131.926f, 423.285f, 128.91f, 427.125f, 127.246f, 429.746f, 127.246f, 429.742f, +127.379f, 426.879f, 121.246f, 427.746f, 115.938f, 428.637f, 110.219f, 431.719f, 108.25f, 434.746f, +106.699f, 438.758f, 104.059f, 441.398f, 106.25f, 437.75f, 107.578f, 433.477f, 110.219f, 429.516f, +112.25f, 428.75f, 113.738f, 428.637f, 113.297f, 427.316f, 110.246f, 427.746f, 108.02f, 428.195f, +104.938f, 428.637f, 100.246f, 434.746f, 10, 0, 0.6f, 0.15f, 0, 0.6f, +0.15f, 0, 20, 97.25f, 458.746f, 97.25f, 458.746f, 99.2187f, 473.957f, 100.246f, +478.746f, 100.246f, 478.746f, 99.6563f, 485.84f, 102.25f, 490.75f, 104.938f, 495.078f, 107.137f, +501.898f, 110.246f, 507.75f, 113.738f, 513.777f, 113.957f, 518.18f, 118.25f, 519.746f, 122.758f, +521.699f, 129.359f, 531.156f, 132.246f, 532.746f, 135.52f, 533.359f, 135.25f, 532.746f, 135.25f, +532.746f, 135.25f, 532.742f, 142.777f, 548.758f, 157.25f, 544.746f, 157.25f, 544.746f, 139.918f, +547.438f, 157.25f, 557.746f, 157.25f, 557.746f, 152.02f, 556.566f, 155.246f, 564.75f, 158.07f, +569.402f, 157.52f, 561.957f, 145.25f, 548.746f, 145.25f, 548.746f, 139.918f, 539.52f, 134.25f, +535.746f, 128.477f, 532.918f, 115.277f, 525.219f, 114.25f, 520.75f, 112.637f, 516.859f, 109.117f, +510.477f, 107.25f, 508.746f, 104.719f, 506.957f, 101.637f, 502.34f, 101.25f, 498.75f, 101.25f, +498.75f, 99.8789f, 494.199f, 98.2461f, 492.75f, 96.7969f, 491.559f, 96.5781f, 488.039f, 96.25f, +485.75f, 96.5781f, 483.637f, 94.3789f, 480.559f, 94.2461f, 477.746f, 94.2461f, 477.742f, 95.4766f, +457.016f, 95.25f, 454.75f, 97.25f, 458.746f, 10, 0, 1, 1, 1, +1, 1, 1, 6, 88.2461f, 453.746f, 88.2461f, 453.742f, 85.5781f, 455.477f, +80.25f, 448.75f, 80.25f, 448.75f, 88.7695f, 412.578f, 89.2461f, 410.75f, 89.2461f, 410.75f, +89.9766f, 413.348f, 88.2461f, 421.75f, 87.1172f, 429.188f, 86.25f, 442.746f, 86.25f, 442.746f, +88.2461f, 453.746f, 10, 0, 0.6f, 0.15f, 0, 0.6f, 0.15f, 0, +13, 111.246f, 520.75f, 111.246f, 520.75f, 92.1797f, 517.078f, 92.2461f, 484.746f, 91.25f, +457.75f, 91.25f, 457.75f, 90.418f, 485.84f, 89.2461f, 487.75f, 87.7773f, 489.359f, 92.1797f, +501.68f, 88.2461f, 494.75f, 88.2461f, 494.75f, 73.2578f, 479.68f, 82.2461f, 456.746f, 82.2422f, +456.746f, 83.707f, 452.727f, 80.25f, 457.75f, 80.25f, 457.75f, 75.3477f, 471.648f, 76.2461f, +478.746f, 76.2422f, 478.746f, 76.7773f, 481.109f, 79.25f, 483.75f, 79.25f, 483.75f, 88.3281f, +497.059f, 91.25f, 499.746f, 91.25f, 499.742f, 93.2773f, 515.43f, 110.246f, 520.75f, 110.246f, +520.75f, 116.488f, 523.68f, 111.246f, 520.75f, 10, 0, 0, 0, 0, +0, 0, 0, 28, 265.246f, 593.75f, 265.605f, 593.809f, 265.594f, 594.875f, +266.246f, 594.746f, 267.496f, 595.441f, 267.676f, 596.617f, 268.246f, 597.75f, 269.207f, 598.93f, +269.418f, 600.617f, 270.25f, 602.75f, 270.359f, 603.027f, 270.387f, 604.078f, 270.25f, 604.75f, +268.754f, 607.531f, 267.98f, 610.227f, 266.246f, 612.746f, 266.098f, 613.391f, 265.812f, 614.262f, +265.246f, 614.746f, 265.082f, 616.441f, 263.699f, 617.535f, 263.25f, 618.746f, 262.434f, 619.469f, +263.012f, 620.488f, 262.25f, 620.746f, 261.238f, 620.695f, 259.645f, 621.332f, 259.25f, 619.75f, +258.742f, 617.359f, 259.852f, 614.586f, 261.25f, 611.75f, 260.059f, 611.137f, 260.426f, 610.125f, +260.25f, 609.746f, 261.375f, 605.313f, 260.055f, 601.625f, 259.25f, 597.75f, 259.191f, 597.691f, +259.57f, 597.473f, 259.25f, 597.75f, 258.195f, 594.449f, 256.598f, 591.762f, 254.246f, 588.75f, +253.762f, 588.051f, 252.805f, 587.043f, 252.25f, 585.746f, 251.852f, 585.008f, 251.402f, 583.945f, +251.25f, 582.75f, 247.898f, 579.801f, 245.426f, 575.57f, 242.246f, 571.75f, 242.043f, 570.594f, +242.363f, 569.262f, 243.246f, 568.746f, 243.863f, 568.527f, 244.918f, 569.656f, 245.246f, 570.746f, +245.859f, 571.352f, 246.25f, 572.066f, 247.246f, 572.746f, 246.937f, 572.969f, 246.738f, 573.43f, +247.246f, 573.75f, 249.785f, 576.145f, 251.621f, 579.375f, 254.246f, 581.746f, 256.465f, 582.34f, +258.152f, 583.438f, 260.25f, 584.75f, 260.414f, 584.75f, 260.992f, 584.477f, 261.25f, 584.75f, +263.238f, 585.984f, 263.238f, 588.223f, 263.25f, 590.746f, 263.41f, 591.297f, 263.625f, 592.746f, +265.246f, 593.75f, 10, 0, 0, 0, 0, 0, 0, 0, +19, 255.246f, 598.746f, 255.289f, 598.414f, 255.117f, 598.879f, 255.246f, 598.746f, 255.418f, +599.477f, 255.859f, 599.68f, 256.246f, 599.75f, 256.16f, 600.277f, 255.98f, 600.695f, 256.246f, +600.75f, 258.695f, 603.543f, 258.977f, 606.867f, 258.246f, 609.746f, 258.965f, 610.82f, 259.031f, +612.207f, 258.246f, 612.746f, 257.625f, 615.012f, 257.414f, 617.129f, 256.246f, 618.746f, 255.457f, +620.223f, 253.723f, 621.59f, 252.25f, 619.75f, 251.75f, 619.719f, 251.398f, 618.852f, 251.25f, +617.75f, 251.773f, 617.887f, 252.09f, 617.727f, 252.25f, 617.75f, 251.941f, 617.281f, 251.34f, +617.035f, 251.25f, 616.746f, 251.301f, 615.09f, 250.25f, 613.43f, 251.25f, 611.75f, 251.793f, +610.176f, 252.695f, 608.133f, 253.246f, 605.746f, 252.082f, 603.852f, 253.219f, 601.156f, 251.25f, +598.746f, 251.141f, 598.93f, 251.148f, 598.508f, 251.25f, 598.746f, 251.605f, 597.75f, 252.051f, +597.305f, 252.25f, 596.746f, 252.809f, 596.848f, 253.191f, 596.848f, 253.246f, 596.746f, 254.047f, +597.383f, 254.484f, 597.918f, 255.246f, 598.746f, 10, 0, 0, 0, 0, +0, 0, 0, 21, 324.246f, 609.746f, 325.773f, 607.703f, 326.094f, 604.629f, +324.246f, 602.75f, 324.445f, 599.457f, 328.129f, 601.637f, 330.25f, 601.746f, 330.32f, 602.645f, +330.57f, 603.023f, 331.246f, 602.75f, 332.043f, 603.047f, 332.789f, 604.18f, 334.246f, 603.746f, +334.438f, 605.691f, 336.238f, 606.465f, 337.25f, 607.746f, 338.844f, 612.047f, 338.195f, 616.746f, +335.246f, 620.746f, 335.129f, 620.598f, 335.371f, 621.164f, 335.246f, 621.75f, 334.402f, 623.996f, +332.125f, 624.34f, 330.25f, 624.75f, 328.703f, 629.359f, 327.977f, 633.793f, 326.25f, 637.75f, +324.266f, 638.133f, 323.496f, 640.047f, 322.246f, 640.746f, 320.559f, 641.629f, 319.934f, 639.891f, +320.246f, 638.746f, 319.988f, 638.516f, 320.484f, 638.27f, 320.246f, 637.75f, 320.215f, 637.688f, +319.926f, 637.566f, 320.246f, 637.75f, 319.93f, 637.27f, 320.172f, 637.125f, 320.246f, 636.746f, +319.309f, 636.074f, 317.742f, 635.551f, 317.25f, 634.746f, 316.371f, 630.211f, 319.199f, 626.773f, +321.246f, 623.746f, 321.684f, 622.004f, 320.875f, 620.605f, 320.246f, 619.75f, 319.559f, 618.512f, +319.676f, 617.273f, 320.246f, 616.746f, 320.809f, 613.766f, 322.559f, 611.855f, 324.246f, 609.746f, +10, 0, 0, 0, 0, 0, 0, 0, 73, 283.25f, +589.75f, 281.734f, 587.41f, 277.98f, 584.586f, 281.25f, 582.75f, 281.402f, 582.324f, 281.809f, +582.32f, 282.25f, 582.75f, 284.223f, 584.188f, 286.426f, 585.18f, 289.246f, 585.746f, 289.242f, +585.852f, 289.543f, 585.34f, 290.246f, 585.746f, 291.727f, 586.289f, 293.938f, 586.227f, 295.25f, +587.746f, 299.383f, 587.453f, 303.305f, 588.68f, 307.25f, 589.75f, 308.309f, 590.609f, 309.707f, +591.227f, 311.246f, 591.75f, 312.543f, 592.41f, 313.867f, 593.434f, 315.25f, 594.746f, 315.234f, +594.836f, 315.625f, 594.738f, 316.25f, 594.746f, 315.875f, 595.688f, 316.934f, 595.828f, 317.25f, +596.746f, 317.305f, 596.766f, 317.141f, 597.203f, 317.25f, 597.75f, 319.641f, 599.105f, 320.652f, +601.328f, 319.25f, 603.746f, 319.051f, 604.578f, 318.777f, 605.258f, 318.25f, 605.746f, 316.961f, +606.781f, 315.75f, 605.844f, 314.25f, 605.746f, 314.422f, 605.488f, 313.621f, 605.676f, 313.246f, +605.746f, 312.25f, 604.977f, 310.785f, 605.621f, 310.246f, 604.75f, 308.344f, 604.371f, 306.977f, +604.188f, 305.25f, 603.746f, 305.07f, 603.684f, 304.215f, 603.789f, 304.25f, 602.75f, 303.891f, +603.246f, 303.727f, 603.504f, 303.25f, 603.746f, 301.512f, 603.043f, 300.125f, 602.809f, 298.246f, +600.75f, 298.582f, 600.801f, 298.098f, 600.996f, 298.246f, 600.75f, 296.867f, 599.961f, 296.422f, +598.602f, 295.25f, 597.75f, 294.992f, 597.727f, 294.602f, 597.914f, 294.25f, 597.75f, 293.68f, +597.297f, 293.277f, 596.59f, 292.25f, 595.75f, 292.207f, 595.848f, 291.766f, 596.207f, 292.25f, +596.746f, 292.07f, 598.629f, 292.789f, 600.594f, 292.25f, 602.75f, 294.441f, 605.43f, 297.211f, +607.574f, 299.246f, 610.75f, 299.215f, 612.961f, 299.977f, 615.32f, 300.246f, 617.75f, 299.84f, +617.816f, 299.523f, 618.625f, 299.246f, 618.746f, 299.043f, 619.945f, 300.039f, 621.117f, 299.246f, +621.75f, 297.566f, 623.238f, 296.145f, 622.273f, 295.25f, 620.746f, 293.215f, 620.27f, 290.945f, +619.508f, 289.246f, 620.746f, 288.102f, 621.73f, 287.465f, 622.727f, 286.246f, 623.746f, 285.504f, +625.32f, 285.871f, 626.898f, 286.246f, 628.75f, 285.953f, 628.762f, 285.609f, 628.91f, 285.25f, +628.75f, 285.609f, 629.207f, 285.852f, 629.352f, 286.246f, 629.746f, 285.223f, 630.188f, 284.918f, +631.352f, 284.25f, 631.746f, 284.133f, 632.898f, 283.391f, 633.871f, 282.25f, 633.75f, 280.238f, +634.965f, 278.395f, 632.859f, 276.246f, 632.75f, 275.746f, 632.758f, 275.23f, 633.902f, 274.25f, +634.746f, 274.043f, 634.496f, 273.27f, 634.531f, 273.25f, 633.75f, 272.113f, 633.688f, 271.465f, +633.559f, 270.25f, 633.75f, 268.852f, 632.855f, 267.449f, 631.652f, 266.246f, 630.75f, 264.188f, +629.77f, 263.137f, 628.188f, 262.25f, 626.75f, 260.914f, 625.469f, 260.762f, 622.813f, 262.25f, +622.75f, 264.352f, 621.547f, 265.785f, 624.523f, 268.246f, 623.746f, 268.293f, 624.105f, 268.52f, +623.766f, 268.246f, 623.746f, 268.824f, 623.219f, 269.066f, 623.469f, 269.246f, 623.746f, 270.223f, +622.656f, 271.504f, 622.285f, 272.25f, 621.75f, 273.602f, 620.332f, 275.523f, 620.793f, 276.246f, +619.75f, 278.32f, 618.043f, 277.707f, 615.094f, 280.246f, 613.75f, 279.195f, 612.215f, 278.527f, +610.809f, 278.246f, 608.75f, 277.848f, 607.914f, 278.941f, 606.598f, 280.246f, 606.75f, 281.656f, +606.801f, 281.945f, 607.633f, 282.25f, 608.75f, 282.773f, 608.523f, 283.289f, 608.199f, 283.25f, +607.746f, 282.738f, 605.336f, 281.609f, 603.141f, 281.25f, 600.75f, 281.043f, 600.121f, 280.707f, +599.898f, 280.246f, 599.75f, 279.762f, 595.453f, 275.305f, 592.82f, 272.25f, 589.75f, 272.063f, +588.785f, 272.059f, 587.414f, 272.25f, 586.75f, 274.051f, 585.445f, 276.207f, 587.145f, 278.246f, +587.746f, 278.313f, 589.023f, 279.258f, 590.063f, 280.246f, 589.75f, 281.004f, 589.988f, 281.262f, +590.586f, 281.25f, 590.746f, 282, 590.879f, 282.555f, 590.633f, 283.25f, 590.746f, 284.77f, +592.164f, 286.32f, 593.383f, 288.246f, 594.746f, 288.441f, 594.832f, 288.82f, 594.66f, 289.246f, +594.746f, 289.414f, 594.957f, 289.621f, 595.383f, 290.246f, 595.75f, 290.359f, 595.805f, 290.625f, +595.484f, 291.246f, 594.746f, 290.129f, 594.793f, 290.125f, 593.742f, 289.246f, 593.75f, 288.629f, +593.223f, 288.012f, 592.66f, 287.246f, 591.75f, 286.949f, 591.957f, 286.227f, 592.23f, 286.246f, +591.75f, 285.453f, 590.902f, 284.152f, 590.418f, 283.25f, 589.75f, 10, 0, 0, +0, 0, 0, 0, 0, 30, 222.246f, 643.75f, 222.246f, 643.75f, +212.258f, 646.957f, 200.246f, 618.746f, 200.246f, 618.742f, 197.34f, 613, 194.25f, 610.75f, +192.059f, 608.598f, 179.738f, 604.637f, 177.246f, 599.75f, 166.246f, 582.75f, 166.246f, 582.75f, +182.379f, 600.238f, 186.25f, 602.75f, 186.25f, 602.75f, 194.699f, 612.117f, 191.246f, 604.75f, +191.242f, 604.75f, 175.777f, 592.758f, 177.246f, 582.75f, 177.246f, 582.75f, 170.938f, 566.797f, +170.246f, 564.75f, 170.242f, 564.75f, 187.656f, 599.797f, 190.246f, 600.75f, 192.938f, 602.438f, +194.258f, 602.438f, 193.25f, 598.746f, 191.617f, 594.52f, 191.18f, 576.477f, 188.246f, 574.746f, +188.246f, 574.742f, 196.898f, 596.719f, 196.25f, 599.75f, 196.25f, 599.75f, 199.539f, 604.199f, +202.246f, 598.746f, 201.246f, 580.75f, 205.25f, 567.75f, 205.25f, 567.75f, 203.059f, 580, +205.25f, 596.746f, 205.25f, 596.742f, 202.617f, 608.598f, 207.25f, 602.75f, 211.418f, 596.277f, +221.977f, 589.68f, 222.246f, 584.75f, 222.246f, 584.75f, 216.258f, 603.758f, 206.25f, 608.75f, +201.246f, 602.75f, 200.246f, 604.75f, 200.246f, 604.75f, 196.457f, 605.52f, 201.246f, 612.746f, +206.137f, 620.477f, 205.25f, 621.75f, 205.25f, 621.75f, 205.25f, 621.75f, 212.738f, 613.438f, +214.25f, 613.75f, 214.25f, 613.75f, 229.02f, 621.797f, 230.25f, 594.746f, 230.25f, 594.742f, +237.816f, 610.797f, 227.25f, 618.746f, 227.25f, 618.742f, 211.418f, 620.477f, 212.246f, 625.746f, +220.246f, 639.75f, 224.617f, 645.559f, 223.246f, 642.746f, 223.246f, 642.746f, 10, 0, +0, 0, 0, 0, 0, 0, 6, 200.246f, 625.746f, 200.246f, +625.746f, 186.34f, 625.758f, 183.25f, 619.75f, 175.25f, 609.746f, 175.25f, 609.742f, 193.816f, +620.477f, 198.246f, 621.75f, 202.617f, 623.117f, 200.246f, 625.746f, 200.246f, 625.746f, 10, +0, 0, 0, 0, 0, 0, 0, 7, 156.25f, 618.746f, +156.25f, 618.742f, 154.219f, 617.398f, 154.246f, 614.746f, 153.34f, 611.238f, 150.699f, 610.797f, +151.25f, 607.746f, 152.457f, 604.637f, 154.656f, 602, 154.246f, 606.75f, 154.656f, 610.797f, +156.418f, 613, 157.25f, 614.746f, 158.18f, 615.637f, 159.938f, 620.477f, 156.25f, 618.746f, +10, 0, 0, 0, 0, 0, 0, 0, 10, 146.25f, +551.75f, 146.25f, 551.75f, 137.5f, 555.797f, 134.25f, 559.746f, 130.457f, 563.719f, 130.957f, +558.035f, 125.25f, 558.75f, 119.187f, 558.922f, 120.246f, 576.746f, 120.246f, 576.746f, 116.246f, +567.75f, 116.246f, 567.75f, 114.617f, 552.277f, 123.25f, 554.746f, 127.715f, 556.207f, 129.137f, +554.477f, 127.246f, 553.75f, 125.617f, 552.719f, 133.539f, 552.277f, 130.25f, 550.746f, 127.379f, +548.758f, 143.219f, 554.477f, 140.25f, 542.75f, 146.25f, 551.75f, 10, 0, 0, +0, 0, 0, 0, 0, 8, 133.246f, 535.746f, 133.246f, 535.746f, +115.938f, 530.719f, 112.25f, 541.746f, 112.25f, 541.742f, 106.699f, 538.637f, 109.246f, 535.746f, +111.539f, 532.039f, 113.25f, 531.75f, 113.25f, 531.75f, 113.25f, 531.75f, 118.797f, 530.277f, +118.25f, 529.75f, 117.477f, 528.52f, 115.246f, 524.746f, 115.246f, 524.746f, 115.242f, 524.746f, +126.059f, 531.379f, 133.246f, 535.746f, 10, 0, 1, 1, 1, 1, +1, 1, 24, 384.25f, 449.746f, 383.648f, 447.191f, 381.813f, 446.309f, 379.246f, +445.746f, 377.609f, 446.629f, 374.754f, 450.047f, 372.25f, 447.746f, 372.156f, 448.305f, 371.301f, +448.371f, 371.25f, 448.75f, 370.41f, 450.086f, 370.711f, 451.238f, 370.25f, 451.746f, 369.734f, +453.516f, 368.953f, 455.016f, 369.25f, 456.746f, 371.145f, 457.359f, 371.801f, 459.457f, 371.25f, +461.75f, 371.203f, 461.68f, 370.73f, 461.895f, 371.25f, 462.746f, 371.156f, 462.633f, 371.504f, +462.883f, 372.25f, 462.746f, 371.652f, 463.031f, 371.492f, 462.773f, 371.25f, 462.746f, 370.699f, +462.91f, 370.836f, 463.613f, 371.25f, 463.75f, 371.621f, 465.957f, 373.836f, 466.25f, 375.246f, +464.746f, 375.602f, 465.559f, 376.16f, 465.348f, 376.246f, 465.75f, 376.586f, 466.016f, 377.031f, +466.594f, 377.246f, 466.746f, 377.82f, 468.266f, 379.613f, 467.047f, 380.25f, 467.746f, 381.672f, +468.629f, 382.844f, 469.398f, 384.25f, 468.75f, 386.02f, 467.621f, 387.898f, 466.285f, 389.246f, +464.746f, 389.848f, 463.453f, 390.113f, 462.047f, 390.246f, 460.746f, 390.008f, 460.281f, 388.488f, +460.668f, 388.246f, 459.75f, 387.402f, 457.723f, 389.414f, 457.152f, 390.246f, 455.746f, 390.465f, +455.297f, 390.176f, 454.961f, 390.246f, 454.75f, 389.375f, 454.711f, 388.516f, 454.922f, 388.246f, +454.75f, 389.734f, 450.91f, 386.703f, 450.164f, 384.25f, 449.746f, 10, 0, 1, +1, 1, 1, 1, 1, 11, 373.25f, 427.746f, 373.551f, 429.891f, +371.789f, 431.82f, 373.25f, 433.746f, 373.27f, 433.551f, 373.41f, 433.305f, 373.25f, 433.746f, +373.707f, 433.305f, 373.852f, 433.551f, 374.25f, 433.746f, 375.645f, 431.258f, 379.66f, 430.238f, +379.246f, 426.75f, 379.48f, 426.617f, 378.285f, 425.605f, 379.246f, 424.75f, 377.285f, 423.414f, +377.223f, 420.809f, 376.246f, 418.746f, 374.836f, 419.051f, 373.504f, 419.449f, 372.25f, 419.75f, +372.625f, 421.691f, 372.496f, 423.543f, 373.25f, 424.75f, 373.879f, 425.766f, 373.563f, 426.949f, +373.25f, 427.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +15, 190.246f, 437.75f, 190.246f, 437.75f, 172.195f, 426.727f, 187.246f, 443.75f, 197.34f, +454.156f, 208.25f, 460.746f, 208.25f, 460.746f, 208.25f, 460.742f, 219.777f, 465.156f, 223.246f, +466.746f, 227.699f, 467.797f, 244.418f, 473.52f, 248.25f, 473.746f, 251.457f, 474.398f, 262.02f, +478.797f, 269.246f, 474.75f, 276.977f, 470, 286.246f, 464.746f, 286.246f, 464.746f, 286.246f, +464.742f, 267.738f, 474.398f, 264.246f, 471.746f, 259.816f, 469.117f, 251.898f, 469.559f, 245.246f, +465.75f, 245.246f, 465.75f, 229.02f, 461.195f, 225.25f, 458.746f, 221.977f, 456.797f, 210.539f, +444.035f, 209.246f, 444.746f, 207.02f, 445.797f, 209.219f, 446.238f, 210.246f, 449.746f, 211.859f, +452.398f, 209.656f, 454.156f, 201.246f, 446.75f, 192.059f, 440.078f, 190.246f, 437.75f, 190.246f, +437.75f, 10, 0, 0, 0, 0, 0, 0, 0, 11, +199.246f, 444.746f, 199.246f, 444.742f, 200.434f, 458.785f, 210.246f, 456.746f, 210.246f, 456.746f, +218.809f, 461.539f, 222.246f, 463.75f, 222.246f, 463.75f, 230.758f, 465.578f, 232.246f, 466.746f, +252.523f, 475.824f, 268.715f, 470.855f, 269.246f, 471.746f, 269.918f, 473.316f, 291.504f, 465.488f, +295.25f, 460.746f, 295.906f, 460.508f, 284.219f, 467.152f, 273.25f, 468.75f, 264.453f, 471.008f, +240.691f, 468.961f, 228.25f, 462.746f, 225.422f, 461.211f, 215.582f, 454.848f, 213.246f, 454.75f, +210.016f, 455.094f, 199.246f, 444.746f, 199.246f, 444.746f, 10, 0, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 11, 194.25f, 416.746f, 194.25f, 416.742f, 177.977f, +418.957f, 196.25f, 420.746f, 196.25f, 420.742f, 216.258f, 422.918f, 220.246f, 428.75f, 220.246f, +428.75f, 235.617f, 438.758f, 238.25f, 438.746f, 241.777f, 439.637f, 274.777f, 447.559f, 275.246f, +449.746f, 275.656f, 452.836f, 281.816f, 452.836f, 283.25f, 451.746f, 285.34f, 451.078f, 284.457f, +449.758f, 281.25f, 448.75f, 278.297f, 447.996f, 243.977f, 429.957f, 237.25f, 428.75f, 229.898f, +427.316f, 217.137f, 418.957f, 212.246f, 417.75f, 206.578f, 416.316f, 194.25f, 416.746f, 194.25f, +416.746f, 10, 0, 0, 0, 0, 0, 0, 0, 11, +216.25f, 424.75f, 216.25f, 424.75f, 206.73f, 425.367f, 216.25f, 426.75f, 216.25f, 426.75f, +225.887f, 430.035f, 228.25f, 432.75f, 228.25f, 432.75f, 235.801f, 438.145f, 237.25f, 438.746f, +238.957f, 438.594f, 254.313f, 442.652f, 254.246f, 443.75f, 254.762f, 445.355f, 292.234f, 459.191f, +297.246f, 455.746f, 300.301f, 453.371f, 289.406f, 455.219f, 279.246f, 450.75f, 277.32f, 449.684f, +240.082f, 433.637f, 236.25f, 432.75f, 232.871f, 432.285f, 226.34f, 428.008f, 223.246f, 427.746f, +220.934f, 426.656f, 216.25f, 424.75f, 216.25f, 424.75f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 207.25f, 421.75f, 207.25f, 421.75f, 213.18f, +422.477f, 212.246f, 420.746f, 210.539f, 418.957f, 208.25f, 419.75f, 208.25f, 419.75f, 207.25f, +421.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +199.246f, 420.746f, 199.246f, 420.742f, 205.258f, 420.719f, 204.25f, 418.746f, 202.617f, 417.195f, +200.246f, 417.75f, 200.246f, 417.75f, 199.246f, 420.746f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 188.246f, 418.746f, 188.246f, 418.742f, 193.816f, +418.957f, 192.25f, 416.746f, 191.18f, 415.438f, 188.246f, 416.746f, 188.246f, 416.746f, 188.246f, +418.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +179.246f, 417.75f, 179.246f, 417.75f, 185.457f, 418.078f, 184.25f, 416.746f, 182.816f, 414.559f, +180.246f, 415.75f, 180.246f, 415.75f, 179.246f, 417.75f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 222.246f, 460.746f, 222.246f, 460.742f, 226.816f, +461.195f, 225.25f, 459.75f, 224.18f, 457.676f, 220.246f, 457.75f, 220.246f, 457.75f, 222.246f, +460.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +211.246f, 454.75f, 211.246f, 454.75f, 218.133f, 457.391f, 215.25f, 453.746f, 214.059f, 451.957f, +211.246f, 452.75f, 211.246f, 452.75f, 211.246f, 454.75f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 198.246f, 449.746f, 198.246f, 449.742f, 204.379f, +450.195f, 203.25f, 448.75f, 201.738f, 446.676f, 199.246f, 447.746f, 199.246f, 447.746f, 198.246f, +449.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +190.246f, 442.746f, 190.246f, 442.742f, 196.02f, 443.598f, 194.25f, 441.75f, 193.379f, 440.078f, +190.246f, 440.746f, 190.246f, 440.746f, 190.246f, 442.746f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 183.25f, 437.75f, 183.25f, 437.75f, 188.539f, +438.316f, 187.246f, 436.746f, 185.898f, 434.797f, 183.25f, 435.75f, 183.25f, 435.75f, 183.25f, +437.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +226.25f, 430.75f, 226.25f, 430.75f, 233.422f, 431.426f, 231.246f, 428.75f, 229.906f, 426.742f, +226.25f, 427.746f, 226.25f, 427.746f, 226.25f, 430.75f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 237.25f, 435.75f, 237.25f, 435.75f, 244.863f, +436.707f, 243.246f, 434.746f, 241.348f, 432.02f, 238.25f, 432.75f, 238.25f, 432.75f, 237.25f, +435.75f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +249.25f, 440.746f, 249.25f, 440.742f, 256.742f, 441.547f, 255.246f, 438.746f, 253.227f, 436.859f, +249.25f, 437.75f, 249.25f, 437.75f, 249.25f, 440.746f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 260.25f, 445.746f, 260.25f, 445.746f, 268.18f, +446.824f, 266.246f, 444.746f, 264.668f, 442.141f, 261.25f, 443.75f, 261.25f, 443.75f, 260.25f, +445.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +230.25f, 465.75f, 230.25f, 465.75f, 237.82f, 466.625f, 236.25f, 464.746f, 234.309f, 461.941f, +230.25f, 461.75f, 230.25f, 461.75f, 230.25f, 465.75f, 10, 0, 0, 0, +0, 0, 0, 0, 4, 241.25f, 469.746f, 241.25f, 469.746f, 248.82f, +470.145f, 247.246f, 467.746f, 245.309f, 465.461f, 240.25f, 465.75f, 240.25f, 465.75f, 241.25f, +469.746f, 10, 0, 0, 0, 0, 0, 0, 0, 4, +216.25f, 425.746f, 216.25f, 425.746f, 221.977f, 425.996f, 220.246f, 423.746f, 219.34f, 422.477f, +216.25f, 423.746f, 216.25f, 423.746f, 216.25f, 425.746f, 10, 0, 0.6f, 0.15f, +0, 0.6f, 0.15f, 0, 5, 135.25f, 534.75f, 135.25f, 534.75f, 130.898f, +525, 130.25f, 521.746f, 130.25f, 521.742f, 131.34f, 531.156f, 132.246f, 533.746f, 133.977f, +535.559f, 135.25f, 534.75f, 135.25f, 534.75f, 10, 0, 0.6f, 0.15f, 0, +0.6f, 0.15f, 0, 5, 115.246f, 519.746f, 115.242f, 519.742f, 111.977f, 503.438f, +112.25f, 500.746f, 112.25f, 500.746f, 111.098f, 513.117f, 111.246f, 514.75f, 111.977f, 515.758f, +115.246f, 519.746f, 115.246f, 519.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 6, 138.246f, 601.746f, 138.246f, 597.75f, 135.25f, 597.75f, 135.25f, +597.75f, 151.359f, 583.738f, 152.25f, 575.75f, 152.25f, 575.75f, 152.898f, 584.398f, 138.246f, +601.746f, 10, 0, 0, 0, 0, 0, 0, 0, 28, +143.246f, 599.75f, 142.285f, 600.402f, 142.527f, 601.223f, 142.246f, 601.746f, 141.188f, 602.078f, +143.508f, 602.141f, 143.246f, 602.75f, 142.836f, 604.254f, 143.039f, 604.277f, 143.246f, 605.746f, +142.844f, 606.34f, 143.488f, 608.031f, 144.246f, 608.75f, 145.504f, 610.332f, 144.047f, 613.559f, +146.25f, 615.75f, 146.188f, 615.582f, 146.598f, 616.191f, 147.25f, 616.746f, 147.637f, 617.711f, +148.941f, 618.246f, 150.246f, 618.746f, 150.336f, 619.461f, 150.113f, 620.371f, 150.246f, 620.746f, +151.523f, 620.141f, 152.891f, 620.285f, 153.246f, 619.75f, 152.715f, 617.027f, 151.254f, 615.137f, +150.246f, 613.75f, 150.344f, 612.527f, 149.84f, 611.828f, 149.246f, 610.75f, 148.059f, 608.336f, +148.266f, 605.207f, 148.246f, 601.746f, 148.07f, 601.992f, 147.73f, 601.906f, 147.25f, 601.746f, +148.129f, 599.277f, 148.77f, 596.859f, 149.246f, 594.746f, 150.141f, 593.387f, 150.66f, 592.402f, +151.25f, 591.75f, 150.945f, 590.625f, 151.059f, 589.711f, 150.246f, 588.75f, 152.848f, 585.754f, +151.41f, 582.84f, 152.25f, 578.75f, 152.922f, 578.27f, 154.785f, 576.164f, 154.246f, 576.746f, +151.512f, 577.297f, 151.387f, 577.734f, 151.25f, 578.75f, 151.031f, 579.25f, 150.668f, 580.762f, +150.246f, 581.746f, 150.336f, 581.605f, 150.148f, 583.68f, 150.246f, 583.746f, 148.398f, 586.434f, +149.895f, 586.238f, 148.246f, 588.75f, 146.816f, 589.582f, 145.754f, 590.797f, 144.246f, 591.75f, +144.301f, 592.297f, 145.559f, 593.094f, 145.25f, 593.75f, 144.156f, 594.746f, 142.887f, 595.59f, +143.246f, 596.746f, 143.43f, 597.992f, 143.578f, 599.156f, 143.246f, 599.75f, 10, 0, +0, 0, 0, 0, 0, 0, 11, 139.246f, 597.75f, 139.246f, +597.75f, 139.258f, 590.559f, 142.246f, 588.75f, 144.539f, 587.039f, 143.219f, 587.918f, 139.246f, +588.75f, 136.18f, 590.559f, 137.246f, 591.75f, 137.246f, 591.75f, 137.242f, 591.75f, 134.418f, +591, 137.246f, 588.75f, 139.699f, 586.598f, 143.656f, 583.957f, 142.246f, 583.746f, 140.137f, +583.957f, 131.777f, 588.359f, 132.246f, 591.75f, 131.777f, 594.52f, 130.25f, 598.746f, 130.25f, +598.746f, 130.25f, 598.742f, 131.887f, 599.906f, 137.246f, 599.75f, 137.242f, 599.75f, 138.707f, +599.027f, 139.246f, 597.75f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 138.246f, 577.75f, 138.246f, 577.75f, 128.566f, 580.648f, 108.25f, 576.746f, +108.25f, 576.742f, 118.172f, 579.203f, 139.246f, 576.746f, 150.148f, 575.324f, 138.246f, 577.75f, +138.246f, 577.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 138.246f, 577.75f, 138.246f, 577.75f, 128.566f, 580.648f, 108.25f, 576.746f, 108.25f, +576.742f, 118.172f, 579.203f, 139.246f, 576.746f, 150.148f, 575.324f, 138.246f, 577.75f, 138.246f, +577.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +140.25f, 577.75f, 140.25f, 577.75f, 131.176f, 581.527f, 110.246f, 579.746f, 110.246f, 579.746f, +120.695f, 580.984f, 141.25f, 576.746f, 152.215f, 574.355f, 140.25f, 577.75f, 140.25f, 577.75f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 140.25f, +577.75f, 140.25f, 577.75f, 131.176f, 581.527f, 110.246f, 579.746f, 110.246f, 579.746f, 120.695f, +580.984f, 141.25f, 576.746f, 152.215f, 574.355f, 140.25f, 577.75f, 140.25f, 577.75f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 142.246f, 577.75f, +142.242f, 577.75f, 133.453f, 582.086f, 113.25f, 581.746f, 113.25f, 581.746f, 122.965f, 582.328f, +143.246f, 576.746f, 153.902f, 573.371f, 142.246f, 577.75f, 142.246f, 577.75f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 142.246f, 577.75f, 142.242f, +577.75f, 133.453f, 582.086f, 113.25f, 581.746f, 113.25f, 581.746f, 122.965f, 582.328f, 143.246f, +576.746f, 153.902f, 573.371f, 142.246f, 577.75f, 142.246f, 577.75f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 143.246f, 577.75f, 143.242f, 577.75f, +136.102f, 582.047f, 117.25f, 583.746f, 117.25f, 583.742f, 126.715f, 583.066f, 144.246f, 576.746f, +153.77f, 572.66f, 143.246f, 577.75f, 143.246f, 577.75f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 143.246f, 577.75f, 143.242f, 577.75f, 136.102f, +582.047f, 117.25f, 583.746f, 117.25f, 583.742f, 126.715f, 583.066f, 144.246f, 576.746f, 153.77f, +572.66f, 143.246f, 577.75f, 143.246f, 577.75f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 270.25f, 565.746f, 270.25f, 565.742f, 269.398f, 565.031f, +269.246f, 566.75f, 269.871f, 567.629f, 300.898f, 582.117f, 305.25f, 581.746f, 305.25f, 581.746f, +271.602f, 567.316f, 270.25f, 565.746f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 270.25f, 565.746f, 270.25f, 565.742f, 269.398f, 565.031f, 269.246f, +566.75f, 269.871f, 567.629f, 300.898f, 582.117f, 305.25f, 581.746f, 305.25f, 581.746f, 271.602f, +567.316f, 270.25f, 565.746f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 266.246f, 564.75f, 266.246f, 564.75f, 265.727f, 564.25f, 266.246f, 565.746f, +265.992f, 566.879f, 295.785f, 583.758f, 300.246f, 583.746f, 300.246f, 583.742f, 267.742f, 566.699f, +266.246f, 564.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 266.246f, 564.75f, 266.246f, 564.75f, 265.727f, 564.25f, 266.246f, 565.746f, 265.992f, +566.879f, 295.785f, 583.758f, 300.246f, 583.746f, 300.246f, 583.742f, 267.742f, 566.699f, 266.246f, +564.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +263.25f, 563.746f, 263.25f, 563.742f, 262.164f, 562.676f, 262.25f, 563.746f, 262.254f, 565.316f, +284.055f, 582.363f, 295.25f, 584.75f, 295.25f, 584.75f, 275.016f, 575.484f, 263.25f, 563.746f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 263.25f, +563.746f, 263.25f, 563.742f, 262.164f, 562.676f, 262.25f, 563.746f, 262.254f, 565.316f, 284.055f, +582.363f, 295.25f, 584.75f, 295.25f, 584.75f, 275.016f, 575.484f, 263.25f, 563.746f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 260.25f, 561.746f, +260.25f, 561.742f, 259.09f, 560.711f, 259.25f, 561.746f, 259.176f, 563.086f, 278.793f, 578.43f, +288.246f, 580.75f, 288.246f, 580.75f, 270.656f, 572.238f, 260.25f, 561.746f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 260.25f, 561.746f, 260.25f, +561.742f, 259.09f, 560.711f, 259.25f, 561.746f, 259.176f, 563.086f, 278.793f, 578.43f, 288.246f, +580.75f, 288.246f, 580.75f, 270.656f, 572.238f, 260.25f, 561.746f, 10, 0, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 11, 225.25f, 398.746f, 225.25f, 398.742f, +208.34f, 401.355f, 227.25f, 402.75f, 227.25f, 402.75f, 246.617f, 405.316f, 251.25f, 410.75f, +251.25f, 410.75f, 265.977f, 421.156f, 269.246f, 421.75f, 272.137f, 422.035f, 290.18f, 425.996f, +290.246f, 428.75f, 291.059f, 431.277f, 297.656f, 433.918f, 299.246f, 432.75f, 301.18f, 432.156f, +301.18f, 422.035f, 298.246f, 420.746f, 295.02f, 420.277f, 274.34f, 412.355f, 267.246f, 410.75f, +260.258f, 409.719f, 247.5f, 401.355f, 242.246f, 399.75f, 236.938f, 398.719f, 225.25f, 398.746f, +225.25f, 398.746f, 10, 0, 0, 0, 0, 0, 0, 0, +11, 305.25f, 439.75f, 305.25f, 439.75f, 302.059f, 438.098f, 300.246f, 434.746f, 300.246f, +434.746f, 293.699f, 423.578f, 278.246f, 419.75f, 278.246f, 419.75f, 252.777f, 410.156f, 244.246f, +407.746f, 244.246f, 407.742f, 229.457f, 402.457f, 221.246f, 403.746f, 221.246f, 403.746f, 213.617f, +403.117f, 220.246f, 401.746f, 220.246f, 401.746f, 242.656f, 403.559f, 246.246f, 405.746f, 246.242f, +405.742f, 263.559f, 411.258f, 267.246f, 413.75f, 270.156f, 416.977f, 290.18f, 422.477f, 292.25f, +424.75f, 295.02f, 426.879f, 305.797f, 436.117f, 305.25f, 439.75f, 10, 0, 0, +0, 0, 0, 0, 0, 4, 241.25f, 404.75f, 241.25f, 404.75f, +246.52f, 405.445f, 245.246f, 403.746f, 243.984f, 402.035f, 241.25f, 402.75f, 241.25f, 402.75f, +241.25f, 404.75f, 10, 0, 0, 0, 0, 0, 0, 0, +4, 233.246f, 403.746f, 233.246f, 403.746f, 238.598f, 403.957f, 237.25f, 402.75f, 236.063f, +400.547f, 233.246f, 401.746f, 233.246f, 401.746f, 233.246f, 403.746f, 10, 0, 0, +0, 0, 0, 0, 0, 4, 221.246f, 402.75f, 221.246f, 402.75f, +227.125f, 402.586f, 226.25f, 400.75f, 224.59f, 399.176f, 222.246f, 399.75f, 222.246f, 399.75f, +221.246f, 402.75f, 10, 0, 0, 0, 0, 0, 0, 0, +4, 213.246f, 401.746f, 213.242f, 401.746f, 218.73f, 401.984f, 217.25f, 400.75f, 216.191f, +398.578f, 213.246f, 399.75f, 213.246f, 399.75f, 213.246f, 401.746f, 10, 0, 0, +0, 0, 0, 0, 0, 4, 259.25f, 413.75f, 259.25f, 413.75f, +266.609f, 413.664f, 265.246f, 411.746f, 263.234f, 409.129f, 259.25f, 410.75f, 259.25f, 410.75f, +259.25f, 413.75f, 10, 0, 0, 0, 0, 0, 0, 0, +4, 270.25f, 417.75f, 270.25f, 417.75f, 276.855f, 421.832f, 276.246f, 416.746f, 275.973f, +413.453f, 271.25f, 415.75f, 271.25f, 415.75f, 270.25f, 417.75f, 10, 0, 0, +0, 0, 0, 0, 0, 4, 280.246f, 421.75f, 280.242f, 421.75f, +288.223f, 425.367f, 286.246f, 419.75f, 285.457f, 416.664f, 281.25f, 418.746f, 281.25f, 418.746f, +280.246f, 421.75f, 10, 0, 0, 0, 0, 0, 0, 0, +4, 291.246f, 426.75f, 291.242f, 426.75f, 295.605f, 431.996f, 297.246f, 424.75f, 297.227f, +421.875f, 291.246f, 423.746f, 291.246f, 423.746f, 291.246f, 426.75f, 10, 0, 0, +0, 0, 0, 0, 0, 4, 249.25f, 408.75f, 249.25f, 408.75f, +255.266f, 408.652f, 254.246f, 406.75f, 252.73f, 405.242f, 250.25f, 405.746f, 250.25f, 405.746f, +249.25f, 408.75f, 10, 0, 1, 1, 1, 1, 1, 1, +5, 288.246f, 541.746f, 288.246f, 541.742f, 287.875f, 541.203f, 288.246f, 542.75f, 287.875f, +543.559f, 307.109f, 558.148f, 317.25f, 559.746f, 317.25f, 559.746f, 299.125f, 552.27f, 288.246f, +541.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, 5, +288.246f, 541.746f, 288.246f, 541.742f, 287.875f, 541.203f, 288.246f, 542.75f, 287.875f, 543.559f, +307.109f, 558.148f, 317.25f, 559.746f, 317.25f, 559.746f, 299.125f, 552.27f, 288.246f, 541.746f, +10, 0, 0, 0, 0, 0, 0, 0, 10, 292.25f, +471.746f, 292.25f, 471.742f, 316.141f, 447.117f, 326.25f, 442.746f, 326.25f, 442.742f, 336.379f, +430.836f, 332.246f, 401.746f, 332.246f, 401.746f, 328.461f, 393.879f, 325.25f, 416.746f, 325.25f, +416.742f, 328.461f, 444.477f, 316.25f, 426.75f, 316.25f, 426.75f, 306.898f, 437.766f, 314.25f, +437.75f, 314.25f, 437.75f, 317.461f, 435.238f, 318.25f, 436.746f, 318.34f, 438.758f, 309.539f, +453.719f, 290.246f, 469.746f, 271.699f, 485.398f, 292.25f, 471.746f, 292.25f, 471.746f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 227.25f, 428.75f, +227.25f, 428.75f, 227.477f, 431.059f, 229.25f, 429.746f, 231.438f, 429.297f, 335.059f, 422.477f, +370.25f, 395.75f, 370.25f, 395.75f, 320.098f, 421.598f, 227.25f, 428.75f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 227.25f, 428.75f, 227.25f, +428.75f, 227.477f, 431.059f, 229.25f, 429.746f, 231.438f, 429.297f, 335.059f, 422.477f, 370.25f, +395.75f, 370.25f, 395.75f, 320.098f, 421.598f, 227.25f, 428.75f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 239.25f, 433.746f, 239.25f, 433.742f, +238.918f, 435.898f, 241.25f, 434.746f, 242.879f, 434.137f, 393.141f, 435.238f, 419.246f, 399.75f, +419.246f, 399.75f, 394.898f, 427.316f, 239.25f, 433.746f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 239.25f, 433.746f, 239.25f, 433.742f, 238.918f, +435.898f, 241.25f, 434.746f, 242.879f, 434.137f, 393.141f, 435.238f, 419.246f, 399.75f, 419.246f, +399.75f, 394.898f, 427.316f, 239.25f, 433.746f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 252.25f, 438.746f, 252.25f, 438.742f, 251.68f, 440.297f, +253.246f, 439.75f, 255.637f, 438.535f, 446.379f, 452.836f, 472.25f, 416.746f, 472.25f, 416.742f, +461.777f, 445.355f, 252.25f, 438.746f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 252.25f, 438.746f, 252.25f, 438.742f, 251.68f, 440.297f, 253.246f, +439.75f, 255.637f, 438.535f, 446.379f, 452.836f, 472.25f, 416.746f, 472.25f, 416.742f, 461.777f, +445.355f, 252.25f, 438.746f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 263.25f, 443.75f, 263.25f, 443.75f, 262.68f, 445.578f, 264.246f, 444.746f, +266.637f, 443.816f, 401.059f, 486.277f, 427.25f, 450.75f, 427.25f, 450.75f, 412.277f, 477.699f, +263.25f, 443.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 263.25f, 443.75f, 263.25f, 443.75f, 262.68f, 445.578f, 264.246f, 444.746f, 266.637f, +443.816f, 401.059f, 486.277f, 427.25f, 450.75f, 427.25f, 450.75f, 412.277f, 477.699f, 263.25f, +443.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +199.246f, 418.746f, 199.246f, 418.742f, 198.879f, 420.496f, 201.246f, 419.75f, 202.84f, 418.738f, +222.418f, 416.316f, 224.246f, 373.75f, 224.242f, 373.75f, 216.699f, 419.836f, 199.246f, 418.746f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 199.246f, +418.746f, 199.246f, 418.742f, 198.879f, 420.496f, 201.246f, 419.75f, 202.84f, 418.738f, 222.418f, +416.316f, 224.246f, 373.75f, 224.242f, 373.75f, 216.699f, 419.836f, 199.246f, 418.746f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 189.246f, 416.746f, +189.246f, 416.742f, 189.199f, 418.738f, 191.246f, 417.75f, 193.156f, 416.977f, 208.777f, 422.035f, +205.25f, 379.746f, 205.25f, 379.746f, 207.02f, 418.078f, 189.246f, 416.746f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 189.246f, 416.746f, 189.246f, +416.742f, 189.199f, 418.738f, 191.246f, 417.75f, 193.156f, 416.977f, 208.777f, 422.035f, 205.25f, +379.746f, 205.25f, 379.746f, 207.02f, 418.078f, 189.246f, 416.746f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 180.246f, 416.746f, 180.242f, 416.742f, +180.398f, 418.297f, 182.25f, 417.75f, 184.359f, 416.535f, 201.297f, 415.879f, 187.246f, 390.746f, +187.246f, 390.746f, 198.219f, 417.637f, 180.246f, 416.746f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 180.246f, 416.746f, 180.242f, 416.742f, 180.398f, +418.297f, 182.25f, 417.75f, 184.359f, 416.535f, 201.297f, 415.879f, 187.246f, 390.746f, 187.246f, +390.746f, 198.219f, 417.637f, 180.246f, 416.746f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 232.246f, 464.746f, 232.246f, 464.742f, 232.187f, 462.887f, +234.246f, 463.75f, 251.566f, 478.113f, 287.254f, 542.906f, 348.25f, 548.746f, 348.25f, 548.746f, +306.367f, 562.426f, 232.246f, 464.746f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 232.246f, 464.746f, 232.246f, 464.742f, 232.187f, 462.887f, 234.246f, +463.75f, 251.566f, 478.113f, 287.254f, 542.906f, 348.25f, 548.746f, 348.25f, 548.746f, 306.367f, +562.426f, 232.246f, 464.746f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 245.246f, 466.746f, 245.246f, 466.742f, 243.496f, 468.379f, 245.246f, 468.75f, +247.605f, 469.754f, 371.293f, 549.508f, 414.25f, 540.75f, 414.25f, 540.75f, 384.688f, 549.004f, +245.246f, 466.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 245.246f, 466.746f, 245.246f, 466.742f, 243.496f, 468.379f, 245.246f, 468.75f, 247.605f, +469.754f, 371.293f, 549.508f, 414.25f, 540.75f, 414.25f, 540.75f, 384.688f, 549.004f, 245.246f, +466.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +222.246f, 460.746f, 222.246f, 460.742f, 221.512f, 458.594f, 223.246f, 459.75f, 233.266f, 465.301f, +237.242f, 528.234f, 285.25f, 529.75f, 285.25f, 529.75f, 249.523f, 545.801f, 222.246f, 460.746f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 222.246f, +460.746f, 222.246f, 460.742f, 221.512f, 458.594f, 223.246f, 459.75f, 233.266f, 465.301f, 237.242f, +528.234f, 285.25f, 529.75f, 285.25f, 529.75f, 249.523f, 545.801f, 222.246f, 460.746f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 200.246f, 447.746f, +200.246f, 447.746f, 198.973f, 446.812f, 201.246f, 446.75f, 212.391f, 448.555f, 235.937f, 493.953f, +285.25f, 488.746f, 285.25f, 488.742f, 249.656f, 504.148f, 200.246f, 447.746f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 200.246f, 447.746f, 200.246f, +447.746f, 198.973f, 446.812f, 201.246f, 446.75f, 212.391f, 448.555f, 235.937f, 493.953f, 285.25f, +488.746f, 285.25f, 488.742f, 249.656f, 504.148f, 200.246f, 447.746f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 212.246f, 454.75f, 212.246f, 454.75f, +211.625f, 453.348f, 213.246f, 453.746f, 224.461f, 457.637f, 238.852f, 506.711f, 288.246f, 510.746f, +288.246f, 510.742f, 250.363f, 519.348f, 212.246f, 454.75f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 212.246f, 454.75f, 212.246f, 454.75f, 211.625f, +453.348f, 213.246f, 453.746f, 224.461f, 457.637f, 238.852f, 506.711f, 288.246f, 510.746f, 288.246f, +510.742f, 250.363f, 519.348f, 212.246f, 454.75f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 192.25f, 442.746f, 192.25f, 442.742f, 191.453f, 441.449f, +193.25f, 441.75f, 202.32f, 442.863f, 221.395f, 479.633f, 261.25f, 474.75f, 261.25f, 474.75f, +232.508f, 487.891f, 192.25f, 442.746f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 192.25f, 442.746f, 192.25f, 442.742f, 191.453f, 441.449f, 193.25f, +441.75f, 202.32f, 442.863f, 221.395f, 479.633f, 261.25f, 474.75f, 261.25f, 474.75f, 232.508f, +487.891f, 192.25f, 442.746f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 184.25f, 435.75f, 184.25f, 435.75f, 182.949f, 434.945f, 184.25f, 434.746f, +189.281f, 435.414f, 222.984f, 471.801f, 243.246f, 454.75f, 243.246f, 454.75f, 230.082f, 475.344f, +184.25f, 435.75f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 184.25f, 435.75f, 184.25f, 435.75f, 182.949f, 434.945f, 184.25f, 434.746f, 189.281f, +435.414f, 222.984f, 471.801f, 243.246f, 454.75f, 243.246f, 454.75f, 230.082f, 475.344f, 184.25f, +435.75f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +260.25f, 470.75f, 260.25f, 470.75f, 259.219f, 472.699f, 261.25f, 472.75f, 263.469f, 473.547f, +396.242f, 537.031f, 438.25f, 522.746f, 438.25f, 522.746f, 409.465f, 534.84f, 260.25f, 470.75f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 260.25f, +470.75f, 260.25f, 470.75f, 259.219f, 472.699f, 261.25f, 472.75f, 263.469f, 473.547f, 396.242f, +537.031f, 438.25f, 522.746f, 438.25f, 522.746f, 409.465f, 534.84f, 260.25f, 470.75f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 223.246f, 400.75f, +223.246f, 400.75f, 223.52f, 402.457f, 225.25f, 401.746f, 227.477f, 400.695f, 244.418f, 400.035f, +231.246f, 375.75f, 231.246f, 375.75f, 241.34f, 401.797f, 223.246f, 400.75f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 223.246f, 400.75f, 223.246f, +400.75f, 223.52f, 402.457f, 225.25f, 401.746f, 227.477f, 400.695f, 244.418f, 400.035f, 231.246f, +375.75f, 231.246f, 375.75f, 241.34f, 401.797f, 223.246f, 400.75f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 235.246f, 401.746f, 235.242f, 401.746f, +234.957f, 404.219f, 237.25f, 403.746f, 238.918f, 402.457f, 258.5f, 400.035f, 260.25f, 357.746f, +260.25f, 357.746f, 252.777f, 403.559f, 235.246f, 401.746f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 235.246f, 401.746f, 235.242f, 401.746f, 234.957f, +404.219f, 237.25f, 403.746f, 238.918f, 402.457f, 258.5f, 400.035f, 260.25f, 357.746f, 260.25f, +357.746f, 252.777f, 403.559f, 235.246f, 401.746f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 242.246f, 403.746f, 242.246f, 403.746f, 242.437f, 405.977f, +244.246f, 404.75f, 246.398f, 404.219f, 273.457f, 400.477f, 299.246f, 364.75f, 299.246f, 364.75f, +260.258f, 405.316f, 242.246f, 403.746f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 242.246f, 403.746f, 242.246f, 403.746f, 242.437f, 405.977f, 244.246f, +404.75f, 246.398f, 404.219f, 273.457f, 400.477f, 299.246f, 364.75f, 299.246f, 364.75f, 260.258f, +405.316f, 242.246f, 403.746f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 251.25f, 405.746f, 251.25f, 405.742f, 250.566f, 408.164f, 252.25f, 407.746f, +254.723f, 406.945f, 277.199f, 409.031f, 319.25f, 371.75f, 319.25f, 371.75f, 268.316f, 409.875f, +251.25f, 405.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 251.25f, 405.746f, 251.25f, 405.742f, 250.566f, 408.164f, 252.25f, 407.746f, 254.723f, +406.945f, 277.199f, 409.031f, 319.25f, 371.75f, 319.25f, 371.75f, 268.316f, 409.875f, 251.25f, +405.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +262.25f, 410.75f, 262.25f, 410.75f, 262.004f, 413.004f, 264.246f, 412.746f, 266.164f, 411.785f, +304.48f, 406.832f, 361.25f, 368.746f, 361.25f, 368.746f, 279.754f, 414.715f, 262.25f, 410.75f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 262.25f, +410.75f, 262.25f, 410.75f, 262.004f, 413.004f, 264.246f, 412.746f, 266.164f, 411.785f, 304.48f, +406.832f, 361.25f, 368.746f, 361.25f, 368.746f, 279.754f, 414.715f, 262.25f, 410.75f, 10, +0, 1, 1, 1, 1, 1, 1, 5, 218.25f, 423.746f, +218.25f, 423.746f, 217.797f, 425.777f, 220.246f, 424.75f, 221.758f, 424.016f, 280.5f, 421.156f, +314.25f, 391.75f, 314.25f, 391.75f, 275.547f, 418.93f, 218.25f, 423.746f, 10, 0.11f, +0, 0, 0, 0, 0, 0, 5, 218.25f, 423.746f, 218.25f, +423.746f, 217.797f, 425.777f, 220.246f, 424.75f, 221.758f, 424.016f, 280.5f, 421.156f, 314.25f, +391.75f, 314.25f, 391.75f, 275.547f, 418.93f, 218.25f, 423.746f, 10, 0, 1, +1, 1, 1, 1, 1, 5, 207.25f, 419.75f, 207.25f, 419.75f, +206.797f, 421.379f, 209.246f, 420.746f, 210.758f, 419.617f, 237.816f, 415.879f, 264.246f, 379.746f, +264.246f, 379.746f, 224.617f, 420.719f, 207.25f, 419.75f, 10, 0.11f, 0, 0, +0, 0, 0, 0, 5, 207.25f, 419.75f, 207.25f, 419.75f, 206.797f, +421.379f, 209.246f, 420.746f, 210.758f, 419.617f, 237.816f, 415.879f, 264.246f, 379.746f, 264.246f, +379.746f, 224.617f, 420.719f, 207.25f, 419.75f, 10, 0, 1, 1, 1, +1, 1, 1, 5, 274.25f, 415.75f, 274.25f, 415.75f, 273.828f, 418.031f, +276.246f, 417.75f, 278.066f, 417.125f, 316.645f, 414.992f, 376.246f, 380.75f, 376.246f, 380.75f, +290.746f, 418.625f, 274.25f, 415.75f, 10, 0.11f, 0, 0, 0, 0, +0, 0, 5, 274.25f, 415.75f, 274.25f, 415.75f, 273.828f, 418.031f, 276.246f, +417.75f, 278.066f, 417.125f, 316.645f, 414.992f, 376.246f, 380.75f, 376.246f, 380.75f, 290.746f, +418.625f, 274.25f, 415.75f, 10, 0, 1, 1, 1, 1, 1, +1, 5, 283.25f, 418.746f, 283.25f, 418.742f, 283.07f, 420.672f, 285.25f, 419.75f, +287.309f, 419.762f, 325.883f, 417.633f, 385.25f, 383.746f, 385.25f, 383.742f, 300.648f, 421.703f, +283.25f, 418.746f, 10, 0.11f, 0, 0, 0, 0, 0, 0, +5, 283.25f, 418.746f, 283.25f, 418.742f, 283.07f, 420.672f, 285.25f, 419.75f, 287.309f, +419.762f, 325.883f, 417.633f, 385.25f, 383.746f, 385.25f, 383.742f, 300.648f, 421.703f, 283.25f, +418.746f, 10, 0, 1, 1, 1, 1, 1, 1, 5, +294.25f, 424.75f, 294.25f, 424.75f, 293.629f, 426.172f, 296.25f, 425.746f, 297.867f, 425.262f, +345.242f, 420.492f, 444.246f, 382.75f, 444.246f, 382.75f, 311.207f, 427.203f, 294.25f, 424.75f, +10, 0.11f, 0, 0, 0, 0, 0, 0, 5, 294.25f, +424.75f, 294.25f, 424.75f, 293.629f, 426.172f, 296.25f, 425.746f, 297.867f, 425.262f, 345.242f, +420.492f, 444.246f, 382.75f, 444.246f, 382.75f, 311.207f, 427.203f, 294.25f, 424.75f, 10, +0, 0, 0, 0, 0, 0, 0, 4, 172.25f, 416.746f, +172.25f, 416.742f, 177.539f, 417.195f, 176.246f, 415.75f, 174.898f, 413.676f, 172.25f, 414.746f, +172.25f, 414.746f, 172.25f, 416.746f, 10, 0, 0, 0, 0, 0, +0, 0, 4, 205.25f, 401.746f, 205.25f, 401.746f, 211.418f, 401.797f, 210.246f, +399.75f, 208.777f, 398.277f, 206.25f, 398.746f, 206.25f, 398.746f, 205.25f, 401.746f, 10, +0, 0, 0, 0, 0, 0, 0, 4, 196.25f, 401.746f, +196.25f, 401.746f, 201.738f, 402.238f, 200.246f, 400.75f, 199.098f, 398.719f, 196.25f, 399.75f, +196.25f, 399.75f, 196.25f, 401.746f, 10, 0, 0, 0, 0, 0, +0, 0, 4, 91.25f, 414.746f, 91.25f, 414.746f, 96.6602f, 413.344f, 95.25f, +411.746f, 93.0156f, 410.879f, 91.25f, 412.746f, 91.25f, 412.746f, 91.25f, 414.746f, 10, +0, 0, 0, 0, 0, 0, 0, 4, 93.2461f, 425.746f, +93.2422f, 425.746f, 98.8633f, 423.902f, 97.25f, 422.746f, 95.2148f, 421.441f, 93.2461f, 422.746f, +93.2461f, 422.746f, 93.2461f, 425.746f, 10, 0, 0, 0, 0, 0, +0, 0, 4, 85.25f, 429.746f, 85.25f, 429.742f, 90.9414f, 428.742f, 89.2461f, +427.746f, 87.2969f, 426.281f, 85.25f, 427.746f, 85.25f, 427.746f, 85.25f, 429.746f, 10, +0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 173.25f, 347.75f, +173.25f, 347.75f, 171.379f, 347.676f, 167.25f, 345.75f, 164.777f, 345.477f, 152.457f, 341.516f, +146.25f, 330.746f, 146.25f, 330.742f, 159.938f, 341.078f, 173.25f, 347.75f, 10, 0, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 9, 269.246f, 245.746f, 269.781f, +245.484f, 269.84f, 245.02f, 270.25f, 244.75f, 270.887f, 244.957f, 272.242f, 244.625f, 272.25f, +245.746f, 271.172f, 250.063f, 270.211f, 255.492f, 265.246f, 257.746f, 264.961f, 257.789f, 263.375f, +257.332f, 263.25f, 256.746f, 263.156f, 254.684f, 263.027f, 253.203f, 263.25f, 251.75f, 263.695f, +250.027f, 266.07f, 250.016f, 267.246f, 251.75f, 268.109f, 249.699f, 268.582f, 247.672f, 269.246f, +245.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 9, +257.246f, 240.75f, 258.262f, 239.004f, 258.121f, 236.961f, 259.25f, 236.746f, 260.492f, 236.016f, +262.527f, 237.09f, 262.25f, 238.746f, 261.188f, 240.539f, 260.758f, 243, 259.25f, 244.75f, +259.012f, 245.281f, 259.277f, 245.867f, 259.25f, 245.746f, 258.445f, 247.57f, 257.188f, 248.379f, +255.246f, 247.746f, 254.41f, 245.594f, 255.676f, 243.25f, 257.246f, 241.75f, 257.5f, 241.203f, +257.316f, 240.793f, 257.246f, 240.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 11, 214.25f, 246.746f, 213.758f, 246.684f, 213.719f, 247.191f, 214.25f, +247.746f, 214.484f, 248.68f, 215.355f, 249.914f, 215.25f, 250.746f, 214.602f, 252.203f, 213.375f, +252, 212.246f, 251.75f, 211.41f, 250.281f, 211.355f, 248.273f, 210.246f, 246.746f, 210.379f, +246.355f, 210.438f, 245.723f, 210.246f, 245.746f, 209.43f, 244.832f, 208.945f, 243.152f, 209.246f, +242.75f, 209.109f, 242.18f, 208.91f, 231.281f, 209.246f, 231.75f, 209.836f, 232.379f, 213.188f, +243.086f, 213.246f, 243.75f, 213.328f, 244.871f, 214.133f, 245.383f, 214.25f, 246.746f, 10, +0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 7, 185.25f, 253.75f, +188.574f, 256.488f, 191.641f, 259.746f, 191.246f, 263.75f, 191.027f, 264.902f, 189.074f, 264.32f, +189.246f, 263.75f, 187.988f, 259.402f, 185.746f, 256.477f, 183.25f, 253.75f, 180.504f, 251.594f, +178.457f, 244.617f, 178.246f, 243.75f, 182.266f, 249.84f, 184.746f, 252.859f, 185.25f, 253.75f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 10, 170.246f, +260.746f, 171.32f, 260.707f, 170.988f, 261.246f, 171.246f, 261.746f, 172.273f, 263.215f, 173.707f, +264.586f, 173.25f, 266.746f, 173.73f, 266.805f, 173.313f, 267.145f, 173.25f, 266.746f, 172.641f, +266.695f, 172.262f, 266.551f, 172.25f, 266.746f, 169.91f, 263.715f, 168.371f, 260.777f, 167.25f, +257.746f, 166.582f, 257.289f, 165.324f, 252.352f, 165.246f, 251.75f, 165.934f, 252.133f, 167.824f, +256.734f, 168.25f, 256.746f, 169.445f, 257.613f, 169.457f, 259.391f, 170.246f, 260.746f, 10, +0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 189.246f, 238.746f, +189.641f, 239.758f, 191.371f, 241.078f, 191.246f, 241.75f, 191.117f, 243.078f, 191.633f, 244.664f, +190.246f, 243.75f, 189.246f, 242.867f, 185.453f, 241.383f, 185.25f, 234.746f, 185.129f, 234.363f, +188.398f, 237.328f, 189.246f, 238.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 19, 205.25f, 257.746f, 205.477f, 258.434f, 206.258f, 257.91f, 207.25f, +257.746f, 207.473f, 258.609f, 208.148f, 259.223f, 208.25f, 259.746f, 209.535f, 262.301f, 211.48f, +264.305f, 211.246f, 266.746f, 209.996f, 268.484f, 209.25f, 266.238f, 208.25f, 264.746f, 207.102f, +266.988f, 206.004f, 264.926f, 204.25f, 264.746f, 204.496f, 264.324f, 204.262f, 264.707f, 204.25f, +264.746f, 202.887f, 264.195f, 202.137f, 263.004f, 201.246f, 261.746f, 200.852f, 261.996f, 200.406f, +262.195f, 200.246f, 261.746f, 199.527f, 261.383f, 198.457f, 261.027f, 198.246f, 260.746f, 196.93f, +257.297f, 193.473f, 254.992f, 191.246f, 246.746f, 191.816f, 245.695f, 196.359f, 254.004f, 197.25f, +254.75f, 197.816f, 256.086f, 197.945f, 252.945f, 199.246f, 253.75f, 199.406f, 253.707f, 199.609f, +253.445f, 200.246f, 253.75f, 199.973f, 253.605f, 200.211f, 253.855f, 200.246f, 253.75f, 200.637f, +254.176f, 200.492f, 254.789f, 200.246f, 254.75f, 202.074f, 256.039f, 201.98f, 257.215f, 203.25f, +258.746f, 203.344f, 257.711f, 204.508f, 258.5f, 205.25f, 257.746f, 10, 0, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 271.25f, 197.75f, 271.25f, 197.75f, +278.957f, 220.297f, 274.25f, 232.75f, 274.25f, 232.75f, 286.656f, 208.855f, 281.25f, 196.75f, +281.25f, 196.75f, 281.156f, 207.977f, 277.246f, 213.746f, 277.246f, 213.746f, 272.359f, 199.398f, +271.25f, 197.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +5, 254.246f, 200.75f, 254.246f, 200.75f, 260.477f, 210.398f, 251.25f, 230.75f, 251.25f, +230.75f, 250.797f, 208.195f, 243.246f, 195.746f, 243.246f, 195.742f, 258.937f, 218.316f, 254.246f, +200.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, +243.246f, 202.746f, 243.246f, 202.746f, 243.316f, 224.918f, 244.246f, 227.746f, 244.246f, 227.742f, +239.578f, 209.957f, 228.25f, 199.75f, 228.25f, 199.75f, 244.199f, 212.598f, 243.246f, 202.746f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, 233.246f, +237.746f, 233.246f, 237.746f, 239.578f, 223.156f, 228.25f, 202.746f, 228.25f, 202.746f, 235.617f, +216.336f, 230.25f, 223.746f, 230.25f, 223.746f, 233.199f, 227.777f, 233.246f, 237.746f, 10, +0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 8, 212.246f, 203.746f, +212.246f, 203.746f, 210.758f, 220.516f, 212.246f, 222.75f, 212.246f, 222.75f, 212.957f, 229.977f, +212.246f, 230.75f, 212.246f, 230.75f, 216.918f, 237.898f, 217.25f, 229.75f, 217.25f, 229.75f, +218.68f, 221.176f, 222.246f, 215.746f, 222.246f, 215.746f, 225.719f, 210.176f, 225.25f, 202.746f, +225.25f, 202.746f, 214.5f, 236.355f, 212.246f, 203.746f, 10, 0, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 0.8f, 5, 208.25f, 233.75f, 208.25f, 233.75f, 200.637f, +221.836f, 198.246f, 200.75f, 198.246f, 200.75f, 197.117f, 207.758f, 201.246f, 223.746f, 201.246f, +223.746f, 205.918f, 240.535f, 208.25f, 233.75f, 10, 0, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 6, 184.25f, 211.75f, 184.25f, 211.75f, 189.418f, 217.879f, +191.246f, 223.746f, 191.242f, 223.746f, 194.918f, 240.758f, 188.246f, 231.75f, 188.246f, 231.75f, +188.098f, 222.496f, 179.246f, 214.746f, 179.246f, 214.746f, 184.359f, 216.996f, 184.25f, 211.75f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 177.246f, +217.746f, 177.246f, 217.742f, 181.277f, 236.578f, 182.25f, 237.746f, 182.25f, 237.746f, 184.137f, +241.195f, 181.25f, 237.746f, 181.25f, 237.746f, 171.379f, 216.559f, 167.25f, 209.75f, 167.25f, +209.75f, 175.777f, 219.418f, 177.246f, 217.746f, 10, 0, 0.8f, 0.8f, 0.8f, +0.8f, 0.8f, 0.8f, 4, 171.246f, 235.746f, 171.246f, 235.746f, 183.918f, 260.336f, +160.246f, 231.75f, 160.246f, 231.75f, 172.039f, 242.738f, 171.246f, 235.746f, 10, 0, +0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 6, 154.246f, 251.75f, 154.242f, +251.75f, 159.5f, 272.438f, 162.25f, 271.746f, 162.25f, 271.746f, 171.379f, 282.117f, 164.246f, +270.75f, 164.242f, 270.75f, 157.52f, 259.898f, 158.25f, 248.746f, 158.25f, 248.746f, 157.52f, +259.676f, 154.246f, 251.75f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +0.8f, 5, 517.246f, 264.746f, 517.242f, 264.742f, 504.348f, 275.297f, 501.25f, 278.75f, +501.25f, 278.75f, 516.449f, 258.797f, 516.25f, 250.746f, 516.25f, 250.742f, 519.199f, 259.348f, +517.246f, 264.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, +5, 523.25f, 288.746f, 523.25f, 288.742f, 500.5f, 305, 496.25f, 312.75f, 496.25f, +312.75f, 525.797f, 280.797f, 526.246f, 275.746f, 526.242f, 275.742f, 526.348f, 285.75f, 523.25f, +288.746f, 10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 5, +542.246f, 457.75f, 542.246f, 457.75f, 529.098f, 466.699f, 527.25f, 464.746f, 527.25f, 464.742f, +539, 457.348f, 542.246f, 447.746f, 542.246f, 447.746f, 540.098f, 457.898f, 542.246f, 457.75f, +10, 0, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 0.8f, 4, 551.25f, +369.75f, 532.25f, 382.75f, 532.25f, 382.75f, 553.297f, 363.848f, 554.25f, 359.746f, 551.25f, +369.75f, 10, 1.1f, 0, 0, 0, 0, 0, 0, 2, +122.246f, 393.75f, 146.25f, 388.75f, 10, 1.1f, 0, 0, 0, 0, +0, 0, 2, 177.246f, 215.746f, 177.246f, 215.746f, 176.547f, 219.75f, 166.246f, +207.75f, 10, 1.1f, 0, 0, 0, 0, 0, 0, 2, +183.25f, 210.75f, 183.25f, 210.75f, 185.348f, 217.547f, 178.246f, 212.746f, 10, 1.1f, +0, 0, 0, 0, 0, 0, 2, 242.246f, 200.75f, 242.246f, 200.75f, 244.199f, 213.148f, 231.246f, 198.75f}; - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.h index c83d3f1920..82844c1d8b 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_tiger/tiger.h @@ -14,10 +14,10 @@ * including without limitation the rights to use, copy, modify, merge, * publish, distribute, sublicense, and/or sell copies of the Materials, * and to permit persons to whom the Materials are furnished to do so, - * subject to the following conditions: + * subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Materials. * * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF @@ -30,7 +30,7 @@ *//** * \file * \brief Header for including the Tiger image data. - * \note + * \note *//*-------------------------------------------------------------------*/ extern const int tigerCommandCount; diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/Makefile index 45dcc0dcd0..e7a5ebb215 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/Makefile @@ -2,4 +2,3 @@ OBJS=triangle.o BIN=hello_triangle.bin include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/cube_texture_and_coords.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/cube_texture_and_coords.h index 7dd30a96b2..68d91d5780 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/cube_texture_and_coords.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/cube_texture_and_coords.h @@ -97,4 +97,3 @@ static const GLfloat texCoords[6 * 4 * 2] = { 1.f, 0.f, 1.f, 1.f }; - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c index 0956c97f93..424f27dc48 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle/triangle.c @@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef M_PI #define M_PI 3.141592654 #endif - typedef struct { @@ -92,7 +91,6 @@ static void exit_func(void); static volatile int terminate; static CUBE_STATE_T _state, *state=&_state; - /*********************************************************** * Name: init_ogl * @@ -125,7 +123,7 @@ static void init_ogl(CUBE_STATE_T *state) EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_NONE }; - + EGLConfig config; // get an EGL display connection @@ -152,24 +150,24 @@ static void init_ogl(CUBE_STATE_T *state) dst_rect.y = 0; dst_rect.width = state->screen_width; dst_rect.height = state->screen_height; - + src_rect.x = 0; src_rect.y = 0; src_rect.width = state->screen_width << 16; - src_rect.height = state->screen_height << 16; + src_rect.height = state->screen_height << 16; state->dispman_display = vc_dispmanx_display_open( 0 /* LCD */); dispman_update = vc_dispmanx_update_start( 0 ); - + state->dispman_element = vc_dispmanx_element_add ( dispman_update, state->dispman_display, 0/*layer*/, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0/*clamp*/, 0/*transform*/); - + nativewindow.element = state->dispman_element; nativewindow.width = state->screen_width; nativewindow.height = state->screen_height; vc_dispmanx_update_submit_sync( dispman_update ); - + state->surface = eglCreateWindowSurface( state->display, config, &nativewindow, NULL ); assert(state->surface != EGL_NO_SURFACE); @@ -207,7 +205,7 @@ static void init_model_proj(CUBE_STATE_T *state) glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); glViewport(0, 0, (GLsizei)state->screen_width, (GLsizei)state->screen_height); - + glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -215,7 +213,7 @@ static void init_model_proj(CUBE_STATE_T *state) hwd = hht * (float)state->screen_width / (float)state->screen_height; glFrustumf(-hwd, hwd, -hht, hht, nearp, farp); - + glEnableClientState( GL_VERTEX_ARRAY ); glVertexPointer( 3, GL_BYTE, 0, quadx ); @@ -439,7 +437,7 @@ static void init_textures(CUBE_STATE_T *state) // setup overall texture environment glTexCoordPointer(2, GL_FLOAT, 0, texCoords); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - + glEnable(GL_TEXTURE_2D); } @@ -476,7 +474,7 @@ static void load_tex_images(CUBE_STATE_T *state) { bytes_read=fread(state->tex_buf2, 1, image_sz, tex_file2); assert(bytes_read == image_sz); // some problem with file? - fclose(tex_file2); + fclose(tex_file2); } tex_file3 = fopen(PATH "Gaudi_128_128.raw", "rb"); @@ -485,7 +483,7 @@ static void load_tex_images(CUBE_STATE_T *state) bytes_read=fread(state->tex_buf3, 1, image_sz, tex_file3); assert(bytes_read == image_sz); // some problem with file? fclose(tex_file3); - } + } } //------------------------------------------------------------------------------ @@ -530,7 +528,7 @@ int main () // Clear application state memset( state, 0, sizeof( *state ) ); - + // Start OGLES init_ogl(state); @@ -548,4 +546,3 @@ int main () exit_func(); return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/Makefile index 13b1b390bd..c065ab0112 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/Makefile @@ -2,4 +2,3 @@ OBJS=triangle2.o BIN=hello_triangle2.bin include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c index b0d7cabeb5..3e0618e49b 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_triangle2/triangle2.c @@ -61,7 +61,7 @@ typedef struct GLuint tex; GLuint buf; // julia attribs - GLuint unif_color, attr_vertex, unif_scale, unif_offset, unif_tex, unif_centre; + GLuint unif_color, attr_vertex, unif_scale, unif_offset, unif_tex, unif_centre; // mandelbrot attribs GLuint attr_vertex2, unif_scale2, unif_offset2, unif_centre2; } CUBE_STATE_T; @@ -85,7 +85,7 @@ static void showprogramlog(GLint shader) glGetProgramInfoLog(shader,sizeof log,NULL,log); printf("%d:program:\n%s\n", shader, log); } - + /*********************************************************** * Name: init_ogl * @@ -120,8 +120,8 @@ static void init_ogl(CUBE_STATE_T *state) EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_NONE }; - - static const EGLint context_attributes[] = + + static const EGLint context_attributes[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE @@ -161,24 +161,24 @@ static void init_ogl(CUBE_STATE_T *state) dst_rect.y = 0; dst_rect.width = state->screen_width; dst_rect.height = state->screen_height; - + src_rect.x = 0; src_rect.y = 0; src_rect.width = state->screen_width << 16; - src_rect.height = state->screen_height << 16; + src_rect.height = state->screen_height << 16; dispman_display = vc_dispmanx_display_open( 0 /* LCD */); dispman_update = vc_dispmanx_update_start( 0 ); - + dispman_element = vc_dispmanx_element_add ( dispman_update, dispman_display, 0/*layer*/, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0/*clamp*/, 0/*transform*/); - + nativewindow.element = dispman_element; nativewindow.width = state->screen_width; nativewindow.height = state->screen_height; vc_dispmanx_update_submit_sync( dispman_update ); - + check(); state->surface = eglCreateWindowSurface( state->display, config, &nativewindow, NULL ); @@ -197,7 +197,6 @@ static void init_ogl(CUBE_STATE_T *state) check(); } - static void init_shaders(CUBE_STATE_T *state) { static const GLfloat vertex_data[] = { @@ -214,7 +213,7 @@ static void init_shaders(CUBE_STATE_T *state) " gl_Position = pos;" " tcoord = vertex.xy*0.5+0.5;" "}"; - + //Mandelbrot const GLchar *mandelbrot_fshader_source = "uniform vec4 color;" @@ -296,7 +295,7 @@ static void init_shaders(CUBE_STATE_T *state) if (state->verbose) showlog(state->vshader); - + state->fshader = glCreateShader(GL_FRAGMENT_SHADER); glShaderSource(state->fshader, 1, &julia_fshader_source, 0); glCompileShader(state->fshader); @@ -313,7 +312,7 @@ static void init_shaders(CUBE_STATE_T *state) if (state->verbose) showlog(state->mshader); - // julia + // julia state->program = glCreateProgram(); glAttachShader(state->program, state->vshader); glAttachShader(state->program, state->fshader); @@ -322,12 +321,12 @@ static void init_shaders(CUBE_STATE_T *state) if (state->verbose) showprogramlog(state->program); - + state->attr_vertex = glGetAttribLocation(state->program, "vertex"); state->unif_color = glGetUniformLocation(state->program, "color"); state->unif_scale = glGetUniformLocation(state->program, "scale"); state->unif_offset = glGetUniformLocation(state->program, "offset"); - state->unif_tex = glGetUniformLocation(state->program, "tex"); + state->unif_tex = glGetUniformLocation(state->program, "tex"); state->unif_centre = glGetUniformLocation(state->program, "centre"); // mandelbrot @@ -339,15 +338,15 @@ static void init_shaders(CUBE_STATE_T *state) if (state->verbose) showprogramlog(state->program2); - + state->attr_vertex2 = glGetAttribLocation(state->program2, "vertex"); state->unif_scale2 = glGetUniformLocation(state->program2, "scale"); state->unif_offset2 = glGetUniformLocation(state->program2, "offset"); state->unif_centre2 = glGetUniformLocation(state->program2, "centre"); check(); - + glClearColor ( 0.0, 1.0, 1.0, 1.0 ); - + glGenBuffers(1, &state->buf); check(); @@ -375,7 +374,7 @@ static void init_shaders(CUBE_STATE_T *state) // Prepare viewport glViewport ( 0, 0, state->screen_width, state->screen_height ); check(); - + // Upload vertex data to a buffer glBindBuffer(GL_ARRAY_BUFFER, state->buf); glBufferData(GL_ARRAY_BUFFER, sizeof(vertex_data), @@ -388,14 +387,13 @@ static void init_shaders(CUBE_STATE_T *state) check(); } - static void draw_mandelbrot_to_texture(CUBE_STATE_T *state, GLfloat cx, GLfloat cy, GLfloat scale) { // Draw the mandelbrot to a texture glBindFramebuffer(GL_FRAMEBUFFER,state->tex_fb); check(); glBindBuffer(GL_ARRAY_BUFFER, state->buf); - + glUseProgram ( state->program2 ); check(); @@ -404,12 +402,12 @@ static void draw_mandelbrot_to_texture(CUBE_STATE_T *state, GLfloat cx, GLfloat check(); glDrawArrays ( GL_TRIANGLE_FAN, 0, 4 ); check(); - + glFlush(); glFinish(); check(); } - + static void draw_triangles(CUBE_STATE_T *state, GLfloat cx, GLfloat cy, GLfloat scale, GLfloat x, GLfloat y) { // Now render to the main frame buffer @@ -417,7 +415,7 @@ static void draw_triangles(CUBE_STATE_T *state, GLfloat cx, GLfloat cy, GLfloat // Clear the background (not really necessary I suppose) glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT); check(); - + glBindBuffer(GL_ARRAY_BUFFER, state->buf); check(); glUseProgram ( state->program ); @@ -430,7 +428,7 @@ static void draw_triangles(CUBE_STATE_T *state, GLfloat cx, GLfloat cy, GLfloat glUniform2f(state->unif_centre, cx, cy); glUniform1i(state->unif_tex, 0); // I don't really understand this part, perhaps it relates to active texture? check(); - + glDrawArrays ( GL_TRIANGLE_FAN, 0, 4 ); check(); @@ -439,7 +437,7 @@ static void draw_triangles(CUBE_STATE_T *state, GLfloat cx, GLfloat cy, GLfloat glFlush(); glFinish(); check(); - + eglSwapBuffers(state->display, state->surface); check(); } @@ -480,8 +478,8 @@ _exit: if (outx) *outx = x; if (outy) *outy = y; return 0; -} - +} + //============================================================================== int main () @@ -492,7 +490,7 @@ int main () // Clear application state memset( state, 0, sizeof( *state ) ); - + // Start OGLES init_ogl(state); init_shaders(state); @@ -509,4 +507,3 @@ int main () } return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/Makefile index be21fd5fd0..5a1fc40b1a 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/Makefile @@ -3,4 +3,3 @@ BIN=hello_video.bin LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/video.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/video.c index 2edf44cf6d..76e21e3833 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/video.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_video/video.c @@ -219,4 +219,3 @@ int main (int argc, char **argv) return video_decode_test(argv[1]); } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/Makefile index 60d4b0a458..97462a0c4a 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/Makefile @@ -4,4 +4,3 @@ LDFLAGS+=-lilclient include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/cube_texture_and_coords.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/cube_texture_and_coords.h index 7dd30a96b2..68d91d5780 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/cube_texture_and_coords.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/cube_texture_and_coords.h @@ -97,4 +97,3 @@ static const GLfloat texCoords[6 * 4 * 2] = { 1.f, 0.f, 1.f, 1.f }; - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c index 42a78a45b6..c10b38b142 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.c @@ -46,7 +46,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "triangle.h" #include - #define PATH "./" #define IMAGE_SIZE_WIDTH 1920 @@ -55,7 +54,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef M_PI #define M_PI 3.141592654 #endif - typedef struct { @@ -94,7 +92,6 @@ static CUBE_STATE_T _state, *state=&_state; static void* eglImage = 0; static pthread_t thread1; - /*********************************************************** * Name: init_ogl * @@ -131,7 +128,7 @@ static void init_ogl(CUBE_STATE_T *state) EGL_SURFACE_TYPE, EGL_WINDOW_BIT, EGL_NONE }; - + EGLConfig config; // get an EGL display connection @@ -159,24 +156,24 @@ static void init_ogl(CUBE_STATE_T *state) dst_rect.y = 0; dst_rect.width = state->screen_width; dst_rect.height = state->screen_height; - + src_rect.x = 0; src_rect.y = 0; src_rect.width = state->screen_width << 16; - src_rect.height = state->screen_height << 16; + src_rect.height = state->screen_height << 16; dispman_display = vc_dispmanx_display_open( 0 /* LCD */); dispman_update = vc_dispmanx_update_start( 0 ); - + dispman_element = vc_dispmanx_element_add ( dispman_update, dispman_display, 0/*layer*/, &dst_rect, 0/*src*/, &src_rect, DISPMANX_PROTECTION_NONE, 0 /*alpha*/, 0/*clamp*/, 0/*transform*/); - + nativewindow.element = dispman_element; nativewindow.width = state->screen_width; nativewindow.height = state->screen_height; vc_dispmanx_update_submit_sync( dispman_update ); - + state->surface = eglCreateWindowSurface( state->display, config, &nativewindow, NULL ); assert(state->surface != EGL_NO_SURFACE); @@ -214,7 +211,7 @@ static void init_model_proj(CUBE_STATE_T *state) glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); glViewport(0, 0, (GLsizei)state->screen_width, (GLsizei)state->screen_height); - + glMatrixMode(GL_PROJECTION); glLoadIdentity(); @@ -222,7 +219,7 @@ static void init_model_proj(CUBE_STATE_T *state) hwd = hht * (float)state->screen_width / (float)state->screen_height; glFrustumf(-hwd, hwd, -hht, hht, nearp, farp); - + glEnableClientState( GL_VERTEX_ARRAY ); glVertexPointer( 3, GL_BYTE, 0, quadx ); @@ -400,7 +397,6 @@ static void init_textures(CUBE_STATE_T *state) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - /* Create EGL Image */ eglImage = eglCreateImageKHR( state->display, @@ -408,7 +404,7 @@ static void init_textures(CUBE_STATE_T *state) EGL_GL_TEXTURE_2D_KHR, (EGLClientBuffer)state->tex, 0); - + if (eglImage == EGL_NO_IMAGE_KHR) { printf("eglCreateImageKHR failed.\n"); @@ -460,7 +456,7 @@ int main () // Clear application state memset( state, 0, sizeof( *state ) ); - + // Start OGLES init_ogl(state); @@ -478,4 +474,3 @@ int main () exit_func(); return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.h index 0f50e93132..054b635fb5 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/triangle.h @@ -26,5 +26,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #pragma once - void* video_decode_test(void* arg); diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/video.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/video.c index 4baae8f7dc..2010ed7cc4 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/video.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_videocube/video.c @@ -49,7 +49,6 @@ void my_fill_buffer_done(void* data, COMPONENT_T* comp) } } - // Modified function prototype to work with pthreads void *video_decode_test(void* arg) { @@ -204,7 +203,6 @@ void *video_decode_test(void* arg) // Set egl_render to executing ilclient_change_component_state(egl_render, OMX_StateExecuting); - // Request egl_render to write data to the texture buffer if(OMX_FillThisBuffer(ILC_GET_HANDLE(egl_render), eglBuffer) != OMX_ErrorNone) { @@ -263,4 +261,3 @@ void *video_decode_test(void* arg) ilclient_destroy(client); return (void *)status; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_world/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_world/Makefile index 7bf2402307..9e9537be8e 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_world/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/hello_world/Makefile @@ -2,4 +2,3 @@ OBJS=world.o BIN=hello_world.bin include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/Makefile index 82979e3f63..691f8156f0 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/Makefile @@ -2,4 +2,3 @@ OBJS=ilclient.o ilcore.o LIB=libilclient.a include ../../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c index da08ad0634..3c489449ea 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.c @@ -159,10 +159,10 @@ ILCLIENT_T *ilclient_init() { ILCLIENT_T *st = vcos_malloc(sizeof(ILCLIENT_T), "ilclient"); int i; - + if (!st) return NULL; - + vcos_log_set_level(VCOS_LOG_CATEGORY, VCOS_LOG_WARN); vcos_log_register("ilclient", VCOS_LOG_CATEGORY); @@ -361,7 +361,7 @@ int ilclient_create_component(ILCLIENT_T *client, COMPONENT_T **comp, char *name { if(flags & ILCLIENT_DISABLE_ALL_PORTS) ilclient_disable_port(*comp, ports.nStartPortNumber+j); - + if(flags & ILCLIENT_OUTPUT_ZERO_BUFFERS) { OMX_PARAM_PORTDEFINITIONTYPE portdef; @@ -436,7 +436,7 @@ int ilclient_remove_event(COMPONENT_T *st, OMX_EVENTTYPE eEvent, cur->eEvent = -1; // mark as unused // if we're removing an OMX_EventError or OMX_EventParamOrConfigChanged event, then clear the error bit from the eventgroup, - // since the user might have been notified through the error callback, and then + // since the user might have been notified through the error callback, and then // can't clear the event bit - this will then cause problems the next time they // wait for an error. if(eEvent == OMX_EventError) @@ -540,7 +540,7 @@ void ilclient_teardown_tunnels(TUNNEL_T *tunnel) void ilclient_disable_tunnel(TUNNEL_T *tunnel) { OMX_ERRORTYPE error; - + if(tunnel->source == 0 || tunnel->sink == 0) return; @@ -636,7 +636,6 @@ int ilclient_enable_tunnel(TUNNEL_T *tunnel) return 0; } - /*********************************************************** * Name: ilclient_flush_tunnels * @@ -670,7 +669,6 @@ void ilclient_flush_tunnels(TUNNEL_T *tunnel, int max) } } - /*********************************************************** * Name: ilclient_return_events * @@ -786,7 +784,6 @@ void ilclient_enable_port(COMPONENT_T *comp, int portIndex) vc_assert(0); } - /*********************************************************** * Name: ilclient_enable_port_buffers * @@ -810,7 +807,7 @@ int ilclient_enable_port_buffers(COMPONENT_T *comp, int portIndex, portdef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); portdef.nVersion.nVersion = OMX_VERSION; portdef.nPortIndex = portIndex; - + // work out buffer requirements, check port is in the right state error = OMX_GetParameter(comp->comp, OMX_IndexParamPortDefinition, &portdef); if(error != OMX_ErrorNone || portdef.bEnabled != OMX_FALSE || portdef.nBufferCountActual == 0 || portdef.nBufferSize == 0) @@ -882,7 +879,6 @@ int ilclient_enable_port_buffers(COMPONENT_T *comp, int portIndex, return 0; } - /*********************************************************** * Name: ilclient_disable_port_buffers * @@ -907,17 +903,17 @@ void ilclient_disable_port_buffers(COMPONENT_T *comp, int portIndex, portdef.nSize = sizeof(OMX_PARAM_PORTDEFINITIONTYPE); portdef.nVersion.nVersion = OMX_VERSION; portdef.nPortIndex = portIndex; - + // work out buffer requirements, check port is in the right state error = OMX_GetParameter(comp->comp, OMX_IndexParamPortDefinition, &portdef); if(error != OMX_ErrorNone || portdef.bEnabled != OMX_TRUE || portdef.nBufferCountActual == 0 || portdef.nBufferSize == 0) return; - + num = portdef.nBufferCountActual; - + error = OMX_SendCommand(comp->comp, OMX_CommandPortDisable, portIndex, NULL); vc_assert(error == OMX_ErrorNone); - + while(num > 0) { VCOS_UNSIGNED set; @@ -925,23 +921,23 @@ void ilclient_disable_port_buffers(COMPONENT_T *comp, int portIndex, if(list == NULL) { vcos_semaphore_wait(&comp->sema); - + // take buffers for this port off the relevant queue head = portdef.eDir == OMX_DirInput ? &comp->in_list : &comp->out_list; clist = *head; prev = NULL; - + while(clist) { if((portdef.eDir == OMX_DirInput ? clist->nInputPortIndex : clist->nOutputPortIndex) == portIndex) { OMX_BUFFERHEADERTYPE *pBuffer = clist; - + if(!prev) clist = *head = (OMX_BUFFERHEADERTYPE *) pBuffer->pAppPrivate; else clist = prev->pAppPrivate = (OMX_BUFFERHEADERTYPE *) pBuffer->pAppPrivate; - + pBuffer->pAppPrivate = list; list = pBuffer; } @@ -951,7 +947,7 @@ void ilclient_disable_port_buffers(COMPONENT_T *comp, int portIndex, clist = (OMX_BUFFERHEADERTYPE *) &(clist->pAppPrivate); } } - + vcos_semaphore_post(&comp->sema); } @@ -959,15 +955,15 @@ void ilclient_disable_port_buffers(COMPONENT_T *comp, int portIndex, { void *buf = list->pBuffer; OMX_BUFFERHEADERTYPE *next = list->pAppPrivate; - + error = OMX_FreeBuffer(comp->comp, portIndex, list); vc_assert(error == OMX_ErrorNone); - + if(ilclient_free) ilclient_free(private, buf); else vcos_free(buf); - + num--; list = next; } @@ -985,14 +981,13 @@ void ilclient_disable_port_buffers(COMPONENT_T *comp, int portIndex, if((set & ILCLIENT_PORT_DISABLED) && ilclient_remove_event(comp, OMX_EventCmdComplete, OMX_CommandPortDisable, 0, portIndex, 0) >= 0) return; - } + } } - + if(ilclient_wait_for_command_complete(comp, OMX_CommandPortDisable, portIndex) < 0) vc_assert(0); } - /*********************************************************** * Name: ilclient_setup_tunnel * @@ -1030,7 +1025,7 @@ int ilclient_setup_tunnel(TUNNEL_T *tunnel, unsigned int portStream, int timeout status = ilclient_wait_for_event(tunnel->source, OMX_EventPortSettingsChanged, tunnel->source_port, 0, -1, 1, ILCLIENT_PARAMETER_CHANGED | ILCLIENT_EVENT_ERROR, timeout); - + if (status < 0) { ilclient_debug_output( @@ -1080,7 +1075,7 @@ int ilclient_setup_tunnel(TUNNEL_T *tunnel, unsigned int portStream, int timeout vc_assert(error == OMX_ErrorNone); error = OMX_SetupTunnel(tunnel->sink->comp, tunnel->sink_port, NULL, 0); vc_assert(error == OMX_ErrorNone); - + if(enable_error) { //Clean up the errors. This does risk removing an error that was nothing to do with this tunnel :-/ @@ -1124,9 +1119,9 @@ int ilclient_wait_for_event(COMPONENT_T *comp, OMX_EVENTTYPE event, ILEVENT_T *cur; ilclient_lock_events(comp->client); cur = comp->list; - while(cur && cur->eEvent != OMX_EventError) + while(cur && cur->eEvent != OMX_EventError) cur = cur->next; - + if(cur) { // clear error flag @@ -1145,14 +1140,14 @@ int ilclient_wait_for_event(COMPONENT_T *comp, OMX_EVENTTYPE event, cur = comp->list; while(cur && cur->eEvent != OMX_EventParamOrConfigChanged) cur = cur->next; - + ilclient_unlock_events(comp->client); if(cur) return ilclient_remove_event(comp, event, nData1, ignore1, nData2, ignore2) == 0 ? 0 : -3; } - status = vcos_event_flags_get(&comp->event, event_flag, VCOS_OR_CONSUME, + status = vcos_event_flags_get(&comp->event, event_flag, VCOS_OR_CONSUME, suspend, &set); if (status != 0) return -1; @@ -1165,8 +1160,6 @@ int ilclient_wait_for_event(COMPONENT_T *comp, OMX_EVENTTYPE event, return 0; } - - /*********************************************************** * Name: ilclient_wait_for_command_complete_dual * @@ -1224,7 +1217,7 @@ int ilclient_wait_for_command_complete_dual(COMPONENT_T *comp, OMX_COMMANDTYPE c cur->next = comp->client->event_list; comp->client->event_list = cur; cur->eEvent = -1; // mark as unused - + ilclient_unlock_events(comp->client); break; } @@ -1258,7 +1251,6 @@ int ilclient_wait_for_command_complete_dual(COMPONENT_T *comp, OMX_COMMANDTYPE c return ret; } - /*********************************************************** * Name: ilclient_wait_for_command_complete * @@ -1293,14 +1285,14 @@ OMX_BUFFERHEADERTYPE *ilclient_get_output_buffer(COMPONENT_T *comp, int portInde prev = ret; ret = ret->pAppPrivate; } - + if(ret) { if(prev == NULL) comp->out_list = ret->pAppPrivate; else prev->pAppPrivate = ret->pAppPrivate; - + ret->pAppPrivate = NULL; } vcos_semaphore_post(&comp->sema); @@ -1336,14 +1328,14 @@ OMX_BUFFERHEADERTYPE *ilclient_get_input_buffer(COMPONENT_T *comp, int portIndex prev = ret; ret = ret->pAppPrivate; } - + if(ret) { if(prev == NULL) comp->in_list = ret->pAppPrivate; else prev->pAppPrivate = ret->pAppPrivate; - + ret->pAppPrivate = NULL; } vcos_semaphore_post(&comp->sema); @@ -1437,7 +1429,7 @@ static OMX_ERRORTYPE ilclient_event_handler(OMX_IN OMX_HANDLETYPE hComponent, { // remove this duplicate ILEVENT_T *rem = *list; - ilclient_debug_output("%s: removing %d/%d/%d", st->name, event->eEvent, event->nData1, event->nData2); + ilclient_debug_output("%s: removing %d/%d/%d", st->name, event->eEvent, event->nData1, event->nData2); *list = rem->next; rem->eEvent = -1; rem->next = st->client->event_list; @@ -1615,7 +1607,7 @@ static OMX_ERRORTYPE ilclient_event_handler(OMX_IN OMX_HANDLETYPE hComponent, } ilclient_unlock_events(st->client); - // now call any callbacks without the event lock so the client can + // now call any callbacks without the event lock so the client can // remove the event in context switch(eEvent) { case OMX_EventError: @@ -1726,7 +1718,7 @@ static OMX_ERRORTYPE ilclient_fill_buffer_done(OMX_OUT OMX_HANDLETYPE hComponent st->out_list = pBuffer; else list->pAppPrivate = pBuffer; - + pBuffer->pAppPrivate = NULL; vcos_semaphore_post(&st->sema); @@ -1754,15 +1746,12 @@ static OMX_ERRORTYPE ilclient_fill_buffer_done_error(OMX_OUT OMX_HANDLETYPE hCom return OMX_ErrorNone; } - - OMX_HANDLETYPE ilclient_get_handle(COMPONENT_T *comp) { vcos_assert(comp); return comp->comp; } - static struct { OMX_PORTDOMAINTYPE dom; int param; @@ -1833,4 +1822,3 @@ unsigned int ilclient_stack_size(void) { return ILCLIENT_THREAD_DEFAULT_STACK_SIZE; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h index 5e1b10dca0..a12727e5aa 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilclient.h @@ -54,7 +54,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************/ typedef struct _ILCLIENT_T ILCLIENT_T; - /** * Each ILEVENT_T structure stores the result of an EventHandler * callback from a component, storing the event message type and any @@ -62,8 +61,6 @@ typedef struct _ILCLIENT_T ILCLIENT_T; ***********************************************************/ typedef struct _ILEVENT_T ILEVENT_T; - - struct _COMPONENT_T; /** @@ -80,7 +77,6 @@ struct _COMPONENT_T; ***********************************************************/ typedef struct _COMPONENT_T COMPONENT_T; - /** * The generic callback function is used for communicating events from * a particular component to the user. @@ -96,7 +92,6 @@ typedef struct _COMPONENT_T COMPONENT_T; ***********************************************************/ typedef void (*ILCLIENT_CALLBACK_T)(void *userdata, COMPONENT_T *comp, OMX_U32 data); - /** * The buffer callback function is used for indicating that a * component has returned a buffer on a port using client buffer @@ -110,7 +105,6 @@ typedef void (*ILCLIENT_CALLBACK_T)(void *userdata, COMPONENT_T *comp, OMX_U32 d ***********************************************************/ typedef void (*ILCLIENT_BUFFER_CALLBACK_T)(void *data, COMPONENT_T *comp); - /** * The malloc function is passed into * ilclient_enable_port_buffers() and used for allocating the @@ -129,7 +123,6 @@ typedef void (*ILCLIENT_BUFFER_CALLBACK_T)(void *data, COMPONENT_T *comp); ***********************************************************/ typedef void *(*ILCLIENT_MALLOC_T)(void *userdata, VCOS_UNSIGNED size, VCOS_UNSIGNED align, const char *description); - /** * The free function is passed into * ilclient_enable_port_buffers() and @@ -147,7 +140,6 @@ typedef void *(*ILCLIENT_MALLOC_T)(void *userdata, VCOS_UNSIGNED size, VCOS_UNSI ***********************************************************/ typedef void (*ILCLIENT_FREE_T)(void *userdata, void *pointer); - /** * The event mask enumeration describes the possible events that the * user can ask to wait for when waiting for a particular event. @@ -198,9 +190,8 @@ typedef enum { changed. */ } ILEVENT_MASK_T; - /** - * On component creation the user can set flags to control the + * On component creation the user can set flags to control the * creation of that component. ***********************************************************/ typedef enum { @@ -233,9 +224,8 @@ typedef enum { ILCLIENT_OUTPUT_ZERO_BUFFERS = 0x10 /**< All output ports will have nBufferCountActual set to zero, - if supported by the component. */ + if supported by the component. */ } ILCLIENT_CREATE_FLAGS_T; - /** * \brief This structure represents a tunnel in the OpenMAX IL API. @@ -252,7 +242,6 @@ typedef struct { int sink_port; /**< The input port index on the sink component */ } TUNNEL_T; - /** * The set_tunnel macro is a useful function that initialises a * TUNNEL_T structure. @@ -374,11 +363,10 @@ VCHPRE_ void VCHPOST_ ilclient_set_error_callback(ILCLIENT_T *handle, * * @return void ***********************************************************/ -VCHPRE_ void VCHPOST_ ilclient_set_configchanged_callback(ILCLIENT_T *handle, - ILCLIENT_CALLBACK_T func, +VCHPRE_ void VCHPOST_ ilclient_set_configchanged_callback(ILCLIENT_T *handle, + ILCLIENT_CALLBACK_T func, void *userdata); - /** * The ilclient_set_fill_buffer_done_callback() function registers a * callback to be used when a buffer passed to an output port using the @@ -425,10 +413,9 @@ VCHPRE_ void VCHPOST_ ilclient_set_empty_buffer_done_callback(ILCLIENT_T *handle ILCLIENT_BUFFER_CALLBACK_T func, void *userdata); - /** * Components are created using the ilclient_create_component() - * function. + * function. * * @param handle The client handle * @@ -442,7 +429,7 @@ VCHPRE_ void VCHPOST_ ilclient_set_empty_buffer_done_callback(ILCLIENT_T *handle * component. * * @param flags The client can specify some creation behaviour by using - * the flags field. The meaning of each flag is defined + * the flags field. The meaning of each flag is defined * by the ILCLIENT_CREATE_FLAGS_T type. * * @return 0 on success, -1 on failure @@ -460,12 +447,11 @@ VCHPRE_ int VCHPOST_ ilclient_create_component(ILCLIENT_T *handle, * * @param list A null-terminated list of component pointers to be * deallocated. - * + * * @return void ***********************************************************/ VCHPRE_ void VCHPOST_ ilclient_cleanup_components(COMPONENT_T *list[]); - /** * The ilclient_change_component_state() function changes the * state of an individual component. This will trigger the state @@ -483,10 +469,9 @@ VCHPRE_ void VCHPOST_ ilclient_cleanup_components(COMPONENT_T *list[]); VCHPRE_ int VCHPOST_ ilclient_change_component_state(COMPONENT_T *comp, OMX_STATETYPE state); - /** * The ilclient_state_transition() function transitions a set of - * components that need to perform a simultaneous state transition; + * components that need to perform a simultaneous state transition; * for example, when two components are tunnelled and the buffer * supplier port needs to allocate and pass buffers to a non-supplier * port. All components are sent a command to change state, then the @@ -502,7 +487,6 @@ VCHPRE_ int VCHPOST_ ilclient_change_component_state(COMPONENT_T *comp, VCHPRE_ void VCHPOST_ ilclient_state_transition(COMPONENT_T *list[], OMX_STATETYPE state); - /** * The ilclient_disable_port() function disables a port on a * given component. This function sends the disable port message to @@ -520,7 +504,6 @@ VCHPRE_ void VCHPOST_ ilclient_state_transition(COMPONENT_T *list[], VCHPRE_ void VCHPOST_ ilclient_disable_port(COMPONENT_T *comp, int portIndex); - /** * The ilclient_enable_port() function enables a port on a * given component. This function sends the enable port message to @@ -538,8 +521,6 @@ VCHPRE_ void VCHPOST_ ilclient_disable_port(COMPONENT_T *comp, VCHPRE_ void VCHPOST_ ilclient_enable_port(COMPONENT_T *comp, int portIndex); - - /** * The ilclient_enable_port_buffers() function enables a port * in base profile mode on a given component. The port is not @@ -570,7 +551,6 @@ VCHPRE_ int VCHPOST_ ilclient_enable_port_buffers(COMPONENT_T *comp, ILCLIENT_FREE_T ilclient_free, void *userdata); - /** * The ilclient_disable_port_buffers() function disables a * port in base profile mode on a given component. The port is not @@ -600,7 +580,6 @@ VCHPRE_ void VCHPOST_ ilclient_disable_port_buffers(COMPONENT_T *comp, ILCLIENT_FREE_T ilclient_free, void *userdata); - /** * With a populated tunnel structure, the * ilclient_setup_tunnel() function connects the tunnel. It @@ -644,7 +623,6 @@ VCHPRE_ int VCHPOST_ ilclient_setup_tunnel(TUNNEL_T *tunnel, unsigned int portStream, int timeout); - /** * The ilclient_disable_tunnel() function disables both ports listed in * the tunnel structure. It will send a port disable command to each @@ -661,7 +639,6 @@ VCHPRE_ int VCHPOST_ ilclient_setup_tunnel(TUNNEL_T *tunnel, ***********************************************************/ VCHPRE_ void VCHPOST_ ilclient_disable_tunnel(TUNNEL_T *tunnel); - /** * The ilclient_enable_tunnel() function enables both ports listed in * the tunnel structure. It will first send a port enable command to @@ -687,7 +664,6 @@ VCHPRE_ void VCHPOST_ ilclient_disable_tunnel(TUNNEL_T *tunnel); ***********************************************************/ VCHPRE_ int VCHPOST_ ilclient_enable_tunnel(TUNNEL_T *tunnel); - /** * The ilclient_flush_tunnels() function will flush a number of tunnels * from the list of tunnels presented. For each tunnel that is to be @@ -706,7 +682,6 @@ VCHPRE_ int VCHPOST_ ilclient_enable_tunnel(TUNNEL_T *tunnel); VCHPRE_ void VCHPOST_ ilclient_flush_tunnels(TUNNEL_T *tunnel, int max); - /** * The ilclient_teardown_tunnels() function tears down all tunnels in * the list of tunnels presented. For each tunnel in the list, the @@ -714,7 +689,7 @@ VCHPRE_ void VCHPOST_ ilclient_flush_tunnels(TUNNEL_T *tunnel, * where for both calls the destination component is NULL and the * destination port is zero. The VMCSX IL implementation requires * that all tunnels are torn down in this manner before components are - * freed. + * freed. * * @param tunnels List of tunnels to teardown. The list must be * terminated with a tunnel structure with NULL component entries. @@ -723,7 +698,6 @@ VCHPRE_ void VCHPOST_ ilclient_flush_tunnels(TUNNEL_T *tunnel, ***********************************************************/ VCHPRE_ void VCHPOST_ ilclient_teardown_tunnels(TUNNEL_T *tunnels); - /** * The ilclient_get_output_buffer() function returns a buffer * that was sent to an output port and that has been returned from a @@ -742,7 +716,6 @@ VCHPRE_ OMX_BUFFERHEADERTYPE* VCHPOST_ ilclient_get_output_buffer(COMPONENT_T *c int portIndex, int block); - /** * The ilclient_get_input_buffer() function returns a buffer * that was sent to an input port and that has been returned from a @@ -761,7 +734,6 @@ VCHPRE_ OMX_BUFFERHEADERTYPE* VCHPOST_ ilclient_get_input_buffer(COMPONENT_T *co int portIndex, int block); - /** * The ilclient_remove_event() function queries the event list for the * given component, matching against the given criteria. If a matching @@ -793,7 +765,6 @@ VCHPRE_ int VCHPOST_ ilclient_remove_event(COMPONENT_T *comp, OMX_U32 nData2, int ignore2); - /** * The ilclient_return_events() function removes all events * from a component event list and adds them to the IL client free @@ -807,7 +778,6 @@ VCHPRE_ int VCHPOST_ ilclient_remove_event(COMPONENT_T *comp, ***********************************************************/ VCHPRE_ void VCHPOST_ ilclient_return_events(COMPONENT_T *comp); - /** * The ilclient_wait_for_event() function is similar to * ilclient_remove_event(), but allows the caller to block until that @@ -859,13 +829,12 @@ VCHPRE_ int VCHPOST_ ilclient_wait_for_event(COMPONENT_T *comp, int event_flag, int timeout); - /** * The ilclient_wait_for_command_complete() function waits * for a message from a component that indicates that the command - * has completed. This is either a command success message, or an + * has completed. This is either a command success message, or an * error message that signals the completion of an event. - * + * * @param comp The component currently processing a command. * * @param command The command being processed. This must be either @@ -883,7 +852,6 @@ VCHPRE_ int VCHPOST_ ilclient_wait_for_command_complete(COMPONENT_T *comp, OMX_COMMANDTYPE command, OMX_U32 nData2); - /** * The ilclient_wait_for_command_complete_dual() function * is similar to ilclient_wait_for_command_complete(). The @@ -894,7 +862,7 @@ VCHPRE_ int VCHPOST_ ilclient_wait_for_command_complete(COMPONENT_T *comp, * enable a port, or change state to OMX_StateIdle. If the * other component is the buffer supplier and reports an error, then * it will not allocate buffers, so our first component may stall. - * + * * @param comp The component currently processing a command. * * @param command The command being processed. This must be either @@ -918,15 +886,14 @@ VCHPRE_ int VCHPOST_ ilclient_wait_for_command_complete_dual(COMPONENT_T *comp, OMX_COMMANDTYPE command, OMX_U32 nData2, COMPONENT_T *related); - /** - * The ilclient_debug_output() function adds a message to a + * The ilclient_debug_output() function adds a message to a * host-specific debug display. For a local VideoCore host the message is * added to the internal message log. For a Win32 host the message is * printed to the debug display. This function should be customised * when IL client is ported to another platform. - * + * * @param format A message to add, together with the variable * argument list similar to printf and other standard C functions. * @@ -946,7 +913,6 @@ VCHPRE_ void VCHPOST_ ilclient_debug_output(char *format, ...); ***********************************************************/ VCHPRE_ OMX_HANDLETYPE VCHPOST_ ilclient_get_handle(COMPONENT_T *comp); - #ifndef OMX_SKIP64BIT /** @@ -991,7 +957,6 @@ static inline int64_t ilclient_ticks_to_s64(OMX_TICKS t) { return u; } - #endif /* OMX_SKIP64BIT */ /** @@ -1011,7 +976,6 @@ VCHPRE_ int VCHPOST_ ilclient_get_port_index(COMPONENT_T *comp, OMX_PORTDOMAINTYPE type, int index); - /** * The ilclient_suggest_bufsize() function gives a * component a hint about the size of buffer it should use. This size @@ -1027,7 +991,6 @@ VCHPRE_ int VCHPOST_ ilclient_get_port_index(COMPONENT_T *comp, VCHPRE_ int VCHPOST_ ilclient_suggest_bufsize(COMPONENT_T *comp, OMX_U32 nBufSizeHint); - /** * The ilclient_stack_size() function suggests a minimum * stack size that tasks calling into with API will require. diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c index 356733d674..480ed2fa8f 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/ilclient/ilcore.c @@ -71,7 +71,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void) vcos_demand(status == VCOS_SUCCESS); vcos_mutex_lock(&lock); - + if(coreInit == 0) { // we need to connect via an ILCS connection to VideoCore @@ -119,11 +119,10 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void) } vcos_mutex_unlock(&lock); - + return OMX_ErrorNone; } - /* OMX_ComponentNameEnum */ OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( OMX_OUT OMX_STRING cComponentName, @@ -136,7 +135,6 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( return vcil_out_component_name_enum(ilcs_get_common(ilcs_service), cComponentName, nNameLength, nIndex); } - /* OMX_GetHandle */ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( OMX_OUT OMX_HANDLETYPE* pHandle, @@ -179,7 +177,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( if(eError != OMX_ErrorNone && pComp->ComponentDeInit) pComp->ComponentDeInit(hHandle); - } + } if (eError == OMX_ErrorNone) { eError = pComp->SetCallbacks(hHandle,pCallBacks,pAppData); @@ -193,7 +191,7 @@ OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( *pHandle = NULL; free(pComp); } - } + } if (eError == OMX_ErrorNone) { vcos_mutex_lock(&lock); @@ -302,7 +300,4 @@ OMX_ERRORTYPE OMX_GetDebugInformation ( return vcil_out_get_debug_information(ilcs_get_common(ilcs_service), debugInfo, pLen); } - - /* File EOF */ - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile index 1e2a22b474..b31c4adf8b 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/Makefile @@ -4,4 +4,3 @@ LIB=libvgfont.a INCLUDES+=-I$(SDKSTAGE)/usr/include/freetype2 -I$(SDKSTAGE)/usr/include -I$(SDKSTAGE)/usr/include/arm-linux-gnueabi include ../../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/font.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/font.c index 7da2a4ed6e..c153a020c4 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/font.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/font.c @@ -257,7 +257,6 @@ finish: return status; } - /** Find a font in our cache, or create a new entry in the cache. * * Very primitive at present. @@ -342,7 +341,6 @@ int32_t graphics_resource_text_dimensions_ext(GRAPHICS_RESOURCE_HANDLE res, if (!font) goto finish; - vgft_get_text_extents(font, text, text_length, 0.0, 0.0, &w, &h); *width = w; *height = h; @@ -352,4 +350,3 @@ finish: gx_priv_restore(&save); return ret; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics.c index e286adf7e3..067e417838 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics.c @@ -45,10 +45,10 @@ Local data static GX_DISPLAY_T display; /*< Our one and only EGL display. */ /** - * We create one eglContext for each of the possible graphics_x resource types + * We create one eglContext for each of the possible graphics_x resource types * that are supported. ***********************************************************/ -static EGLContext gx_contexts[GRAPHICS_RESOURCE_HANDLE_TYPE_MAX]; +static EGLContext gx_contexts[GRAPHICS_RESOURCE_HANDLE_TYPE_MAX]; /** Note: we have to share all our contexts, because otherwise it seems * to be not valid to blit from one image to another if the images @@ -102,7 +102,7 @@ static int gx_egl_attrib_colours(EGLint *attribs, GRAPHICS_RESOURCE_TYPE_T res_t } /* Create an EGLContext for a given GRAPHICS_RESOURCE_TYPE */ -static VCOS_STATUS_T create_context(EGLDisplay disp, +static VCOS_STATUS_T create_context(EGLDisplay disp, GRAPHICS_RESOURCE_TYPE_T image_type, EGLContext *shared_with) { @@ -135,7 +135,7 @@ static VCOS_STATUS_T create_context(EGLDisplay disp, image_type, eglGetError()); return VCOS_ENOSPC; } - + gx_contexts[image_type] = cxt; gx_configs[image_type] = configs[0]; *shared_with = cxt; @@ -232,21 +232,21 @@ void gx_priv_save(GX_CLIENT_STATE_T *state, GRAPHICS_RESOURCE_HANDLE res) state->res = res; vcos_assert(state->api); // should never be anything other than VG or GL - + vcos_mutex_lock(&lock); egl_result = eglBindAPI(EGL_OPENVG_API); vcos_assert(egl_result); - + if (res) { - GX_TRACE("gx_priv_save: eglMakeCurrent: %s, res %x surface %x, cxt %x", vcos_thread_get_name(vcos_thread_current()), + GX_TRACE("gx_priv_save: eglMakeCurrent: %s, res %x surface %x, cxt %x", vcos_thread_get_name(vcos_thread_current()), (uint32_t)res, (uint32_t)res->surface, (uint32_t)res->context); - egl_result = eglMakeCurrent(display.disp, res->surface, + egl_result = eglMakeCurrent(display.disp, res->surface, res->surface, res->context); vcos_assert(egl_result); - + res->context_bound = 1; } } @@ -272,7 +272,7 @@ void gx_priv_restore(GX_CLIENT_STATE_T *state) vcos_assert(egl_result); if (state->res) state->res->context_bound = 0; - + vcos_mutex_unlock(&lock); } @@ -337,7 +337,7 @@ VCOS_STATUS_T gx_create_window( uint32_t screen_id, } // now need to get the native window - rc = gx_priv_create_native_window(screen_id, + rc = gx_priv_create_native_window(screen_id, width, height, image_type, &h->u.native_window, &cookie); @@ -442,7 +442,7 @@ int32_t graphics_update_displayed_resource(GRAPHICS_RESOURCE_HANDLE res, { GX_CLIENT_STATE_T save; gx_priv_save(&save, res); - + gx_priv_flush(res); gx_priv_restore(&save); @@ -460,15 +460,15 @@ int32_t graphics_resource_fill(GRAPHICS_RESOURCE_HANDLE res, { GX_CLIENT_STATE_T save; gx_priv_save(&save, res); - + VCOS_STATUS_T st = gx_priv_resource_fill( - res, - x, res->height-y-height, - width, height, + res, + x, res->height-y-height, + width, height, fill_colour); gx_priv_restore(&save); - + return st == VCOS_SUCCESS ? 0 : -1; } @@ -491,7 +491,7 @@ int32_t graphics_resource_render_text_ext( GRAPHICS_RESOURCE_HANDLE res, * FIXME: much better caching (or any caching) */ VCOS_STATUS_T rc = gx_priv_render_text( - &display, res, + &display, res, x, res->height-y-text_size, width, height, fg_colour, bg_colour, text, text_length, text_size); @@ -563,7 +563,7 @@ int32_t graphics_bitblt( const GRAPHICS_RESOURCE_HANDLE src, w = width == GRAPHICS_RESOURCE_WIDTH ? src->width : width; h = height == GRAPHICS_RESOURCE_HEIGHT ? src->height : height; - if (x==0 && y==0 && + if (x==0 && y==0 && w == src->width && h == src->height) { @@ -634,7 +634,6 @@ void gx_priv_flush(GRAPHICS_RESOURCE_HANDLE res) vcos_assert(result); } - /** Map a colour, which the client will have supplied in RGB888. */ @@ -681,7 +680,7 @@ VCOS_STATUS_T gx_priv_get_pixels(const GRAPHICS_RESOURCE_HANDLE res, void **p_pi uint32_t width, height; int data_size, pitch; VGImageFormat image_format; - + if (!p_pixels) { status = VCOS_EINVAL; @@ -709,11 +708,11 @@ VCOS_STATUS_T gx_priv_get_pixels(const GRAPHICS_RESOURCE_HANDLE res, void **p_pi goto finish; } } - + data_size = pitch * height; - /* NB: vgReadPixels requires that the data pointer is aligned, but does not - require the stride to be aligned. Most implementations probably will + /* NB: vgReadPixels requires that the data pointer is aligned, but does not + require the stride to be aligned. Most implementations probably will require that as well though... */ pixels = vcos_malloc(data_size, "gx_get_pixels data"); if (!pixels) @@ -743,7 +742,7 @@ VCOS_STATUS_T gx_priv_get_pixels(const GRAPHICS_RESOURCE_HANDLE res, void **p_pi status = VCOS_EINVAL; goto finish; } - } + } /* VG raster order is bottom-to-top */ if (raster_order == GX_TOP_BOTTOM) @@ -759,7 +758,7 @@ VCOS_STATUS_T gx_priv_get_pixels(const GRAPHICS_RESOURCE_HANDLE res, void **p_pi vgReadPixels(dest, pitch, image_format, 0, 0, width, height); vcos_assert(vgGetError() == 0); - + *p_pixels = pixels; finish: @@ -797,7 +796,6 @@ static VCOS_STATUS_T convert_image_type(GRAPHICS_RESOURCE_TYPE_T image_type, return VCOS_SUCCESS; } - /*****************************************************************************/ VCOS_STATUS_T gx_create_pbuffer( uint32_t width, uint32_t height, @@ -836,7 +834,7 @@ VCOS_STATUS_T gx_create_pbuffer( uint32_t width, GX_TRACE("Creating pbuffer surface"); EGLint attribs[] = {EGL_WIDTH, width, EGL_HEIGHT, height, EGL_NONE}; - h->surface = eglCreatePbufferSurface(display.disp, h->config, + h->surface = eglCreatePbufferSurface(display.disp, h->config, attribs); if (!h->surface) { @@ -857,9 +855,9 @@ VCOS_STATUS_T gx_create_pbuffer( uint32_t width, status = VCOS_ENOMEM; goto finish; } - + h->u.pixmap = image; - + // fill it with black status = gx_priv_resource_fill(h, 0, 0, width, height, GRAPHICS_RGBA32(0,0,0,0xff)); vcos_assert(status == VCOS_SUCCESS); @@ -922,7 +920,7 @@ VCOS_STATUS_T gx_fill_gradient(GRAPHICS_RESOURCE_HANDLE dest, uint32_t radius, GX_PAINT_T *p) { - /* Define start and end points of gradient, see OpenVG specification, + /* Define start and end points of gradient, see OpenVG specification, section 9.3.3. */ VGfloat gradient[4] = {0.0, 0.0, 0.0, 0.0}; VGPaint paint = (VGPaint)p; @@ -960,7 +958,7 @@ VCOS_STATUS_T gx_fill_gradient(GRAPHICS_RESOURCE_HANDLE dest, vgDestroyPath(path); vcos_assert(vgGetError() == 0); - + finish: gx_priv_restore(&save); @@ -972,15 +970,15 @@ VCOS_STATUS_T gx_graphics_init(const char *font_dir) { GX_CLIENT_STATE_T save; VCOS_STATUS_T rc; - + gx_priv_save(&save, NULL); - + rc = gx_priv_initialise(); if (rc == VCOS_SUCCESS) rc = gx_priv_font_init(font_dir); gx_priv_restore(&save); - + return rc; } @@ -1006,7 +1004,7 @@ int32_t graphics_userblt(GRAPHICS_RESOURCE_TYPE_T src_type, VGImageFormat vg_src_type; int bytes_per_pixel; GX_CLIENT_STATE_T save; - + status = convert_image_type(src_type, &vg_src_type, &bytes_per_pixel); if (status != VCOS_SUCCESS) return status; @@ -1059,7 +1057,7 @@ int32_t graphics_resource_text_dimensions( GRAPHICS_RESOURCE_HANDLE resource_han /*****************************************************************************/ VCOS_STATUS_T gx_render_arrowhead(GRAPHICS_RESOURCE_HANDLE res, - uint32_t tip_x, uint32_t tip_y, + uint32_t tip_x, uint32_t tip_y, int32_t w, int32_t h, GX_PAINT_T *p) { @@ -1138,25 +1136,25 @@ VCOS_STATUS_T gx_get_pixels(const GRAPHICS_RESOURCE_HANDLE res, void **pixels) VCOS_STATUS_T status = VCOS_SUCCESS; GX_CLIENT_STATE_T save; gx_priv_save(&save, res); - + /* Default to top-top-bottom raster scan order */ status = gx_priv_get_pixels(res, pixels, GX_TOP_BOTTOM); - + gx_priv_restore(&save); return status; } /*****************************************************************************/ -VCOS_STATUS_T gx_get_pixels_in_raster_order(const GRAPHICS_RESOURCE_HANDLE res, - void **pixels, +VCOS_STATUS_T gx_get_pixels_in_raster_order(const GRAPHICS_RESOURCE_HANDLE res, + void **pixels, GX_RASTER_ORDER_T raster_order) { VCOS_STATUS_T status = VCOS_SUCCESS; GX_CLIENT_STATE_T save; gx_priv_save(&save, res); - + status = gx_priv_get_pixels(res, pixels, raster_order); - + gx_priv_restore(&save); return status; } @@ -1180,7 +1178,6 @@ void gx_unbind_vg(GX_CLIENT_STATE_T *restore) gx_priv_restore(restore); } - GX_CLIENT_STATE_T *gx_alloc_context(void) { GX_CLIENT_STATE_T *ret = vcos_calloc(1,sizeof(*ret), "gx_client_state"); @@ -1197,7 +1194,6 @@ void gx_convert_colour(uint32_t colour, float *dest) gx_priv_colour_to_paint(colour, dest); } - #define MAX_DISPLAY_HANDLES 4 #define CHANGE_LAYER (1<<0) @@ -1234,7 +1230,6 @@ void gx_priv_destroy(void) vcos_mutex_delete(&gx.lock); } - static int32_t gx_priv_open_screen(uint32_t index, DISPMANX_DISPLAY_HANDLE_T *pscreen) { @@ -1280,9 +1275,6 @@ int32_t gx_priv_release_screen(uint32_t index) return 0; } - - - int gx_priv_create_native_window(uint32_t screen_id, uint32_t w, uint32_t h, GRAPHICS_RESOURCE_TYPE_T type, @@ -1309,14 +1301,14 @@ int gx_priv_create_native_window(uint32_t screen_id, GX_LOG("Could not start update on screen %d", screen_id); goto fail_update; } - + src_rect.x = src_rect.y = 0; src_rect.width = w << 16; src_rect.height = h << 16; dst_rect.x = dst_rect.y = 0; dst_rect.width = dst_rect.height = 1; - + win->egl_win.width = w; win->egl_win.height = h; VC_DISPMANX_ALPHA_T alpha; @@ -1327,8 +1319,8 @@ int gx_priv_create_native_window(uint32_t screen_id, memset(&clamp, 0x0, sizeof(DISPMANX_CLAMP_T)); win->egl_win.element = vc_dispmanx_element_add(current_update, dispmanx_display, - 0 /* layer */, &dst_rect, - 0 /* src */, &src_rect, + 0 /* layer */, &dst_rect, + 0 /* src */, &src_rect, DISPMANX_PROTECTION_NONE, &alpha /* alpha */, &clamp /* clamp */, @@ -1375,7 +1367,6 @@ gx_priv_destroy_native_window(GRAPHICS_RESOURCE_HANDLE_TABLE_T *res) gx_priv_release_screen(res->screen_id); } - /*********************************************************** * Name: graphics_get_display_size * @@ -1561,7 +1552,6 @@ int32_t graphics_update_start(void) return success; } - /*********************************************************** * Name: graphics_update_end * @@ -1605,4 +1595,3 @@ int32_t graphics_update_end( void ) return success; } - diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h index 05d94b7145..ec2f12df49 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/graphics_x_private.h @@ -109,7 +109,7 @@ typedef struct GRAPHICS_RESOURCE_HANDLE_TABLE_T } GRAPHICS_RESOURCE_HANDLE_TABLE_T; /** - * Structure used to store an EGL client state. + * Structure used to store an EGL client state. ***********************************************************/ struct GX_CLIENT_STATE_T { @@ -123,13 +123,13 @@ struct GX_CLIENT_STATE_T /** * \fixme add documentation * - ***********************************************************/ + ***********************************************************/ void gx_priv_init(void); /** * \fixme add documentation * - ***********************************************************/ + ***********************************************************/ void gx_priv_destroy(void); /** @@ -139,32 +139,32 @@ void gx_priv_destroy(void); * * @param rgba OpenVG paint colour * - ***********************************************************/ + ***********************************************************/ void gx_priv_colour_to_paint(uint32_t col, VGfloat *rgba); -/** +/** * Save current EGL client state. * * @param state upon return, holds the saved EGL client state. * * @param res handle to the surface the EGL client state belongs to (may be NULL). - * + * */ void gx_priv_save(GX_CLIENT_STATE_T *state, GRAPHICS_RESOURCE_HANDLE res); -/** +/** * Restore current EGL client state. * * @param state the EGL client state to restore. - * + * */ void gx_priv_restore(GX_CLIENT_STATE_T *state); -/** +/** * Create a native window for a surface. * * @param screen_id \fixme - * + * * @param w width of the window * * @param h height of the window @@ -183,19 +183,19 @@ int gx_priv_create_native_window(uint32_t screen_id, GX_NATIVE_WINDOW_T *win, void **cookie); -/** +/** * Destroy native window bound to surface. * * @param res Handle to surface. - * + * */ void gx_priv_destroy_native_window(GRAPHICS_RESOURCE_HANDLE_TABLE_T *res); -/** +/** * Initialise font from the given directory. * * @param font_dir path to font - * + * * \fixme only supports Vera.tff at the moment? * * @return VCOS_SUCCESS on success, or error code. @@ -205,7 +205,7 @@ VCOS_STATUS_T gx_priv_font_init(const char *font_dir); /** * \fixme add documentation * - ***********************************************************/ + ***********************************************************/ void gx_priv_font_term(void); /** @@ -214,7 +214,7 @@ void gx_priv_font_term(void); * @param res Handle to surface. * * @param x x-offset of area to fill - * + * * @param y y-offset of area to fill * * @param width width of area to fill @@ -274,7 +274,7 @@ VCOS_STATUS_T gx_priv_render_text( GX_DISPLAY_T *disp, * * @param res Handle to surface. * - ***********************************************************/ + ***********************************************************/ void gx_priv_flush(GRAPHICS_RESOURCE_HANDLE res); /** @@ -285,19 +285,19 @@ void gx_priv_flush(GRAPHICS_RESOURCE_HANDLE res); * * @param cookie ??? * - ***********************************************************/ + ***********************************************************/ void gx_priv_finish_native_window(GRAPHICS_RESOURCE_HANDLE_TABLE_T *res, void *cookie); /** * Flush font cache. * - ***********************************************************/ + ***********************************************************/ void gx_font_cache_flush(void); /** - * Read a bitmap (.BMP) image from the given file. - * + * Read a bitmap (.BMP) image from the given file. + * * @param filename filename (must not be NULL). * * @param width holds the width of the image upon return. @@ -313,15 +313,15 @@ void gx_font_cache_flush(void); * @param flags holds flags describing image properties upon return. * * @param image_data_size holds size of the image data upon return. - * + * * @param pimage_data holds the image data buffer upon return (must not be NULL), * the caller is responsible for releasing the buffer afterwards. * * @return 0 if success, non-zero otherwise (in which case the output parameters * may be invalid). * - ***********************************************************/ -int gx_priv_read_bmp(const char *file_name, + ***********************************************************/ +int gx_priv_read_bmp(const char *file_name, uint32_t *width, uint32_t *height, uint32_t *pitch_bytes, GRAPHICS_RESOURCE_TYPE_T *restype, VGImageFormat *vg_format, @@ -330,8 +330,8 @@ int gx_priv_read_bmp(const char *file_name, void **pimage_data); /** - * Read a Targa (.TGA) image from the given file. - * + * Read a Targa (.TGA) image from the given file. + * * @param filename filename (must not be NULL). * * @param width holds the width of the image upon return. @@ -347,15 +347,15 @@ int gx_priv_read_bmp(const char *file_name, * @param flags holds flags describing image properties upon return. * * @param image_data_size holds size of the image data upon return. - * + * * @param pimage_data holds the image data buffer upon return (must not be NULL), * the caller is responsible for releasing the memory afterwards. * * @return 0 if success, non-zero otherwise (in which case the output parameters. * may be invalid). * - ***********************************************************/ -int gx_priv_read_tga(const char *file_name, + ***********************************************************/ +int gx_priv_read_tga(const char *file_name, uint32_t *width, uint32_t *height, uint32_t *pitch_bytes, GRAPHICS_RESOURCE_TYPE_T *restype, VGImageFormat *vg_format, diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h index b20bb559e0..5ce6547cd7 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgfont.h @@ -66,7 +66,6 @@ typedef enum } GRAPHICS_RESOURCE_TYPE_T; - typedef struct GRAPHICS_RESOURCE_HANDLE_TABLE_T *GRAPHICS_RESOURCE_HANDLE; VCOS_STATUS_T gx_graphics_init(const char *font_dir); diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.c b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.c index 53104c3346..6e24fa2b30 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.c +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/libs/vgfont/vgft.c @@ -255,16 +255,15 @@ void vgft_font_term(VGFT_FONT_T *font) memset(font, 0, sizeof(*font)); } - #define CHAR_COUNT_MAX 200 static VGuint glyph_indices[CHAR_COUNT_MAX]; static VGfloat adjustments_x[CHAR_COUNT_MAX]; static VGfloat adjustments_y[CHAR_COUNT_MAX]; -// Draws the first char_count characters from text, with adjustments, starting -// from the current origin. The peek argument indicates whether to peek ahead -// and get a final adjustment based on the next character past char_count, or -// else just assume that this is the end of the text and add no final +// Draws the first char_count characters from text, with adjustments, starting +// from the current origin. The peek argument indicates whether to peek ahead +// and get a final adjustment based on the next character past char_count, or +// else just assume that this is the end of the text and add no final // adjustment. // // Returns silently in some error cases. Assert fails in some error cases. @@ -304,7 +303,7 @@ static void draw_chars(VGFT_FONT_T *font, const char *text, int char_count, VGbi vgDrawGlyphs(font->vg_font, char_count, glyph_indices, adjustments_x, adjustments_y, paint_modes, VG_FALSE); } -// Goes to the x,y position and draws arbitrary number of characters, draws +// Goes to the x,y position and draws arbitrary number of characters, draws // iteratively if the char_count exceeds the max buffer size given above. static void draw_line(VGFT_FONT_T *font, VGfloat x, VGfloat y, const char *text, int char_count, VGbitfield paint_modes) { diff --git a/gfx/include/userland/host_applications/linux/apps/hello_pi/rebuild.sh b/gfx/include/userland/host_applications/linux/apps/hello_pi/rebuild.sh index 8225dd556d..2ad6aea365 100644 --- a/gfx/include/userland/host_applications/linux/apps/hello_pi/rebuild.sh +++ b/gfx/include/userland/host_applications/linux/apps/hello_pi/rebuild.sh @@ -31,4 +31,3 @@ make -C hello_videocube make -C hello_teapot make -C hello_fft make -C hello_mmal_encode - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/Makefile b/gfx/include/userland/host_applications/linux/apps/raspicam/Makefile index e5e0eaa732..4716e100e2 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/Makefile +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/Makefile @@ -3,4 +3,3 @@ BIN=raspicam.bin LDFLAGS+=-lmmal -lmmal_core -lmmal_util -lm -ldl include ../Makefile.include - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/README.md b/gfx/include/userland/host_applications/linux/apps/raspicam/README.md index c558067c5d..8ea5d96e96 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/README.md +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/README.md @@ -11,17 +11,15 @@ The applications use up to four OpenMAX(mmal) components - camera, preview, enc The preview display is optional, but can be used full screen or directed to a specific rectangular area on the display. If preview is disabled, the null_sink component is used to 'absorb' the preview frames. It is necessary for the camera to produce preview frames even if not required for display, as they are used for calculating exposure and white balance settings. In addition it is possible to omit the filename option, in which case the preview is displayed but no file is written, or to redirect all output to stdout. - + Command line help is available by typing just the application name in on the command line. - ## Setting up the Camera hardware - **Warning.** Cameras are static sensitive. Earth yourself prior to handling the PCB, a sink tap/faucet or similar should suffice if you don't have an earthing strap. The camera board attaches to the Raspberry Pi via a 15 way ribbon cable. There are only two connections to make, the ribbon cable need to be attached to the camera PCB and the Raspberry Pi itself. You need to get it the right way round or the camera will not work. On the camera PCB, the blue backing on the cable should be away from the PCB, and on the Raspberry Pi it should be towards the Ethernet connection (or where the Ethernet connector would be if you are using a model A). -Although the connectors on the PCB and the Pi are different, they work in a similar way. On the Raspberry Pi, pull up the tabs on each end of the connector. It should slide up easily, and be able to pivot around slightly. Fully insert the ribbon cable into the slot, ensuring it is straight, then gently press down the tabs to clip it into place. The camera PCB itself also requires you to pull the tabs away from the board, gently insert the cable, then push the tabs back. The PCB connector is a little more awkward than the one on the Pi itself. +Although the connectors on the PCB and the Pi are different, they work in a similar way. On the Raspberry Pi, pull up the tabs on each end of the connector. It should slide up easily, and be able to pivot around slightly. Fully insert the ribbon cable into the slot, ensuring it is straight, then gently press down the tabs to clip it into place. The camera PCB itself also requires you to pull the tabs away from the board, gently insert the cable, then push the tabs back. The PCB connector is a little more awkward than the one on the Pi itself. ## Setting up the Camera software @@ -34,9 +32,9 @@ Now you need to enable camera support using the raspi-config program you will ha sudo raspi-config -Use the cursor keys to move to the camera option and select enable. On exiting raspi-config it will ask to reboot. The enable option will ensure that on reboot the correct GPU firmware will be running (with the camera driver and tuning), and the GPU memory split is sufficient to allow the camera to acquire enough memory to run correctly. +Use the cursor keys to move to the camera option and select enable. On exiting raspi-config it will ask to reboot. The enable option will ensure that on reboot the correct GPU firmware will be running (with the camera driver and tuning), and the GPU memory split is sufficient to allow the camera to acquire enough memory to run correctly. -To test that the system is installed and working, try the following command : +To test that the system is installed and working, try the following command : raspistill -v -o test.jpg @@ -44,7 +42,7 @@ The display should show a 5 second preview from the camera and then take a pictu ## Troubleshooting -If the camera is not working correctly, there are number of things to try. +If the camera is not working correctly, there are number of things to try. Are the ribbon connectors all firmly seated and the right way round? They must be straight in their sockets. Is the camera module connector firmly attached to the camera PCB? This is the connection from the smaller black camera module itself to the camera PCB. Sometimes this connection can come loose. Using a fingernail, flip up the connector on the PCB, then reseat it with gentle pressure, it engages with a very slight click. Have sudo apt-get update, sudo apt-get upgrade been run? @@ -55,7 +53,7 @@ So, if things are still not working, try the following: Error : raspistill/raspivid not found. This probably means your update/upgrade failed in some way. Try it again. -Error : ENOMEM displayed. Camera is not starting up. Check all connections again. +Error : ENOMEM displayed. Camera is not starting up. Check all connections again. Error : ENOSPC displayed. Camera is probably running out of GPU memory. Check config.txt in the /boot/ folder. The gpu_mem option should be at least 128. @@ -64,7 +62,6 @@ If after all the above, the camera is still not working, it may be defective. Tr ## Common Command line Options Preview Window - --preview, -p Preview window settings <'x,y,w,h'> Allows the user to define the size and location on the screen that the preview window will be placed. Note this will be superimposed over the top of any other windows/graphics. @@ -83,7 +80,6 @@ Sets the opacity of the preview windows. 0 = invisible, 255 = fully opaque. ### Camera Control Options - --sharpness, -sh Set image sharpness (-100 to 100) Set the sharpness of the image, 0 is the default. @@ -111,15 +107,15 @@ In video mode only, turn on video stabilisation. Set the EV compensation of the image. Range is -10 to +10, default is 0. - --exposure, -ex Set exposure mode + --exposure, -ex Set exposure mode -Possible options are: +Possible options are: auto Use automatic exposure mode night Select setting for night shooting nightpreview backlight Select setting for back lit subject -spotlight +spotlight sports Select setting for sports (fast shutter etc) snow Select setting optimised for snowy scenery beach Select setting optimised for beach @@ -138,7 +134,7 @@ sun Sunny mode cloud Cloudy mode shade Shaded mode tungsten Tungsten lighting mode -fluorescent Fluorescent lighting mode +fluorescent Fluorescent lighting mode incandescent Incandescent lighting mode flash Flash mode horizon Horizon mode @@ -148,7 +144,7 @@ horizon Horizon mode Set an effect to be applied to the image none NO effect (default) -negative Negate the image +negative Negate the image solarise Solarise the image posterize Posterise the image whiteboard Whiteboard effect @@ -158,7 +154,7 @@ denoise Denoise the image emboss Emboss the image oilpaint Apply an oil paint style effect hatch Hatch sketch style -gpen +gpen pastel A pastel style effect watercolour A watercolour style effect film Film grain style effect @@ -188,7 +184,6 @@ matrix Matrix metering Sets the rotation of the image in viewfinder and resulting image. This can take any value from 0 upwards, but due to hardware constraints only 0, 90, 180 and 270 degree rotations are supported. - --hflip, -hf Set horizontal flip Flips the preview and saved image horizontally. @@ -197,7 +192,7 @@ Flips the preview and saved image horizontally. Flips the preview and saved image vertically. - --roi, -roi Set sensor region of interest + --roi, -roi Set sensor region of interest Allows the specification of the area of the sensor to be used as the source for the preview and capture. This is defined as x,y for the top left corner, and a width and height, all values in normalised coordinates (0.0-1.0). So to set a ROI at half way across and down the sensor, and an width and height of a quarter of the sensor use : @@ -239,7 +234,7 @@ Outputs debugging/information messages during the program run. --timeout, -t Time before takes picture and shuts down. -The program will run for this length of time, then take the capture (if output is specified). If not specified, this is set to 5 seconds. +The program will run for this length of time, then take the capture (if output is specified). If not specified, this is set to 5 seconds. --timelapse, -tl Timelapse mode. @@ -254,7 +249,7 @@ You can also name the files with timestamp (-ts) or datetime(-dt) will produce a capture every 2 seconds, over a total period of 30s, named image1.jpg, image0002.jpg..image0015.jpg. Note that the %04d indicates a 4 digit number with leading zero's added to pad to the required number of digits. So, for example, %08d would result in an 8 digit number. -If a timelapse value of 0 is entered, the application will take pictures as fast as possible. Note there is an minimum enforced pause of 30ms between captures to ensure that exposure calculations can be made. +If a timelapse value of 0 is entered, the application will take pictures as fast as possible. Note there is an minimum enforced pause of 30ms between captures to ensure that exposure calculations can be made. --thumb, -th Set thumbnail parameters (x:y:quality) @@ -276,13 +271,13 @@ Allows the insertion of specific exif tags in to the JPEG image. You can have up would set the Longitude to 5degs, 10 minutes, 15 seconds. See exif documentation for more details on the range of tags available; the supported tags are as follows. -IFD0.< or +IFD0.< or IFD1.< ImageWidth, ImageLength, BitsPerSample, Compression, PhotometricInterpretation, ImageDescription, Make, Model, StripOffsets, Orientation, SamplesPerPixel, RowsPerString, StripByteCounts, Xresolution, Yresolution, PlanarConfiguration, ResolutionUnit, TransferFunction, Software, DateTime, Artist, WhitePoint, PrimaryChromaticities, JPEGInterchangeFormat, JPEGInterchangeFormatLength, YcbCrCoefficients, YcbCrSubSampling, YcbCrPositioning, ReferenceBlackWhite, Copyright> EXIF.< ExposureTime, FNumber, ExposureProgram, SpectralSensitivity, a -ISOSpeedRatings, OECF, ExifVersion, DateTimeOriginal, DateTimeDigitized, ComponentsConfiguration, CompressedBitsPerPixel, ShutterSpeedValue, ApertureValue, BrightnessValue, ExposureBiasValue, MaxApertureValue, SubjectDistance, MeteringMode, LightSource, Flash, FocalLength, SubjectArea, MakerNote, UserComment, SubSecTime, SubSecTimeOriginal, SubSecTimeDigitized, FlashpixVersion, ColorSpace, PixelXDimension, PixelYDimension, RelatedSoundFile, FlashEnergy, SpacialFrequencyResponse, FocalPlaneXResolution, FocalPlaneYResolution, FocalPlaneResolutionUnit, SubjectLocation, ExposureIndex, SensingMethod, FileSource, SceneType, CFAPattern, CustomRendered, ExposureMode, +ISOSpeedRatings, OECF, ExifVersion, DateTimeOriginal, DateTimeDigitized, ComponentsConfiguration, CompressedBitsPerPixel, ShutterSpeedValue, ApertureValue, BrightnessValue, ExposureBiasValue, MaxApertureValue, SubjectDistance, MeteringMode, LightSource, Flash, FocalLength, SubjectArea, MakerNote, UserComment, SubSecTime, SubSecTimeOriginal, SubSecTimeDigitized, FlashpixVersion, ColorSpace, PixelXDimension, PixelYDimension, RelatedSoundFile, FlashEnergy, SpacialFrequencyResponse, FocalPlaneXResolution, FocalPlaneYResolution, FocalPlaneResolutionUnit, SubjectLocation, ExposureIndex, SensingMethod, FileSource, SceneType, CFAPattern, CustomRendered, ExposureMode, WhiteBalance, DigitalZoomRatio, FocalLengthIn35mmFilm, SceneCaptureType, GainControl, Contrast, Saturation, Sharpness, DeviceSettingDescription, SubjectDistanceRange, ImageUniqueID> GPS.< @@ -312,7 +307,6 @@ The camera is run for the requested time (-t), and a captures can be initiated t ### raspistillyuv - Many of the options for raspistillyuv are the same as those for raspistill. This section shows the differences. Unsupported Options: @@ -322,14 +316,12 @@ Extra Options : --rgb, -rgb Save uncompressed data as RGB888 -This option forces the image to be saved as RGB data with 8 bits per channel, rather than YUV420. +This option forces the image to be saved as RGB data with 8 bits per channel, rather than YUV420. Note that the image buffers saved in raspistillyuv are padded to a horizontal size divisible by 16 (so there may be unused bytes at the end of each line to made the width divisible by 16). Buffers are also padded vertically to be divisible by 16, and in the YUV mode, each plane of Y,U,V is padded in this way. - ### raspivid - --width, -w Set image width Width of resulting video. This should be between 64 and 1920. @@ -338,7 +330,7 @@ Width of resulting video. This should be between 64 and 1920. Height of resulting video. This should be between 64 and 1080. - --bitrate, -b Set bitrate. + --bitrate, -b Set bitrate. Use bits per second, so 10MBits/s would be -b 10000000. For H264, 1080p a high quality bitrate would be 15Mbits/s or more. @@ -400,9 +392,9 @@ Disable preview entirely raspistill -t 2000 -o image.jpg -n -Save the image as a png file (lossless compression, but slower than JPEG). Note that the filename suffix is ignored when choosing the image encoding. +Save the image as a png file (lossless compression, but slower than JPEG). Note that the filename suffix is ignored when choosing the image encoding. - raspistill -t 2000 -o image.png -e png + raspistill -t 2000 -o image.png -e png Add some EXIF information to the JPEG. This sets the Artist tag name to Boris, and the GPS altitude to 123.5m. Note that if setting GPS tags you should set as a minimum GPSLatitude, GPSLatitudeRef, GPSLongitude, GPSLongitudeRef, GPSAltitude and GPSAltitudeRef. @@ -418,7 +410,7 @@ Set the U and V channels of the YUV image to specific values (128:128 produces a Run preview ONLY for 2s, no saved image. - raspistill -t 2000 + raspistill -t 2000 Take timelapse picture, one every 10 seconds for 10 minutes (10 minutes = 600000ms), named image_num_001_today.jpg, image_num_002_today.jpg onwards, with the latest picture also available under the name latest.jpg. @@ -426,7 +418,7 @@ Take timelapse picture, one every 10 seconds for 10 minutes (10 minutes = 600000 Take a picture and send image data to stdout - raspistill -t 2000 -o - + raspistill -t 2000 -o - Take a picture and send image data to file @@ -434,7 +426,7 @@ Take a picture and send image data to file Run camera forever, taking a picture when Enter is pressed - raspistill -t 0 -k -o my_pics%02d.jpg + raspistill -t 0 -k -o my_pics%02d.jpg Video Captures Image size and preview settings are the same as for stills capture. Default size for video recording is 1080p (1920x1080) @@ -453,25 +445,18 @@ Record a 5s clip at a specified framerate (5fps) Encode a 5s camera stream and send image data to stdout - raspivid -t 5000 -o - + raspivid -t 5000 -o - Encode a 5s camera stream and send image data to file raspivid -t 5000 -o - > my_file.h264 - - Shell Error Codes -The applications described here will return a standard error code to the shell on completion. Possible error codes are : +The applications described here will return a standard error code to the shell on completion. Possible error codes are : ER_OK 0 Application ran successfully. EX_USAGE 64 Bad command line parameter ER_SOFTWARE 70 Software or camera error 130 Application terminated by ctrl-C. - - - - - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.c index 50345111c9..584d55d75f 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.c @@ -47,7 +47,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "RaspiCLI.h" - /** * Convert a string from command line to a comand_id from the list * @@ -86,7 +85,6 @@ int raspicli_get_command_id(const COMMAND_LIST *commands, const int num_commands return command_id; } - /** * Display the list of commands in help format * @@ -111,7 +109,6 @@ void raspicli_display_help(const COMMAND_LIST *commands, const int num_commands) } } - /** * Function to take a string, a mapping, and return the int equivalent * @param str Incoming string to match diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.h b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.h index 26b1ce3059..13515ad30b 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCLI.h @@ -45,12 +45,10 @@ typedef struct xref_t int mmal_mode; } XREF_T; - void raspicli_display_help(const COMMAND_LIST *commands, const int num_commands); int raspicli_get_command_id(const COMMAND_LIST *commands, const int num_commands, const char *arg, int *num_parameters); int raspicli_map_xref(const char *str, const XREF_T *map, int num_refs); const char *raspicli_unmap_xref(const int en, XREF_T *map, int num_refs); - #endif diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.c index be0eeb1ab4..7fc3bb1566 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.c @@ -217,7 +217,6 @@ static COMMAND_LIST cmdline_commands[] = static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]); - #define parameter_reset -99999 #define zoom_full_16P16 ((unsigned int)(65536 * 0.15)) @@ -250,7 +249,6 @@ static int update_cycle_parameter(int *option, int min, int max, int increment) return 1; } - /** * Test/Demo code to cycle through a bunch of camera settings * This code is pretty hacky so please don't complain!! @@ -442,8 +440,6 @@ int raspicamcontrol_cycle_test(MMAL_COMPONENT_T *camera) return 1; } - - /** * Convert string to the MMAL parameter for exposure mode * @param str Incoming string to match @@ -908,7 +904,6 @@ void raspicamcontrol_display_help() fprintf(stdout, "\n"); } - /** * Dump contents of camera parameter structure to stderr for debugging/verbose logging * @@ -931,8 +926,6 @@ void raspicamcontrol_dump_parameters(const RASPICAM_CAMERA_PARAMETERS *params) fprintf(stderr, "ROI x %lf, y %f, w %f h %f\n", params->roi.x, params->roi.y, params->roi.w, params->roi.h); } - - /** * Give the supplied parameter block a set of default values * @params Pointer to parameter block @@ -1209,7 +1202,6 @@ int raspicamcontrol_set_metering_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_EXPOS return mmal_status_to_int(mmal_port_parameter_set(camera->control, &meter_mode.hdr)); } - /** * Set the video stabilisation flag. Only used in video mode * @param camera Pointer to camera component @@ -1238,7 +1230,6 @@ int raspicamcontrol_set_exposure_compensation(MMAL_COMPONENT_T *camera, int exp_ return mmal_status_to_int(mmal_port_parameter_set_int32(camera->control, MMAL_PARAMETER_EXPOSURE_COMP, exp_comp)); } - /** * Set exposure mode for images * @param camera Pointer to camera component @@ -1269,7 +1260,6 @@ int raspicamcontrol_set_exposure_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_EXPOS return mmal_status_to_int(mmal_port_parameter_set(camera->control, &exp_mode.hdr)); } - /** * Set flicker avoid mode for images * @param camera Pointer to camera component @@ -1291,7 +1281,6 @@ int raspicamcontrol_set_flicker_avoid_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_ return mmal_status_to_int(mmal_port_parameter_set(camera->control, &fl_mode.hdr)); } - /** * Set the aWB (auto white balance) mode for images * @param camera Pointer to camera component @@ -1400,7 +1389,6 @@ int raspicamcontrol_set_colourFX(MMAL_COMPONENT_T *camera, const MMAL_PARAM_COLO } - /** * Set the rotation of the image * @param camera Pointer to camera component @@ -1581,7 +1569,6 @@ int raspicamcontrol_set_stats_pass(MMAL_COMPONENT_T *camera, int stats_pass) return mmal_status_to_int(mmal_port_parameter_set_boolean(camera->control, MMAL_PARAMETER_CAPTURE_STATS_PASS, stats_pass)); } - /** * Set the annotate data * @param camera Pointer to camera component @@ -1784,7 +1771,6 @@ void raspicamcontrol_check_configuration(int min_gpu_mem) vcos_log_error("Failed to run camera app. Please check for firmware updates\n"); } - /** Default camera callback function * Handles the --settings * @param port diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.h b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.h index ca3a2df78a..060b21fca7 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCamControl.h @@ -109,7 +109,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define ANNOTATE_FRAME_NUMBER 512 #define ANNOTATE_BLACK_BACKGROUND 1024 - // There isn't actually a MMAL structure for the following, so make one typedef struct mmal_param_colourfx_s { @@ -179,7 +178,6 @@ typedef enum ZOOM_IN, ZOOM_OUT, ZOOM_RESET } ZOOM_COMMAND_T; - void raspicamcontrol_check_configuration(int min_gpu_mem); int raspicamcontrol_parse_cmdline(RASPICAM_CAMERA_PARAMETERS *params, const char *arg1, const char *arg2); @@ -242,6 +240,4 @@ MMAL_PARAM_COLOURFX_T raspicamcontrol_get_colourFX(MMAL_COMPONENT_T *camera); */ void default_camera_control_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer); - - #endif /* RASPICAMCONTROL_H_ */ diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCommonSettings.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCommonSettings.c index 38b07ab858..ecac7a30ff 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCommonSettings.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiCommonSettings.c @@ -69,7 +69,6 @@ enum CommandGpsd, }; - static COMMAND_LIST cmdline_commands[] = { { CommandHelp, "-help", "?", "This help information", 0 }, @@ -84,7 +83,6 @@ static COMMAND_LIST cmdline_commands[] = static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]); - void raspicommonsettings_set_defaults(RASPICOMMONSETTINGS_PARAMETERS *state) { strncpy(state->camera_name, "(Unknown)", MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN); @@ -122,7 +120,6 @@ void raspicommonsettings_display_help() raspicli_display_help(cmdline_commands, cmdline_commands_size); } - /** * Parse a possible command pair - command and parameter * @param arg1 Command diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.c index eb2631e18c..8d103a135c 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include - #include "interface/vcos/vcos.h" #include "interface/mmal/mmal.h" #include "interface/mmal/mmal_logging.h" @@ -86,7 +85,6 @@ void display_valid_parameters(char *name, void (*app_help)(char*)) fprintf(stdout, "\n"); } - void get_sensor_defaults(int camera_num, char *camera_name, int *width, int *height ) { MMAL_COMPONENT_T *camera_info; @@ -152,7 +150,6 @@ const char *get_app_name() return app_name; } - /** * Connect two specific ports together * @@ -281,7 +278,6 @@ int mmal_status_to_int(MMAL_STATUS_T status) } } - uint64_t get_microseconds64() { struct timespec spec; diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.h b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.h index c309692331..429d94ea40 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiHelpers.h @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #ifndef RASPICAM_HELPERS #define RASPICAM_HELPERS diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiPreview.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiPreview.c index 77eaef8733..4c8a22c1e4 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiPreview.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiPreview.c @@ -159,7 +159,6 @@ error: return status; } - /** * Destroy the preview component * diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStill.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStill.c index ddbaf70ee0..b92694033b 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStill.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStill.c @@ -237,7 +237,6 @@ static struct static int encoding_xref_size = sizeof(encoding_xref) / sizeof(encoding_xref[0]); - static struct { char *description; @@ -254,7 +253,6 @@ static struct static int next_frame_description_size = sizeof(next_frame_description) / sizeof(next_frame_description[0]); - /** * Assign a default set of parameters to the state passed in * @@ -693,7 +691,6 @@ static int parse_cmdline(int argc, const char **argv, RASPISTILL_STATE *state) return 0; } - /** * buffer header callback function for encoder * @@ -1163,7 +1160,6 @@ static void destroy_encoder_component(RASPISTILL_STATE *state) } } - /** * Add an exif tag to the capture * @@ -1237,7 +1233,6 @@ static void add_exif_tags(RASPISTILL_STATE *state, struct gps_data_t *gpsdata) snprintf(exif_buf, sizeof(exif_buf), "IFD0.DateTime=%s", time_buf); add_exif_tag(state, exif_buf); - // Add GPS tags if (state->common_settings.gps) { @@ -1629,7 +1624,6 @@ static void rename_file(RASPISTILL_STATE *state, FILE *output_file, } } - /** * main */ @@ -2060,4 +2054,3 @@ error: return exit_code; } - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStillYUV.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStillYUV.c index 61d80c4ee3..4e73607375 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStillYUV.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiStillYUV.c @@ -68,7 +68,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/mmal/util/mmal_default_components.h" #include "interface/mmal/util/mmal_connection.h" - #include "RaspiCamControl.h" #include "RaspiPreview.h" #include "RaspiCLI.h" @@ -83,7 +82,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MMAL_CAMERA_VIDEO_PORT 1 #define MMAL_CAMERA_CAPTURE_PORT 2 - // Stills format information // 0 implies variable #define STILLS_FRAME_RATE_NUM 0 @@ -131,7 +129,6 @@ typedef struct MMAL_POOL_T *camera_pool; /// Pointer to the pool of buffers used by camera stills port } RASPISTILLYUV_STATE; - /** Struct used to pass information in camera still port userdata to callback */ typedef struct @@ -437,7 +434,6 @@ static int parse_cmdline(int argc, const char **argv, RASPISTILLYUV_STATE *state if (!parms_used) parms_used = raspipreview_parse_cmdline(&state->preview_parameters, &argv[i][1], second_arg); - // If no parms were used, this must be a bad parameters if (!parms_used) valid = 0; @@ -458,7 +454,6 @@ static int parse_cmdline(int argc, const char **argv, RASPISTILLYUV_STATE *state return 0; } - /** * buffer header callback function for camera output port * @@ -472,7 +467,6 @@ static void camera_buffer_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buff int complete = 0; // We pass our file handle and other stuff in via the userdata field. - PORT_USERDATA *pData = (PORT_USERDATA *)port->userdata; if (pData) @@ -533,7 +527,6 @@ static void camera_buffer_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buff } } - /** * Create the camera component, set up its ports * @@ -1091,7 +1084,6 @@ int main(int argc, const char **argv) if (raspi_gps_setup(state.common_settings.verbose)) state.common_settings.gps = false; - // Setup for sensor specific parameters get_sensor_defaults(state.common_settings.cameraNum, state.common_settings.camera_name, &state.common_settings.width, &state.common_settings.height); @@ -1165,7 +1157,6 @@ int main(int argc, const char **argv) if (state.common_settings.verbose) fprintf(stderr, "Starting video preview\n"); - int frame, keep_looping = 1; FILE *output_file = NULL; char *use_filename = NULL; // Temporary filename while image being written @@ -1221,7 +1212,6 @@ int main(int argc, const char **argv) if (mmal_status_to_int(mmal_port_parameter_set_uint32(state.camera_component->control, MMAL_PARAMETER_SHUTTER_SPEED, state.camera_parameters.shutter_speed) != MMAL_SUCCESS)) vcos_log_error("Unable to set shutter speed"); - // Send all the buffers to the camera output port num = mmal_queue_length(state.camera_pool->queue); @@ -1358,6 +1348,3 @@ error: return exit_code; } - - - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.c index 664751d2ea..338a4bbc10 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.c @@ -491,7 +491,6 @@ error: return -1; } - /** * Takes a description of shader program, compiles it and gets the locations * of uniforms and attributes. @@ -598,4 +597,3 @@ fail: } return -1; } - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.h b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.h index a741fab32a..78dbabee22 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiTexUtil.h @@ -68,7 +68,6 @@ typedef struct RASPITEXUTIL_SHADER_PROGRAM_T GLint attribute_locations[SHADER_MAX_ATTRIBUTES]; } RASPITEXUTIL_SHADER_PROGRAM_T; - /* Uncomment to enable extra GL error checking */ //#define CHECK_GL_ERRORS #if defined(CHECK_GL_ERRORS) diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVid.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVid.c index b7b20e4d72..fe09f90bcf 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVid.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVid.c @@ -115,7 +115,6 @@ const int MAX_BITRATE_LEVEL42 = 62500000; // 62.5Mbits/s /// Interval at which we check for an failure abort during capture const int ABORT_INTERVAL = 100; // ms - /// Capture/Pause switch method /// Simply capture for time specified enum @@ -227,7 +226,6 @@ struct RASPIVID_STATE_S int slices; }; - /// Structure to cross reference H264 profile strings against the MMAL parameter equivalent static XREF_T profile_map[] = { @@ -346,7 +344,6 @@ static COMMAND_LIST cmdline_commands[] = static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]); - static struct { char *description; @@ -362,8 +359,6 @@ static struct static int wait_method_description_size = sizeof(wait_method_description) / sizeof(wait_method_description[0]); - - /** * Assign a default set of parameters to the state passed in * @@ -414,7 +409,6 @@ static void default_status(RASPIVID_STATE *state) state->addSPSTiming = MMAL_FALSE; state->slices = 1; - // Setup preview window defaults raspipreview_set_defaults(&state->preview_parameters); @@ -1684,7 +1678,6 @@ static MMAL_STATUS_T create_camera_component(RASPIVID_STATE *state) if (video_port->buffer_num < VIDEO_OUTPUT_BUFFERS_NUM) video_port->buffer_num = VIDEO_OUTPUT_BUFFERS_NUM; - // Set the encode format on the still port format = still_port->format; @@ -1986,7 +1979,6 @@ static MMAL_STATUS_T create_encoder_component(RASPIVID_STATE *state) else encoder_output->buffer_size = 256<<10; - if (encoder_output->buffer_size < encoder_output->buffer_size_min) encoder_output->buffer_size = encoder_output->buffer_size_min; @@ -2256,7 +2248,6 @@ static int pause_and_test_abort(RASPIVID_STATE *state, int pause) return 0; } - /** * Function to wait in various ways (depending on settings) * @@ -2354,7 +2345,6 @@ static int wait_for_next_change(RASPIVID_STATE *state) return keep_running; } - case WAIT_METHOD_SIGNAL: { // Need to wait for a SIGUSR1 signal diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVidYUV.c b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVidYUV.c index 93ea8fc0fa..67a2461464 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVidYUV.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/RaspiVidYUV.c @@ -100,7 +100,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /// Interval at which we check for an failure abort during capture const int ABORT_INTERVAL = 100; // ms - /// Capture/Pause switch method enum { @@ -205,7 +204,6 @@ static COMMAND_LIST cmdline_commands[] = static int cmdline_commands_size = sizeof(cmdline_commands) / sizeof(cmdline_commands[0]); - static struct { char *description; @@ -221,8 +219,6 @@ static struct static int wait_method_description_size = sizeof(wait_method_description) / sizeof(wait_method_description[0]); - - /** * Assign a default set of parameters to the state passed in * @@ -261,7 +257,6 @@ static void default_status(RASPIVIDYUV_STATE *state) raspicamcontrol_set_defaults(&state->camera_parameters); } - /** * Dump image state parameters to stderr. * @@ -817,7 +812,6 @@ static void camera_buffer_callback(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buff } } - /** * Create the camera component, set up its ports * @@ -1114,7 +1108,6 @@ static int pause_and_test_abort(RASPIVIDYUV_STATE *state, int pause) return 0; } - /** * Function to wait in various ways (depending on settings) * @@ -1505,4 +1498,3 @@ error: return exit_code; } - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/cube_texture_and_coords.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/cube_texture_and_coords.h index 663e23b40a..d4939e970c 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/cube_texture_and_coords.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/cube_texture_and_coords.h @@ -97,4 +97,3 @@ static const GLfloat texCoords[6 * 4 * 2] = { 0.f, 1.f, 1.f, 1.f, }; - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.c index fe14096cda..06e61ef03b 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.c @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.h index 8437728640..de3a44ffdf 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/mirror.h @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/models.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/models.c index bbb5a30644..d62406175d 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/models.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/models.c @@ -58,7 +58,6 @@ typedef struct wavefront_model_s { GLuint texture; } WAVEFRONT_MODEL_T; - /****************************************************************************** Static Data ******************************************************************************/ @@ -77,10 +76,9 @@ static void create_vbo(GLenum type, GLuint *vbo, int size, void *data) vc_assert(*vbo); glBindBuffer(type, *vbo); glBufferData(type, size, data, GL_STATIC_DRAW); - glBindBuffer(type, 0); + glBindBuffer(type, 0); } - static void destroy_vbo(GLuint *vbo) { glDeleteBuffers(1, vbo); @@ -180,14 +178,14 @@ int draw_wavefront(MODEL_T m, GLuint texture) glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_VERTEX]); glVertexPointer(3, GL_FLOAT, 0, NULL); } - if (mat->vbo[VBO_NORMAL]) { + if (mat->vbo[VBO_NORMAL]) { glEnableClientState(GL_NORMAL_ARRAY); glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_NORMAL]); glNormalPointer(GL_FLOAT, 0, NULL); } else { glDisableClientState(GL_NORMAL_ARRAY); } - if (mat->vbo[VBO_TEXTURE]) { + if (mat->vbo[VBO_TEXTURE]) { glEnableClientState(GL_TEXTURE_COORD_ARRAY); glBindBuffer(GL_ARRAY_BUFFER, mat->vbo[VBO_TEXTURE]); glTexCoordPointer(2, GL_FLOAT, 0, NULL); @@ -229,7 +227,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s while (valid > 0) { char *s, *end = line; - + while((end-line < valid) && *end != '\n' && *end != '\r') end++; *end++ = 0; @@ -245,7 +243,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s case '\r': case '\n': case '\0': break; // blank line case 'm': vc_assert(strncmp(s, "mtllib", sizeof "mtllib"-1)==0); break; case 'o': break; - case 'u': + case 'u': if (sscanf(s, "usemtl %s", /*MAX_MATERIAL_NAME-1, */model->material[m->num_materials].name) == 1) { if (m->num_materials < MAX_MATERIALS) { if (m->num_materials > 0 && ((pf-qf)/3 == m->material_index[m->num_materials-1] || strcmp(model->material[m->num_materials-1].name, model->material[m->num_materials].name)==0)) { @@ -269,8 +267,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu" " %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu" " %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu//%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, - pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, + pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36), i >= 6) { int poly = i/2; //vc_assert(i < countof(pp)); // may need to increment poly count and pp array @@ -282,8 +280,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu" " %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu" " %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu/%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, - pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, + pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36), i >= 6) { int poly = i/2; //vc_assert(i < countof(pp); // may need to increment poly count and pp array @@ -295,8 +293,8 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } else if (i = sscanf(s, "f"" %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu" " %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu" " %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu/%hu/%hu %hu", - pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, - pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, + pp+ 0, pp+ 1, pp+ 2, pp+ 3, pp+ 4, pp+ 5, pp+ 6, pp+ 7, pp+ 8, pp+ 9, pp+10, pp+11, pp+12, pp+13, pp+14, pp+15, pp+16, pp+17, + pp+18, pp+19, pp+20, pp+21, pp+22, pp+23, pp+24, pp+25, pp+26, pp+27, pp+28, pp+29, pp+30, pp+32, pp+32, pp+33, pp+34, pp+35, pp+36, pp+37, pp+38, pp+39, pp+40, pp+41, pp+42, pp+43, pp+44, pp+45, pp+46, pp+47, pp+48, pp+49, pp+50, pp+51, pp+52, pp+53, pp+54), i >= 9) { int poly = i/3; //vc_assert(i < countof(pp); // may need to increment poly count and pp array @@ -307,7 +305,7 @@ static int load_wavefront_obj(const char *modelname, WAVEFRONT_MODEL_T *model, s } } else { printf("%s", s); vc_assert(0); } break; - default: + default: printf("%02x %02x %s", s[0], s[1], s); vc_assert(0); break; } @@ -345,7 +343,7 @@ static int load_wavefront_dat(const char *modelname, WAVEFRONT_MODEL_T *model, s { FILE *fp; int s; - const int size = sizeof *m + + const int size = sizeof *m + sizeof(float)*(3+2+3)*MAX_VERTICES + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*MAX_VERTICES; //each face has 9 vertices @@ -371,7 +369,7 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) if (!model || !modelname) return NULL; memset (model, 0, sizeof *model); model->texture = 0; //load_texture(texturename); - m = allocbuffer(sizeof *m + + m = allocbuffer(sizeof *m + sizeof(float)*(3+2+3)*MAX_VERTICES + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*MAX_VERTICES); //each face has 9 vertices if (!m) return 0; @@ -391,7 +389,7 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) #ifdef DUMP_OBJ_DAT strcpy(modelname_obj, modelname); strcat(modelname_obj, ".dat"); - size = sizeof *m + + size = sizeof *m + sizeof(float)*(3*m->numv+2*m->numt+3*m->numn) + // 3 vertices + 2 textures + 3 normals sizeof(unsigned short)*3*m->numf; //each face has 9 vertices fp = host_file_open(modelname_obj, "w"); @@ -418,10 +416,10 @@ MODEL_T load_wavefront(const char *modelname, const char *texturename) // vertex, texture, normal deindex(temp, qv, qf+3*offset+0, 3, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_VERTEX, 3 * mat->numverts * sizeof *qv, temp); // 3 - + deindex(temp, qt, qf+3*offset+1, 2, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_TEXTURE, 2 * mat->numverts * sizeof *qt, temp); // 2 - + deindex(temp, qn, qf+3*offset+2, 3, mat->numverts); create_vbo(GL_ARRAY_BUFFER, mat->vbo+VBO_NORMAL, 3 * mat->numverts * sizeof *qn, temp); // 3 offset += mat->numverts; @@ -449,7 +447,7 @@ void unload_wavefront(MODEL_T m) } } -// create a cube model that looks like a wavefront model, +// create a cube model that looks like a wavefront model, MODEL_T cube_wavefront(void) { static const float qv[] = { @@ -462,7 +460,7 @@ MODEL_T cube_wavefront(void) 0.5f, 0.5f, -0.5f, -0.5f, 0.5f, -0.5f, }; - + static const float qn[] = { 0.0f, -1.0f, -0.0f, 0.0f, 1.0f, -0.0f, @@ -471,14 +469,14 @@ MODEL_T cube_wavefront(void) 0.0f, 0.0f, -1.0f, -1.0f, 0.0f, -0.0f, }; - + static const float qt[] = { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, }; - + static const unsigned short qf[] = { 1,1,1, 2,2,1, 3,3,1, 3,3,1, 4,4,1, 1,1,1, @@ -518,4 +516,3 @@ MODEL_T cube_wavefront(void) return (MODEL_T)model; } - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.c index ad2c8d9475..4172a476ad 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.c @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright @@ -106,7 +105,6 @@ static const EGLint sobel_egl_config_attribs[] = EGL_NONE }; - /** * Initialisation of shader uniforms. * diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.h index 14ab13a927..4c8e777eb1 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/sobel.h @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/square.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/square.h index ef4741aac0..b55cb1184d 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/square.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/square.h @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/teapot.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/teapot.c index eac4bcb36b..8b9ccc618a 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/teapot.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/teapot.c @@ -329,4 +329,3 @@ int teapot_open(RASPITEX_STATE *raspitex_state) raspitex_state->ops.update_texture = raspitexutil_update_texture; return 0; } - diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.c index f47b83ec82..62b3367195 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.c @@ -117,7 +117,6 @@ static EGLImageKHR eglFbImage; static GLuint fb_tex_name; static GLuint fb_name; - // VCSM buffer dimensions must be a power of two. Use glViewPort to draw NPOT // rectangles within the VCSM buffer. static int fb_width = 1024; diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.h index 632d64003e..ad774184a3 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/vcsm_square.h @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2016, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.c b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.c index 89fd6abefc..f5ac73d599 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.c @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.h b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.h index b0e3a91f9b..50ff920e81 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.h +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/gl_scenes/yuv.h @@ -3,7 +3,6 @@ Copyright (c) 2013, Broadcom Europe Ltd Copyright (c) 2013, Tim Gover All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: * Redistributions of source code must retain the above copyright diff --git a/gfx/include/userland/host_applications/linux/apps/raspicam/imv_examples/imv2pgm.c b/gfx/include/userland/host_applications/linux/apps/raspicam/imv_examples/imv2pgm.c index fd32227953..287a553379 100644 --- a/gfx/include/userland/host_applications/linux/apps/raspicam/imv_examples/imv2pgm.c +++ b/gfx/include/userland/host_applications/linux/apps/raspicam/imv_examples/imv2pgm.c @@ -27,14 +27,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include +#include typedef struct { signed char x_vector; signed char y_vector; short sad; -} INLINE_MOTION_VECTOR; +} INLINE_MOTION_VECTOR; int main(int argc, const char **argv) { @@ -45,7 +45,7 @@ int main(int argc, const char **argv) } int mbx=atoi(argv[2]); int mby=atoi(argv[3]); - + /////////////////////////////// // Read raw file to buffer // /////////////////////////////// @@ -55,9 +55,9 @@ int main(int argc, const char **argv) fseek(f, 0, SEEK_SET); char *buffer = malloc(fsize + 1); fread(buffer, fsize, 1, f); - fclose(f); + fclose(f); buffer[fsize] = 0; - + /////////////////// // Fill struct // /////////////////// @@ -66,15 +66,15 @@ int main(int argc, const char **argv) printf("File to short!\n"); return 0; } - INLINE_MOTION_VECTOR *imv; + INLINE_MOTION_VECTOR *imv; imv = malloc((mbx+1)*mby*sizeof(INLINE_MOTION_VECTOR)); memcpy ( &imv[0], &buffer[0], (mbx+1)*mby*sizeof(INLINE_MOTION_VECTOR) ); ///////////////////// // Export to PGM // - ///////////////////// + ///////////////////// FILE *out = fopen(argv[4], "w"); - fprintf(out,"P5\n%d %d\n255\n",mbx,mby); + fprintf(out,"P5\n%d %d\n255\n",mbx,mby); int i,j; for(j=0;j @@ -127,7 +126,7 @@ static int get_status( VCSM_STATUS_T mode, int pid ) case VCSM_STATUS_VC_WALK_ALLOC: vcsm_status( VCSM_STATUS_VC_WALK_ALLOC, -1 ); break; - + case VCSM_STATUS_HOST_WALK_MAP: if ( pid != -1 ) { @@ -147,7 +146,7 @@ static int get_status( VCSM_STATUS_T mode, int pid ) vcsm_status( VCSM_STATUS_VC_WALK_ALLOC, -1 ); vcsm_status( VCSM_STATUS_HOST_WALK_MAP, -1 ); break; - + default: break; } @@ -408,7 +407,7 @@ int main( int argc, char **argv ) vcsm_unlock_hdl( usr_hdl_2 ) ); // This checks that we can free a memory block even if it - // is locked, which could be the case if the application + // is locked, which could be the case if the application // dies. // usr_ptr_2 = vcsm_lock( usr_hdl_2 ); @@ -425,14 +424,14 @@ int main( int argc, char **argv ) { get_status( status_mode, opt_pid ); } - + // If we allocated something, wait for the signal to exit to give chance for the // user to poke around the allocation test. // if ( opt_alloc == 1 ) { start_monitor(); - + vcos_event_wait( &quit_event ); vcos_event_delete( &quit_event ); } diff --git a/gfx/include/userland/host_applications/linux/apps/tvservice/tvservice.c b/gfx/include/userland/host_applications/linux/apps/tvservice/tvservice.c index 7d37d0e5a9..2b0bdc51b9 100644 --- a/gfx/include/userland/host_applications/linux/apps/tvservice/tvservice.c +++ b/gfx/include/userland/host_applications/linux/apps/tvservice/tvservice.c @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - // ---- Include Files ------------------------------------------------------- #include @@ -511,7 +510,7 @@ static int dump_edid( const char *filename ) break; } } - } + } if (fp) fclose(fp); if(written) { @@ -1089,7 +1088,7 @@ int main( int argc, char **argv ) goto err_stop_service; } } - + if ( opt_audiosup == 1 ) { if ( get_audiosup() != 0 ) @@ -1097,7 +1096,7 @@ int main( int argc, char **argv ) goto err_stop_service; } } - + if ( opt_dumpedid == 1 ) { if ( dump_edid(dumpedid_filename) != 0 ) diff --git a/gfx/include/userland/host_applications/linux/apps/vcmailbox/vcmailbox.c b/gfx/include/userland/host_applications/linux/apps/vcmailbox/vcmailbox.c index 9ce95f91f4..2444cd47d4 100644 --- a/gfx/include/userland/host_applications/linux/apps/vcmailbox/vcmailbox.c +++ b/gfx/include/userland/host_applications/linux/apps/vcmailbox/vcmailbox.c @@ -55,7 +55,6 @@ static int mbox_property(int file_desc, void *buf) return ret_val; } - static int mbox_open() { int file_desc; @@ -74,7 +73,6 @@ static void mbox_close(int file_desc) { close(file_desc); } - #define MAX_WORDS 256 int main(int argc, char *argv[]) diff --git a/gfx/include/userland/host_applications/linux/libs/bcm_host/CMakeLists.txt b/gfx/include/userland/host_applications/linux/libs/bcm_host/CMakeLists.txt index a863cb6d2b..b05f2082c1 100644 --- a/gfx/include/userland/host_applications/linux/libs/bcm_host/CMakeLists.txt +++ b/gfx/include/userland/host_applications/linux/libs/bcm_host/CMakeLists.txt @@ -9,17 +9,16 @@ endif () # set this as we want all the source of vchostif to be available in libbcm_host set (CMAKE_SHARED_LINKER_FLAGS "-u vc_gpuserv_init ${CMAKE_SHARED_LINKER_FLAGS}") -include_directories( ../../../.. +include_directories( ../../../.. ../../../../interface/vcos/${VCOS_PLATFORM} ../../../../host_support/linux/added/include ../../../../host_applications/vmcs/test_apps/iltest ../../../../host_applications/framework/common ) -add_library(bcm_host ${SHARED} bcm_host.c - ../../../../interface/vmcs_host/linux/vcfilesys.c +add_library(bcm_host ${SHARED} bcm_host.c + ../../../../interface/vmcs_host/linux/vcfilesys.c ../../../../interface/vmcs_host/linux/vcfiled/vcfiled_check.c) target_link_libraries(bcm_host vcos vchostif) install(TARGETS bcm_host DESTINATION lib) - diff --git a/gfx/include/userland/host_applications/linux/libs/bcm_host/bcm_host.c b/gfx/include/userland/host_applications/linux/libs/bcm_host/bcm_host.c index d8e82aa104..01af723677 100644 --- a/gfx/include/userland/host_applications/linux/libs/bcm_host/bcm_host.c +++ b/gfx/include/userland/host_applications/linux/libs/bcm_host/bcm_host.c @@ -49,14 +49,14 @@ int32_t graphics_get_display_size( const uint16_t display_number, if (display_handle) { success = vc_dispmanx_display_get_info(display_handle, &mode_info); - + if( success >= 0 ) { if( NULL != width ) { *width = mode_info.width; } - + if( NULL != height ) { *height = mode_info.height; @@ -86,7 +86,7 @@ void bcm_host_init(void) static int initted; int success = -1; char response[ 128 ]; - + if (initted) return; initted = 1; @@ -108,7 +108,7 @@ void bcm_host_init(void) vcos_log("vchi_connect"); vchi_connect(&global_connection, 1, global_initialise_instance); - + vc_vchi_gencmd_init (global_initialise_instance, &global_connection, 1); vc_vchi_dispmanx_init (global_initialise_instance, &global_connection, 1); vc_vchi_tv_init (global_initialise_instance, &global_connection, 1); @@ -165,4 +165,3 @@ unsigned bcm_host_get_sdram_address(void) return address == ~0 ? 0x40000000 : address; } - diff --git a/gfx/include/userland/host_applications/linux/libs/bcm_host/include/bcm_host.h b/gfx/include/userland/host_applications/linux/libs/bcm_host/include/bcm_host.h index 94478e2719..cfd4202c80 100644 --- a/gfx/include/userland/host_applications/linux/libs/bcm_host/include/bcm_host.h +++ b/gfx/include/userland/host_applications/linux/libs/bcm_host/include/bcm_host.h @@ -58,4 +58,3 @@ unsigned bcm_host_get_sdram_address(void); #endif #endif - diff --git a/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.c b/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.c index c4480dbb1b..49cd0d3e87 100644 --- a/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.c +++ b/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.c @@ -55,7 +55,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "debug_sym.h" #include "vc_debug_sym.h" - // ---- Public Variables ---------------------------------------------------- // ---- Private Constants and Types ----------------------------------------- @@ -675,7 +674,6 @@ static int AccessVideoCoreMemory( VC_MEM_ACCESS_HANDLE_T vcHandle, return 1; } - /**************************************************************************** * * Reads 'numBytes' from the videocore memory starting at 'vcMemAddr'. The @@ -831,4 +829,3 @@ VC_MEM_ADDR_T GetVideoCoreMemoryPhysicalAddress( VC_MEM_ACCESS_HANDLE_T vcHandle { return vcHandle->vcMemPhys; } - diff --git a/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.h b/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.h index f05bfa5e6f..25284539e6 100644 --- a/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.h +++ b/gfx/include/userland/host_applications/linux/libs/debug_sym/debug_sym.h @@ -69,8 +69,8 @@ typedef uint32_t VC_MEM_PTRDIFF_T; /* equivalent to ptrdiff_t */ int OpenVideoCoreMemory( VC_MEM_ACCESS_HANDLE_T *handle ); /* - * Get access to the videocore space from a file. The file might be /dev/mem, or - * it might be saved image on disk. + * Get access to the videocore space from a file. The file might be /dev/mem, or + * it might be saved image on disk. */ int OpenVideoCoreMemoryFile( const char *filename, VC_MEM_ACCESS_HANDLE_T *vcHandlePtr ); @@ -210,6 +210,4 @@ VC_MEM_ADDR_T GetVideoCoreMemoryPhysicalAddress( VC_MEM_ACCESS_HANDLE_T handle ) } #endif - #endif /* DEBUG_SYM_H */ - diff --git a/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.c b/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.c index e424129394..f1b4cc7f13 100644 --- a/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.c +++ b/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.c @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include - #include #include "user-vcsm.h" #include "interface/vcos/vcos.h" @@ -89,7 +88,7 @@ static VCSM_CACHE_MUTEX_LKUP_T vcsm_cache_mutex_table[] = static VCSM_CACHE_TYPE_T vcsm_cache_table_lookup( VCSM_CACHE_TYPE_T current, VCSM_CACHE_TYPE_T new ) { - VCSM_CACHE_MUTEX_LKUP_T *p_map = vcsm_cache_mutex_table; + VCSM_CACHE_MUTEX_LKUP_T *p_map = vcsm_cache_mutex_table; while ( !( (p_map->cur == VCSM_CACHE_TYPE_NONE) && (p_map->new == VCSM_CACHE_TYPE_NONE) ) ) @@ -120,7 +119,6 @@ static void vcsm_init_once(void) vcos_log_register( "usrvcsm", &usrvcsm_log_category ); } - /* Initialize the vcsm processing. ** ** Must be called once before attempting to do anything else. @@ -143,7 +141,6 @@ int vcsm_init( void ) vcsm_handle = open( VCSM_DEVICE_NAME, O_RDWR, 0 ); vcsm_page_size = getpagesize(); - out: if ( vcsm_handle != VCSM_INVALID_HANDLE ) { @@ -161,7 +158,6 @@ out: return result; } - /* Terminates the vcsm processing. ** ** Must be called vcsm services are no longer needed, it will @@ -195,7 +191,6 @@ out: vcos_mutex_unlock( &vcsm_mutex ); } - /* Allocates a cached block of memory of size 'size' via the vcsm memory ** allocator, the type of caching requested is passed as argument of the ** function call. @@ -207,7 +202,7 @@ out: ** handle to gain access to the memory associated with the opaque handle. ** When finished using the memory, the user calls vcsm_unlock_xx (see those ** function definition for more details on the one that can be used). -** +** ** A well behaved application should make every attempt to lock/unlock ** only for the duration it needs to access the memory data associated with ** the opaque handle. @@ -219,7 +214,7 @@ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char void *usr_ptr = NULL; int rc; - if ( (size == 0) || (vcsm_handle == VCSM_INVALID_HANDLE) ) + if ( (size == 0) || (vcsm_handle == VCSM_INVALID_HANDLE) ) { vcos_log_error( "[%s]: [%d] [%s]: NULL size or invalid device!", __func__, @@ -295,7 +290,6 @@ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char return 0; } - /* Allocates a non-cached block of memory of size 'size' via the vcsm memory ** allocator. ** @@ -306,7 +300,7 @@ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char ** handle to gain access to the memory associated with the opaque handle. ** When finished using the memory, the user calls vcsm_unlock_xx (see those ** function definition for more details on the one that can be used). -** +** ** A well behaved application should make every attempt to lock/unlock ** only for the duration it needs to access the memory data associated with ** the opaque handle. @@ -420,7 +414,7 @@ void vcsm_free( unsigned int handle ) struct vmcs_sm_ioctl_map map; void *usr_ptr = NULL; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or handle!", __func__, @@ -497,7 +491,6 @@ out: return; } - /* Queries the status of the the vcsm. ** ** Triggers dump of various kind of information, see the @@ -509,7 +502,7 @@ void vcsm_status( VCSM_STATUS_T status, int pid ) { struct vmcs_sm_ioctl_walk walk; - if ( vcsm_handle == VCSM_INVALID_HANDLE ) + if ( vcsm_handle == VCSM_INVALID_HANDLE ) { vcos_log_error( "[%s]: [%d]: invalid device!", __func__, @@ -569,7 +562,6 @@ void vcsm_status( VCSM_STATUS_T status, int pid ) } } - /* Retrieves a videocore opaque handle from a mapped user address ** pointer. The videocore handle will correspond to the actual ** memory mapped in videocore. @@ -631,7 +623,6 @@ unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr ) } } - /* Retrieves a videocore opaque handle from a opaque handle ** pointer. The videocore handle will correspond to the actual ** memory mapped in videocore. @@ -692,7 +683,6 @@ unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle ) } } - /* Retrieves a videocore (bus) address from a opaque handle ** pointer. ** @@ -745,7 +735,6 @@ unsigned int vcsm_vc_addr_from_hdl( unsigned int handle ) } } - /* Retrieves a mapped user address from an opaque user ** handle. ** @@ -761,7 +750,7 @@ void *vcsm_usr_address( unsigned int handle ) int rc; struct vmcs_sm_ioctl_map map; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or handle!", __func__, @@ -803,7 +792,6 @@ void *vcsm_usr_address( unsigned int handle ) } } - /* Retrieves a user opaque handle from a mapped user address ** pointer. ** @@ -815,7 +803,7 @@ unsigned int vcsm_usr_handle( void *usr_ptr ) int rc; struct vmcs_sm_ioctl_map map; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (usr_ptr == NULL) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (usr_ptr == NULL) ) { vcos_log_error( "[%s]: [%d]: invalid device or null usr-ptr!", __func__, @@ -825,7 +813,7 @@ unsigned int vcsm_usr_handle( void *usr_ptr ) } memset( &map, 0, sizeof(map) ); - + map.pid = getpid(); map.addr = (unsigned int) usr_ptr; @@ -853,11 +841,10 @@ unsigned int vcsm_usr_handle( void *usr_ptr ) map.handle, map.addr ); - return map.handle; + return map.handle; } } - /* Locks the memory associated with this opaque handle. ** ** Returns: NULL on error @@ -879,7 +866,7 @@ void *vcsm_lock( unsigned int handle ) struct vmcs_sm_ioctl_cache cache; void *usr_ptr = NULL; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or invalid handle!", __func__, @@ -979,7 +966,6 @@ out: return usr_ptr; } - /* Locks the memory associated with this opaque handle. The lock ** also gives a chance to update the *host* cache behavior of the ** allocated buffer if so desired. The *videocore* cache behavior @@ -1020,7 +1006,7 @@ void *vcsm_lock_cache( unsigned int handle, void *usr_ptr = NULL; VCSM_CACHE_TYPE_T new_cache; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or invalid handle!", __func__, @@ -1091,7 +1077,7 @@ void *vcsm_lock_cache( unsigned int handle, *cache_result = (VCSM_CACHE_TYPE_T)chk.cache; } goto lock_default; - } + } /* At this point we know we want to lock the buffer and apply a cache ** behavior change. Start by cleaning out whatever is already setup. @@ -1217,7 +1203,6 @@ void *vcsm_lock_cache( unsigned int handle, */ goto out; - lock_default: usr_ptr = vcsm_lock ( handle ); @@ -1225,7 +1210,6 @@ out: return usr_ptr; } - /* Unlocks the memory associated with this user mapped address. ** Apply special processing that would override the otherwise ** default behavior. @@ -1247,7 +1231,7 @@ int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush ) struct vmcs_sm_ioctl_map map; struct vmcs_sm_ioctl_cache cache; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (usr_ptr == NULL) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (usr_ptr == NULL) ) { vcos_log_error( "[%s]: [%d]: invalid device or invalid user-ptr!", __func__, @@ -1336,7 +1320,6 @@ out: return rc; } - /* Unlocks the memory associated with this user mapped address. ** ** Returns: 0 on success @@ -1350,7 +1333,6 @@ int vcsm_unlock_ptr( void *usr_ptr ) return vcsm_unlock_ptr_sp( usr_ptr, 0 ); } - /* Unlocks the memory associated with this user opaque handle. ** Apply special processing that would override the otherwise ** default behavior. @@ -1374,7 +1356,7 @@ int vcsm_unlock_hdl_sp( unsigned int handle, int cache_no_flush ) struct vmcs_sm_ioctl_cache cache; struct vmcs_sm_ioctl_map map; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or invalid handle!", __func__, @@ -1462,7 +1444,6 @@ out: return rc; } - /* Unlocks the memory associated with this user opaque handle. ** ** Returns: 0 on success @@ -1499,7 +1480,7 @@ int vcsm_resize( unsigned int handle, unsigned int new_size ) unsigned int size_aligned = new_size; void *usr_ptr = NULL; - if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) + if ( (vcsm_handle == VCSM_INVALID_HANDLE) || (handle == 0) ) { vcos_log_error( "[%s]: [%d]: invalid device or invalid handle!", __func__, @@ -1613,7 +1594,6 @@ out: return rc; } - /* Flush or invalidate the memory associated with this user opaque handle ** ** Returns: non-zero on error diff --git a/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.h b/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.h index c65c0a2c2a..1e6706fe65 100644 --- a/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.h +++ b/gfx/include/userland/host_applications/linux/libs/sm/user-vcsm.h @@ -154,7 +154,6 @@ typedef enum */ int vcsm_init( void ); - /* Terminates the vcsm processing. ** ** Must be called vcsm services are no longer needed, it will @@ -163,7 +162,6 @@ int vcsm_init( void ); */ void vcsm_exit( void ); - /* Queries the status of the the vcsm. ** ** Triggers dump of various kind of information, see the @@ -173,7 +171,6 @@ void vcsm_exit( void ); */ void vcsm_status( VCSM_STATUS_T status, int pid ); - /* Allocates a non-cached block of memory of size 'size' via the vcsm memory ** allocator. ** @@ -184,14 +181,13 @@ void vcsm_status( VCSM_STATUS_T status, int pid ); ** handle to gain access to the memory associated with the opaque handle. ** When finished using the memory, the user calls vcsm_unlock_xx (see those ** function definition for more details on the one that can be used). -** +** ** A well behaved application should make every attempt to lock/unlock ** only for the duration it needs to access the memory data associated with ** the opaque handle. */ unsigned int vcsm_malloc( unsigned int size, char *name ); - /* Allocates a cached block of memory of size 'size' via the vcsm memory ** allocator, the type of caching requested is passed as argument of the ** function call. @@ -203,14 +199,13 @@ unsigned int vcsm_malloc( unsigned int size, char *name ); ** handle to gain access to the memory associated with the opaque handle. ** When finished using the memory, the user calls vcsm_unlock_xx (see those ** function definition for more details on the one that can be used). -** +** ** A well behaved application should make every attempt to lock/unlock ** only for the duration it needs to access the memory data associated with ** the opaque handle. */ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char *name ); - /* Shares an allocated block of memory via the vcsm memory allocator. ** ** Returns: 0 on error @@ -227,7 +222,6 @@ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char */ unsigned int vcsm_malloc_share( unsigned int handle ); - /* Resizes a block of memory allocated previously by vcsm_alloc. ** ** Returns: 0 on success @@ -242,7 +236,6 @@ unsigned int vcsm_malloc_share( unsigned int handle ); */ int vcsm_resize( unsigned int handle, unsigned int new_size ); - /* Frees a block of memory that was successfully allocated by ** a prior call the vcms_alloc. ** @@ -257,7 +250,6 @@ int vcsm_resize( unsigned int handle, unsigned int new_size ); */ void vcsm_free( unsigned int handle ); - /* Retrieves a videocore opaque handle from a mapped user address ** pointer. The videocore handle will correspond to the actual ** memory mapped in videocore. @@ -274,7 +266,6 @@ void vcsm_free( unsigned int handle ); */ unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr ); - /* Retrieves a videocore opaque handle from a opaque handle ** pointer. The videocore handle will correspond to the actual ** memory mapped in videocore. @@ -291,7 +282,6 @@ unsigned int vcsm_vc_hdl_from_ptr( void *usr_ptr ); */ unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle ); - /* Retrieves a videocore (bus) address from a opaque handle ** pointer. ** @@ -300,7 +290,6 @@ unsigned int vcsm_vc_hdl_from_hdl( unsigned int handle ); */ unsigned int vcsm_vc_addr_from_hdl( unsigned int handle ); - /* Retrieves a user opaque handle from a mapped user address ** pointer. ** @@ -309,7 +298,6 @@ unsigned int vcsm_vc_addr_from_hdl( unsigned int handle ); */ unsigned int vcsm_usr_handle( void *usr_ptr ); - /* Retrieves a mapped user address from an opaque user ** handle. ** @@ -322,7 +310,6 @@ unsigned int vcsm_usr_handle( void *usr_ptr ); */ void *vcsm_usr_address( unsigned int handle ); - /* Locks the memory associated with this opaque handle. ** ** Returns: NULL on error @@ -337,7 +324,6 @@ void *vcsm_usr_address( unsigned int handle ); */ void *vcsm_lock( unsigned int handle ); - /* Locks the memory associated with this opaque handle. The lock ** also gives a chance to update the *host* cache behavior of the ** allocated buffer if so desired. The *videocore* cache behavior @@ -369,7 +355,6 @@ void *vcsm_lock_cache( unsigned int handle, VCSM_CACHE_TYPE_T cache_update, VCSM_CACHE_TYPE_T *cache_result ); - /* Unlocks the memory associated with this user mapped address. ** ** Returns: 0 on success @@ -380,7 +365,6 @@ void *vcsm_lock_cache( unsigned int handle, */ int vcsm_unlock_ptr( void *usr_ptr ); - /* Unlocks the memory associated with this user mapped address. ** Apply special processing that would override the otherwise ** default behavior. @@ -397,7 +381,6 @@ int vcsm_unlock_ptr( void *usr_ptr ); */ int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush ); - /* Unlocks the memory associated with this user opaque handle. ** ** Returns: 0 on success @@ -409,7 +392,6 @@ int vcsm_unlock_ptr_sp( void *usr_ptr, int cache_no_flush ); */ int vcsm_unlock_hdl( unsigned int handle ); - /* Unlocks the memory associated with this user opaque handle. ** Apply special processing that would override the otherwise ** default behavior. @@ -469,4 +451,3 @@ unsigned int vcsm_import_dmabuf( int dmabuf, char *name ); #endif #endif /* __USER_VCSM__H__INCLUDED__ */ - diff --git a/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/mmalcam.c b/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/mmalcam.c index 294349e667..a7e867c9b4 100644 --- a/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/mmalcam.c +++ b/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/mmalcam.c @@ -126,7 +126,6 @@ error: return result; } - /*****************************************************************************/ static void *test_mmal_camcorder(void *id) { diff --git a/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/viewfinder.c b/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/viewfinder.c index 4028a71504..341ffc1957 100644 --- a/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/viewfinder.c +++ b/gfx/include/userland/host_applications/vmcs/test_apps/mmalcam/viewfinder.c @@ -334,7 +334,6 @@ static void disable_port(MMAL_PORT_T *port) mmal_port_disable(port); } - static int parse_vformat(const char* vformat, uint32_t *out_width, uint32_t *out_height, uint32_t *out_encoding) { @@ -485,7 +484,7 @@ int test_mmal_start_camcorder(volatile int *stop, MMALCAM_BEHAVIOUR_T *behaviour fprintf(stderr, "Error (%i) opening container: %s\n", status, behaviour->uri); } #else - + output = fopen(behaviour->uri, "wb"); if(!output) { @@ -1135,15 +1134,14 @@ static MMAL_BOOL_T mmalcam_next_colour_param(MMAL_COMPONENT_T *camera, uint32_t } if (memcmp(¶m, ¶m_check, sizeof(param)) != 0) { - LOG_ERROR("%s set (%d/%d) was not retrieved (%d/%d)", param_name, - param.value.num, param.value.den, + LOG_ERROR("%s set (%d/%d) was not retrieved (%d/%d)", param_name, + param.value.num, param.value.den, param_check.value.num, param_check.value.den); return MMAL_FALSE; } return MMAL_TRUE; } - /*****************************************************************************/ static MMAL_COMPONENT_T *test_video_render_create(MMALCAM_BEHAVIOUR_T *behaviour, MMAL_STATUS_T *status) { @@ -1351,7 +1349,7 @@ static VC_CONTAINER_T *test_container_open(const char *uri, MMAL_ES_FORMAT_T *fo switch (format->type) { - case MMAL_ES_TYPE_VIDEO: + case MMAL_ES_TYPE_VIDEO: container_format->es_type = VC_CONTAINER_ES_TYPE_VIDEO; break; default: diff --git a/gfx/include/userland/host_support/include/vc_debug_sym.h b/gfx/include/userland/host_support/include/vc_debug_sym.h index 4c4c37fa63..b8385a7330 100644 --- a/gfx/include/userland/host_support/include/vc_debug_sym.h +++ b/gfx/include/userland/host_support/include/vc_debug_sym.h @@ -101,19 +101,19 @@ typedef struct #define VC_DEBUG_VAR(var) VC_DEBUG_SYMBOL(var,#var,&var,sizeof(var)) /* - * When using VC_DEBUG_VAR, you typically want to use uncached memory, otherwise - * it will go in cached memory and the host won't get a coherent view of the - * memory. So we take advantage of the .ucdata section which gets linked into - * the uncached memory space. - * - * Now this causes another problem, namely that the videocore linker ld/st - * instructions only have 27-bit relocations, and accessing a global from - * uncached memory is more than 27-bits away. So we create a couple of macros - * which can be used to declare a variable and put it into the .ucdata section - * and another macro which will dereference it as if it were a pointer. - * - * To use: - * + * When using VC_DEBUG_VAR, you typically want to use uncached memory, otherwise + * it will go in cached memory and the host won't get a coherent view of the + * memory. So we take advantage of the .ucdata section which gets linked into + * the uncached memory space. + * + * Now this causes another problem, namely that the videocore linker ld/st + * instructions only have 27-bit relocations, and accessing a global from + * uncached memory is more than 27-bits away. So we create a couple of macros + * which can be used to declare a variable and put it into the .ucdata section + * and another macro which will dereference it as if it were a pointer. + * + * To use: + * * VC_DEBUG_DECLARE_UNCACHED_VAR( int, foo, 0xCafeBeef ); * #define foo VC_DEBUG_ACCESS_UNCACHED_VAR(foo) */ @@ -162,8 +162,8 @@ typedef struct VC_DEBUG_VAR(var_name) /* - * Since some variable aren't actually referenced by the videocore - * this variant uses a .init.* section to ensure that the variable + * Since some variable aren't actually referenced by the videocore + * this variant uses a .init.* section to ensure that the variable * doesn't get pruned by the linker. */ @@ -183,4 +183,3 @@ extern VC_DEBUG_SYMBOL_T __VC_DEBUG_SYM_END[]; /* ---- Function Prototypes ---------------------------------------------- */ #endif /* VC_DEBUG_SYM_H */ - diff --git a/gfx/include/userland/host_support/include/vc_mem.h b/gfx/include/userland/host_support/include/vc_mem.h index 7de7e0bae6..60d222f5b4 100644 --- a/gfx/include/userland/host_support/include/vc_mem.h +++ b/gfx/include/userland/host_support/include/vc_mem.h @@ -49,4 +49,3 @@ extern int vc_mem_access_mem( int write_mem, void *buf, uint32_t vc_mem_addr, si #endif #endif /* VC_MEM_H */ - diff --git a/gfx/include/userland/interface/khronos/common/abstract/khrn_client_platform_filler_abstract.h b/gfx/include/userland/interface/khronos/common/abstract/khrn_client_platform_filler_abstract.h index 1ae14d3935..59d5c65bf0 100644 --- a/gfx/include/userland/interface/khronos/common/abstract/khrn_client_platform_filler_abstract.h +++ b/gfx/include/userland/interface/khronos/common/abstract/khrn_client_platform_filler_abstract.h @@ -44,7 +44,6 @@ typedef struct PLATFORM_MUTEX_T #endif } PLATFORM_MUTEX_T; - VCOS_STATIC_INLINE VCOS_STATUS_T platform_mutex_create(PLATFORM_MUTEX_T *mutex) { UNUSED(mutex); @@ -110,4 +109,3 @@ extern void platform_tls_remove(PLATFORM_TLS_T tls); #endif - diff --git a/gfx/include/userland/interface/khronos/common/direct/khrn_client_platform_filler_direct.h b/gfx/include/userland/interface/khronos/common/direct/khrn_client_platform_filler_direct.h index 5ba6865430..85971c848f 100644 --- a/gfx/include/userland/interface/khronos/common/direct/khrn_client_platform_filler_direct.h +++ b/gfx/include/userland/interface/khronos/common/direct/khrn_client_platform_filler_direct.h @@ -44,7 +44,6 @@ typedef struct PLATFORM_MUTEX_T #endif } PLATFORM_MUTEX_T; - VCOS_STATIC_INLINE VCOS_STATUS_T platform_mutex_create(PLATFORM_MUTEX_T *mutex) { UNUSED(mutex); @@ -110,4 +109,3 @@ extern void platform_tls_remove(PLATFORM_TLS_T tls); #endif - diff --git a/gfx/include/userland/interface/khronos/common/khrn_client.c b/gfx/include/userland/interface/khronos/common/khrn_client.c index ef4babd2b9..69df448ef1 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client.c +++ b/gfx/include/userland/interface/khronos/common/khrn_client.c @@ -156,7 +156,7 @@ bool client_process_state_init(CLIENT_PROCESS_STATE_T *process) khrn_pointer_map_term(&process->surfaces); return false; } - + #if EGL_KHR_sync if (!khrn_pointer_map_init(&process->syncs, 64)) { @@ -246,7 +246,7 @@ void client_process_state_term(CLIENT_PROCESS_STATE_T *process) khrn_pointer_map_term(&process->surfaces); khrn_pointer_map_term(&process->windows); - + #if EGL_KHR_sync egl_sync_destroy_all(&process->syncs); khrn_pointer_map_term(&process->syncs); @@ -352,7 +352,7 @@ EGL_SURFACE_T *client_egl_get_locked_surface(CLIENT_THREAD_STATE_T *thread, CLIE } /* - * just return if we've seen window before + * just return if we've seen window before */ EGLNativeWindowType client_egl_get_window(CLIENT_THREAD_STATE_T *thread, CLIENT_PROCESS_STATE_T *process, EGLNativeWindowType window) { @@ -385,7 +385,6 @@ void client_send_make_current(CLIENT_THREAD_STATE_T *thread) CLIENT_MAKE_CURRENT_SIZE in khrn_client.h should be updated */ - if (!thread->opengl.context || !thread->opengl.draw) { vcos_log_trace("Send null make current %x %x", @@ -419,7 +418,7 @@ void client_send_make_current(CLIENT_THREAD_STATE_T *thread) PLATFORM_TLS_T client_tls; PLATFORM_MUTEX_T client_mutex; -#ifdef CLIENT_THREAD_IS_PROCESS +#ifdef CLIENT_THREAD_IS_PROCESS PLATFORM_TLS_T client_tls_process; PLATFORM_TLS_T client_tls_mutex; #endif @@ -437,7 +436,7 @@ bool client_process_attach() if (status != KHR_SUCCESS) { return false; } - + status = platform_tls_create(&client_tls_mutex); if (status != KHR_SUCCESS) { return false; @@ -473,23 +472,23 @@ bool client_thread_attach() { //add mutex into thread's tls KHR_STATUS_T status; PLATFORM_MUTEX_T *local_mutex = (PLATFORM_MUTEX_T*)vcos_tls_get(client_tls_mutex); - + if (!local_mutex) - { + { local_mutex = (PLATFORM_MUTEX_T*)khrn_platform_malloc(sizeof(PLATFORM_MUTEX_T),"thread mutex"); if (!local_mutex) return false; - - status = platform_mutex_create(local_mutex); + + status = platform_mutex_create(local_mutex); if (status != KHR_SUCCESS) { khrn_platform_free(local_mutex); return false; } - + vcos_tls_set(client_tls_mutex,local_mutex); } } -#endif +#endif #ifndef RPC_LIBRARY //TODO client_send_make_current(state); @@ -507,10 +506,10 @@ void client_thread_detach(void *dummy) khrn_platform_free(state); platform_maybe_free_process(); - + #ifdef CLIENT_THREAD_IS_PROCESS { - CLIENT_PROCESS_STATE_T *process = CLIENT_GET_PROCESS_STATE(); + CLIENT_PROCESS_STATE_T *process = CLIENT_GET_PROCESS_STATE(); khrn_platform_free(process); platform_tls_remove(client_tls_process); } @@ -533,7 +532,7 @@ void client_process_detach() platform_tls_destroy(client_tls); platform_mutex_destroy(&client_mutex); -#ifdef CLIENT_THREAD_IS_PROCESS +#ifdef CLIENT_THREAD_IS_PROCESS platform_tls_destroy(client_tls_process); #endif } @@ -587,13 +586,13 @@ static void callback_set_error(KHRN_POINTER_MAP_T *map, uint32_t key, void *valu UNUSED(map); UNUSED_NDEBUG(key); - + vcos_assert( context != NULL ); vcos_assert((uintptr_t)key == (uintptr_t)context->name); - + if (context->servercontext == *((uint32_t *)data)){ CLIENT_THREAD_STATE_T *thread = context->thread; - /* todo: VG */ + /* todo: VG */ if (thread && IS_OPENGLES_11_OR_20(thread)) { vcos_log_error("GL OOM context %d", context->servercontext); glxx_set_error(GLXX_GET_CLIENT_STATE(thread), GL_OUT_OF_MEMORY); diff --git a/gfx/include/userland/interface/khronos/common/khrn_client.h b/gfx/include/userland/interface/khronos/common/khrn_client.h index 804039b375..4bc644814b 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client.h +++ b/gfx/include/userland/interface/khronos/common/khrn_client.h @@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef struct CLIENT_PROCESS_STATE CLIENT_PROCESS_STATE_T; typedef struct CLIENT_THREAD_STATE CLIENT_THREAD_STATE_T; - #include "interface/khronos/common/khrn_client_platform.h" #include "interface/khronos/egl/egl_client_context.h" @@ -46,7 +45,6 @@ typedef struct CLIENT_THREAD_STATE CLIENT_THREAD_STATE_T; #include "middleware/khronos/common/khrn_misc.h" #endif - /* must be after EGL/eglext.h */ #if EGL_BRCM_global_image && EGL_KHR_image #include "interface/khronos/common/khrn_client_global_image_map.h" @@ -235,14 +233,13 @@ struct CLIENT_PROCESS_STATE { surfaces[id].is_destroyed == false */ KHRN_POINTER_MAP_T surfaces; - - + /* * some platforms (e.g. Android) need to maintain a list of * known windows */ KHRN_POINTER_MAP_T windows; - + #if EGL_KHR_sync /* @@ -256,7 +253,6 @@ struct CLIENT_PROCESS_STATE { KHRN_GLOBAL_IMAGE_MAP_T global_image_egl_images; #endif - /* next_surface @@ -330,7 +326,7 @@ extern void *platform_tls_get_process(PLATFORM_TLS_T tls); static INLINE CLIENT_PROCESS_STATE_T *CLIENT_GET_PROCESS_STATE(void) { #ifdef CLIENT_THREAD_IS_PROCESS - //each thread has its own client_process_state + //each thread has its own client_process_state return (CLIENT_PROCESS_STATE_T *)platform_tls_get_process(client_tls_process); #else return &client_process_state; diff --git a/gfx/include/userland/interface/khronos/common/khrn_client_cache.c b/gfx/include/userland/interface/khronos/common/khrn_client_cache.c index c7067919f2..dccce5929f 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client_cache.c +++ b/gfx/include/userland/interface/khronos/common/khrn_client_cache.c @@ -163,7 +163,7 @@ void khrn_cache_term(KHRN_CACHE_T *cache) static void send_create(CLIENT_THREAD_STATE_T *thread, int base) { RPC_CALL1(glintCacheCreate_impl, - thread, + thread, GLINTCACHECREATE_ID, RPC_UINT(base)); } @@ -171,7 +171,7 @@ static void send_create(CLIENT_THREAD_STATE_T *thread, int base) static void send_delete(CLIENT_THREAD_STATE_T *thread, int base) { RPC_CALL1(glintCacheDelete_impl, - thread, + thread, GLINTCACHEDELETE_ID, RPC_UINT(base)); } @@ -179,7 +179,7 @@ static void send_delete(CLIENT_THREAD_STATE_T *thread, int base) static int send_grow(CLIENT_THREAD_STATE_T *thread) { return RPC_BOOLEAN_RES(RPC_CALL0_RES(glintCacheGrow_impl, - thread, + thread, GLINTCACHEGROW_ID)); } @@ -191,7 +191,7 @@ static void send_data(CLIENT_THREAD_STATE_T *thread, int base, const void *data, int chunk = _min(len, MERGE_BUFFER_SIZE-CLIENT_MAKE_CURRENT_SIZE-12-8); RPC_CALL3_IN_CTRL(glintCacheData_impl, - thread, + thread, GLINTCACHEDATA_ID, RPC_UINT(base + off), RPC_SIZEI(chunk), diff --git a/gfx/include/userland/interface/khronos/common/khrn_client_cache.h b/gfx/include/userland/interface/khronos/common/khrn_client_cache.h index b4a16acb87..422fdc07e9 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client_cache.h +++ b/gfx/include/userland/interface/khronos/common/khrn_client_cache.h @@ -48,7 +48,7 @@ typedef struct { #endif //on the server side - //we store a KHRN_INTERLOCK_T in the + //we store a KHRN_INTERLOCK_T in the //same space as this struct uint8_t pad_for_interlock[24]; @@ -89,4 +89,3 @@ extern int khrn_cache_lookup(CLIENT_THREAD_STATE_T *thread, KHRN_CACHE_T *cache, extern int khrn_cache_get_entries(KHRN_CACHE_T *cache); #endif - diff --git a/gfx/include/userland/interface/khronos/common/khrn_client_platform.h b/gfx/include/userland/interface/khronos/common/khrn_client_platform.h index 1c9da3aee5..a2a05b72a9 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client_platform.h +++ b/gfx/include/userland/interface/khronos/common/khrn_client_platform.h @@ -59,7 +59,6 @@ extern "C" { * semaphores. */ - /* workaround for broken platforms which don't detect threads exiting */ diff --git a/gfx/include/userland/interface/khronos/common/khrn_client_rpc.h b/gfx/include/userland/interface/khronos/common/khrn_client_rpc.h index dc4351d236..35277d10d7 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_client_rpc.h +++ b/gfx/include/userland/interface/khronos/common/khrn_client_rpc.h @@ -110,7 +110,7 @@ extern void rpc_term(void); #define RPC_TERM() rpc_term() #else #define RPC_INIT() true -#define RPC_TERM() +#define RPC_TERM() #endif #define RPC_FLUSH(thread) RPC_CALL0(khrn_misc_rpc_flush_impl, thread, no_id) @@ -391,7 +391,6 @@ extern void rpc_recv_bulk_gather(CLIENT_THREAD_STATE_T *thread, void *out, uint3 extern void rpc_begin(CLIENT_THREAD_STATE_T *thread); extern void rpc_end(CLIENT_THREAD_STATE_T *thread); - /****************************************************************************** helpers ******************************************************************************/ diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_common.h b/gfx/include/userland/interface/khronos/common/khrn_int_common.h index 4d4ff8a4c8..96d2ada6c5 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_common.h +++ b/gfx/include/userland/interface/khronos/common/khrn_int_common.h @@ -174,4 +174,3 @@ typedef unsigned long long uint64_t; #endif #endif - diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_hash.c b/gfx/include/userland/interface/khronos/common/khrn_int_hash.c index cdaa4f1494..1a4210ded9 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_hash.c +++ b/gfx/include/userland/interface/khronos/common/khrn_int_hash.c @@ -28,8 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* ------------------------------------------------------------------------------- These are functions for producing 32-bit hashes for hash table lookup. -khrn_hashword(), khrn_hashlittle(), hashlittle2(), hashbig(), mix(), and final() -are externally useful functions. Routines to test the hash are included +khrn_hashword(), khrn_hashlittle(), hashlittle2(), hashbig(), mix(), and final() +are externally useful functions. Routines to test the hash are included if SELF_TEST is defined. You can use this free for any purpose. It's in the public domain. It has no warranty. @@ -37,7 +37,7 @@ You probably want to use khrn_hashlittle(). khrn_hashlittle() and hashbig() hash byte arrays. khrn_hashlittle() is is faster than hashbig() on little-endian machines. Intel and AMD are little-endian machines. On second thought, you probably want hashlittle2(), which is identical to -khrn_hashlittle() except it returns two 32-bit hashes for the price of one. +khrn_hashlittle() except it returns two 32-bit hashes for the price of one. You could implement hashbig2() if you wanted but I haven't bothered here. If you want to find a hash of, say, exactly 7 integers, do @@ -50,9 +50,9 @@ If you want to find a hash of, say, exactly 7 integers, do then use c as the hash value. If you have a variable length array of 4-byte integers to hash, use khrn_hashword(). If you have a byte array (like a character string), use khrn_hashlittle(). If you have several byte arrays, or -a mix of things, see the comments above khrn_hashlittle(). +a mix of things, see the comments above khrn_hashlittle(). -Why is this so big? I read 12 bytes at a time into 3 4-byte integers, +Why is this so big? I read 12 bytes at a time into 3 4-byte integers, then mix those integers. This is fast (you can do a lot more thorough mixing with 12*3 instructions on 3 integers than you can with 3 instructions on 1 byte), but shoehorning those bytes into integers efficiently is messy. @@ -101,7 +101,7 @@ uint32_t initval) /* the previous hash, or an arbitrary value */ /*------------------------------------------- handle the last 3 uint32_t's */ switch(length) /* all the case statements fall through */ - { + { case 3 : c+=k[2]; case 2 : b+=k[1]; case 1 : a+=k[0]; @@ -165,7 +165,7 @@ uint32_t khrn_hashlittle( const void *key, int length, uint32_t initval) } /*----------------------------- handle the last (probably partial) block */ - /* + /* * "k[2]&0xffffff" actually reads beyond the end of the string, but * then masks off the part it's not allowed to read. Because the * string is aligned, the masked-off tail is in the same word as the diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_hash.h b/gfx/include/userland/interface/khronos/common/khrn_int_hash.h index 5b36345278..1db9cd7896 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_hash.h +++ b/gfx/include/userland/interface/khronos/common/khrn_int_hash.h @@ -158,4 +158,3 @@ uint32_t khrn_hashword(const uint32_t *key, int length, uint32_t initval); uint32_t khrn_hashlittle(const void *key, int length, uint32_t initval); #endif - diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_hash_asm.s b/gfx/include/userland/interface/khronos/common/khrn_int_hash_asm.s index e882a34cab..fbf9c0854c 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_hash_asm.s +++ b/gfx/include/userland/interface/khronos/common/khrn_int_hash_asm.s @@ -26,7 +26,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /* Prevent the stack from becoming executable */ #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits @@ -226,4 +225,3 @@ myfunc khrn_hashword .endfunc .ltorg - diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_ids.h b/gfx/include/userland/interface/khronos/common/khrn_int_ids.h index 8378f4a4a3..6ad5e18d53 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_ids.h +++ b/gfx/include/userland/interface/khronos/common/khrn_int_ids.h @@ -135,7 +135,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define GLINTATTRIB_ID 0x7118 #define GLINTATTRIBENABLE_ID 0x7119 - /* OpenGL ES 1.1 specific dispatch ids */ diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_image.h b/gfx/include/userland/interface/khronos/common/khrn_int_image.h index de0f7ccced..329cc109b8 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_image.h +++ b/gfx/include/userland/interface/khronos/common/khrn_int_image.h @@ -119,7 +119,7 @@ typedef enum { some IMAGE_FORMAT_Ts Components are listed with the most significant bits first. - + On little-endian systems, it is as if a pixel was loaded as a little-endian integer. This means they are in the *opposite* order to how they appear in memory (e.g. in ABGR_8888 format, the first byte would be the red component of the first pixel). diff --git a/gfx/include/userland/interface/khronos/common/khrn_int_util.h b/gfx/include/userland/interface/khronos/common/khrn_int_util.h index 8d8eeef748..1b5a014f9f 100644 --- a/gfx/include/userland/interface/khronos/common/khrn_int_util.h +++ b/gfx/include/userland/interface/khronos/common/khrn_int_util.h @@ -174,7 +174,6 @@ static INLINE float _maxf(float x, float y) #endif // !_VIDEOCORE - /****************************************************************************** misc stuff ******************************************************************************/ diff --git a/gfx/include/userland/interface/khronos/common/linux/khrn_client_platform_linux.c b/gfx/include/userland/interface/khronos/common/linux/khrn_client_platform_linux.c index 710d20fff3..b1a241c96c 100644 --- a/gfx/include/userland/interface/khronos/common/linux/khrn_client_platform_linux.c +++ b/gfx/include/userland/interface/khronos/common/linux/khrn_client_platform_linux.c @@ -67,7 +67,6 @@ static int application_error_handler(Display *display, XErrorEvent *theEvent) } #endif - VCOS_STATUS_T khronos_platform_semaphore_create(PLATFORM_SEMAPHORE_T *sem, int name[3], int count) { char buf[64]; @@ -163,7 +162,6 @@ void khrn_platform_free(void *v) #endif - #ifdef WANT_X static XImage *current_ximage = NULL; @@ -412,7 +410,6 @@ void platform_memcpy(void * aTrg, const void * aSrc, size_t aLength) memcpy(aTrg, aSrc, aLength); } - #ifdef WANT_X uint32_t platform_get_handle(EGLNativeWindowType win) { @@ -537,7 +534,6 @@ static void dump_ancestors(Window w) vcos_log_trace("->end"); } - uint32_t khrn_platform_get_window_position(EGLNativeWindowType win) { Window w = (Window) win; @@ -719,7 +715,6 @@ void khrn_platform_unbind_pixmap_from_egl_image(EGLImageKHR egl_image) } } - #ifdef EGL_SERVER_DISPMANX #define NUM_WIN 6 @@ -801,7 +796,6 @@ static EGL_DISPMANX_WINDOW_T *check_default(EGLNativeWindowType win) return (EGL_DISPMANX_WINDOW_T*)win; } - void platform_get_dimensions(EGLDisplay dpy, EGLNativeWindowType win, uint32_t *width, uint32_t *height, uint32_t *swapchain_count) { diff --git a/gfx/include/userland/interface/khronos/common/linux/khrn_client_rpc_linux.c b/gfx/include/userland/interface/khronos/common/linux/khrn_client_rpc_linux.c index 5ad01c05e7..d5133c2a06 100644 --- a/gfx/include/userland/interface/khronos/common/linux/khrn_client_rpc_linux.c +++ b/gfx/include/userland/interface/khronos/common/linux/khrn_client_rpc_linux.c @@ -33,7 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/khronos/common/khrn_client.h" #include "interface/khronos/common/khrn_client_rpc.h" - #include #include @@ -93,7 +92,7 @@ VCHIQ_STATUS_T khhn_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, case VCHIQ_SERVICE_CLOSED: case VCHIQ_BULK_TRANSMIT_ABORTED: case VCHIQ_BULK_RECEIVE_ABORTED: - UNREACHABLE(); /* not implemented */ + UNREACHABLE(); /* not implemented */ } return VCHIQ_SUCCESS; @@ -160,7 +159,7 @@ VCHIQ_STATUS_T khan_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, case VCHIQ_BULK_TRANSMIT_ABORTED: case VCHIQ_BULK_RECEIVE_ABORTED: default: - UNREACHABLE(); /* not implemented */ + UNREACHABLE(); /* not implemented */ } return VCHIQ_SUCCESS; @@ -171,11 +170,11 @@ void vc_vchi_khronos_init() VCOS_STATUS_T status = vcos_event_create(&bulk_event, NULL); UNUSED_NDEBUG(status); vcos_assert(status == VCOS_SUCCESS); - + if (vchiq_initialise(&khrn_vchiq_instance) != VCHIQ_SUCCESS) { vcos_log_error("* failed to open vchiq device"); - + exit(1); } @@ -184,7 +183,7 @@ void vc_vchi_khronos_init() if (vchiq_connect(khrn_vchiq_instance) != VCHIQ_SUCCESS) { vcos_log_error("* failed to connect"); - + exit(1); } @@ -212,7 +211,7 @@ void vc_vchi_khronos_init() khhn_return != VCHIQ_SUCCESS) { vcos_log_error("* failed to add service - already in use?"); - + exit(1); } vchiu_queue_init(&khrn_queue, 64); @@ -264,7 +263,7 @@ static void check_workspace(uint32_t size) static void merge_flush(CLIENT_THREAD_STATE_T *thread) { vcos_log_trace("merge_flush start"); - + vcos_assert(thread->merge_pos >= CLIENT_MAKE_CURRENT_SIZE); /* @@ -275,14 +274,14 @@ static void merge_flush(CLIENT_THREAD_STATE_T *thread) if (thread->merge_pos > CLIENT_MAKE_CURRENT_SIZE) { VCHIQ_ELEMENT_T element; - + rpc_begin(thread); element.data = thread->merge_buffer; element.size = thread->merge_pos; VCHIQ_STATUS_T success = vchiq_queue_message(get_handle(thread), &element, 1); - UNUSED_NDEBUG(success); + UNUSED_NDEBUG(success); vcos_assert(success == VCHIQ_SUCCESS); thread->merge_pos = 0; @@ -290,11 +289,11 @@ static void merge_flush(CLIENT_THREAD_STATE_T *thread) client_send_make_current(thread); vcos_assert(thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE); - + rpc_end(thread); } vcos_log_trace( "merge_flush end"); - + } void rpc_flush(CLIENT_THREAD_STATE_T *thread) @@ -366,10 +365,10 @@ static void send_bulk(CLIENT_THREAD_STATE_T *thread, const void *in, uint32_t le vcos_assert(vchiq_status == VCHIQ_SUCCESS); } else { VCHIQ_STATUS_T vchiq_status = vchiq_queue_bulk_transmit(get_handle(thread), in, rpc_pad_bulk(len), NULL); - UNUSED_NDEBUG(vchiq_status); + UNUSED_NDEBUG(vchiq_status); vcos_assert(vchiq_status == VCHIQ_SUCCESS); VCOS_STATUS_T vcos_status = vcos_event_wait(&bulk_event); - UNUSED_NDEBUG(vcos_status); + UNUSED_NDEBUG(vcos_status); vcos_assert(vcos_status == VCOS_SUCCESS); } } @@ -386,7 +385,7 @@ static void recv_bulk(CLIENT_THREAD_STATE_T *thread, void *out, uint32_t len) UNUSED_NDEBUG(vchiq_status); vcos_assert(vchiq_status == VCHIQ_SUCCESS); VCOS_STATUS_T vcos_status = vcos_event_wait(&bulk_event); - UNUSED_NDEBUG(vcos_status); + UNUSED_NDEBUG(vcos_status); vcos_assert(vcos_status == VCOS_SUCCESS); } } @@ -510,7 +509,7 @@ void rpc_call8_makecurrent(CLIENT_THREAD_STATE_T *thread, uint32_t id, uint32_t vcos_log_trace("rpc_call8_makecurrent collapse onto previous makecurrent"); thread->merge_pos = 0; - + RPC_CALL8(eglIntMakeCurrent_impl, thread, EGLINTMAKECURRENT_ID, p0, p1, p2, p3, p4, p5, p6, p7); vcos_assert(thread->merge_pos == CLIENT_MAKE_CURRENT_SIZE); diff --git a/gfx/include/userland/interface/khronos/common/vcos/khrn_client_platform_filler_vcos.h b/gfx/include/userland/interface/khronos/common/vcos/khrn_client_platform_filler_vcos.h index a877594554..25b0b3af41 100644 --- a/gfx/include/userland/interface/khronos/common/vcos/khrn_client_platform_filler_vcos.h +++ b/gfx/include/userland/interface/khronos/common/vcos/khrn_client_platform_filler_vcos.h @@ -119,4 +119,3 @@ extern void* platform_tls_get_check(PLATFORM_TLS_T tls); #define platform_tls_remove(tls) vcos_tls_set(tls,NULL) #endif - diff --git a/gfx/include/userland/interface/khronos/common/vcos_vchiq/khrn_client_platform_filler_vcos_vchiq.h b/gfx/include/userland/interface/khronos/common/vcos_vchiq/khrn_client_platform_filler_vcos_vchiq.h index ac8b0e25fc..c4fb9a1223 100644 --- a/gfx/include/userland/interface/khronos/common/vcos_vchiq/khrn_client_platform_filler_vcos_vchiq.h +++ b/gfx/include/userland/interface/khronos/common/vcos_vchiq/khrn_client_platform_filler_vcos_vchiq.h @@ -108,9 +108,7 @@ extern void platform_tls_remove(PLATFORM_TLS_T tls); */ extern void *platform_tls_get(PLATFORM_TLS_T tls); - #define platform_tls_set(tls, v) vcos_tls_set(tls, v) #define platform_tls_remove(tls) vcos_tls_set(tls,NULL) #endif - diff --git a/gfx/include/userland/interface/khronos/egl/egl_client.c b/gfx/include/userland/interface/khronos/egl/egl_client.c index 9d617c8960..ec0dafa768 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client.c @@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Server is up (needed by RPC_CALL[n]_RES) - Spec ambiguity: What should we do if eglGetError is called twice? Currently we reset the error to EGL_SUCCESS. @@ -79,18 +78,14 @@ by an attribute value" as a valid handle (and fail if it's invalid), and ignore it only if it's not in the list at all. - EGL_MATCH_NATIVE_PIXMAP: todo: we'll set thread->error to something like EGL_BAD_ATTRIBUTE; should we be setting it to EGL_BAD_NATIVE_PIXMAP? What is EGL_PRESERVED_RESOURCES? - - Do we need to do anything for EGL_LEVEL? What is EGL_PRESERVED_RESOURCES? What exactly are EGL_NATIVE_VISUAL_ID, EGL_NATIVE_VISUAL_TYPE? - Implementation notes: We only support one display. This is assumed to have a native display_id @@ -102,7 +97,6 @@ by an attribute value" We allow implicit casts from bool to EGLint - We make the following assumptions: EGL_CONFIG_CAVEAT (all EGL_NONE) @@ -114,7 +108,6 @@ by an attribute value" All configs support all of: (EGL_PBUFFER_BIT | EGL_PIXMAP_BIT | EGL_WINDOW_BIT | EGL_VG_COLORSPACE_LINEAR_BIT | EGL_VG_ALPHA_FORMAT_PRE_BIT | EGL_MULTISAMPLE_RESOLVE_BOX_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT); - EGL_OPTIMAL_FORMAT_BIT_KHR: Considered optimal if no format conversion needs doing EGL_TRANSPARENT_TYPE is always EGL_NONE because we don't support EGL_TRANSPARENT_RGB. Should there be an EGL_TRANSPARENT_ALPHA? @@ -153,7 +146,6 @@ by an attribute value" #include #include - #include "interface/khronos/egl/egl_client_cr.c" VCOS_LOG_CAT_T egl_client_log_cat; @@ -1205,7 +1197,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void) CLIENT_THREAD_STATE_T *thread = CLIENT_GET_THREAD_STATE(); bool destroy = false; - vcos_log_trace("eglReleaseThread start."); CLIENT_LOCK(); @@ -2508,4 +2499,3 @@ EGLAPI void EGLAPIENTRY eglProcStateValid( EGLDisplay dpy, EGLBoolean *result ) return; } #endif - diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_config.c b/gfx/include/userland/interface/khronos/egl/egl_client_config.c index 6e0e06109b..f95132c6ab 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_config.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client_config.c @@ -405,6 +405,3 @@ bool egl_config_is_lockable(int id) #endif - - - diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_config_cr.c b/gfx/include/userland/interface/khronos/egl/egl_client_config_cr.c index 8aa36022bc..ecb1caaac4 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_config_cr.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client_config_cr.c @@ -31,14 +31,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Constructed with FEATURES_PACK(red, green, blue, alpha, depth, stencil, multi, mask, lockable) Attributes are returned with - FEATURES_UNPACK_RED(c) - FEATURES_UNPACK_GREEN(c) - FEATURES_UNPACK_BLUE(c) - FEATURES_UNPACK_ALPHA(c) - FEATURES_UNPACK_DEPTH(c) - FEATURES_UNPACK_STENCIL(c) - FEATURES_UNPACK_MULTI(c) - FEATURES_UNPACK_MASK(c) + FEATURES_UNPACK_RED(c) + FEATURES_UNPACK_GREEN(c) + FEATURES_UNPACK_BLUE(c) + FEATURES_UNPACK_ALPHA(c) + FEATURES_UNPACK_DEPTH(c) + FEATURES_UNPACK_STENCIL(c) + FEATURES_UNPACK_MULTI(c) + FEATURES_UNPACK_MASK(c) FEATURES_UNPACK_LOCKABLE(c) Additionally, @@ -57,7 +57,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #define FEATURES_UNPACK_RED(c) ((EGLint)((c) >> 28 & 0xf)) #define FEATURES_UNPACK_GREEN(c) ((EGLint)((c) >> 24 & 0xf)) #define FEATURES_UNPACK_BLUE(c) ((EGLint)((c) >> 20 & 0xf)) @@ -87,7 +86,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. use_red, use_green, use_blue, use_alpha are valid pointers attrib_list is NULL or a pointer to an EGL_NONE-terminated list of attribute/value pairs - Postconditions: + Postconditions: If list is valid then we return true and: use_red is set to true iff attrib_list includes EGL_RED_SIZE and the corresponding value is not 0 or EGL_DONT_CARE @@ -317,13 +316,12 @@ Applications may find this counterintuitive, and need to perform additional proc configs to find one best matching their requirements. For example, specifying RGBA depths of 5651 could return a list whose first config has a depth of 8888. - Preconditions: 0 <= id0 < EGL_MAX_CONFIGS 0 <= id1 < EGL_MAX_CONFIGS - Postconditions: + Postconditions: - @@ -398,7 +396,7 @@ static bool less_than(int id0, int id1, bool use_red, bool use_green, bool use_b ids is a pointer to EGL_MAX_CONFIGS elements 0 <= ids[i] < EGL_MAX_CONFIG for 0 <= i < EGL_MAX_CONFIG - Postconditions: + Postconditions: ids is a permutation of the original @@ -442,7 +440,7 @@ void egl_config_sort(int *ids, bool use_red, bool use_green, bool use_blue, bool 0 <= id < EGL_MAX_CONFIGS value is a valid pointer - Postconditions: + Postconditions: If attrib is a valid attribute then true is returned and *value is set Else false is returned @@ -617,7 +615,7 @@ bool egl_config_get_attrib(int id, EGLint attrib, EGLint *value) attrib_list is NULL or a pointer to an EGL_NONE-terminated list of valid attribute/value pairs 0 <= id < EGL_MAX_CONFIGS - Postconditions: + Postconditions: - @@ -706,7 +704,7 @@ bool egl_config_filter(int id, const EGLint *attrib_list) EGLNativePixmapType pixmap = (EGLNativePixmapType)(intptr_t)value; KHRN_IMAGE_WRAP_T image; if (!platform_get_pixmap_info(pixmap, &image)) { - /* + /* Not actually unreachable in theory! We should have detected this in egl_config_check_attribs It's possible that the validity of pixmap has changed since then however... diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_context.c b/gfx/include/userland/interface/khronos/egl/egl_client_context.c index b4dc1166db..5532186212 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_context.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client_context.c @@ -295,7 +295,6 @@ void egl_context_set_callbacks(EGL_CONTEXT_T *context, } } - /* void egl_context_maybe_free(EGL_CONTEXT_T *context) diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_context.h b/gfx/include/userland/interface/khronos/egl/egl_client_context.h index cde547f5b5..868c23c482 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_context.h +++ b/gfx/include/userland/interface/khronos/egl/egl_client_context.h @@ -52,7 +52,7 @@ typedef struct { (EGL_CONTEXT_IS_CURRENT) Iff true, the context is current to some thread. */ - bool is_current; + bool is_current; /* is_destroyed diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_cr.c b/gfx/include/userland/interface/khronos/egl/egl_client_cr.c index 8e0e0e6a95..23d5e1d21c 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_cr.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client_cr.c @@ -176,7 +176,6 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id) return khrn_platform_set_display_id(display_id); } - //eglInitialize //eglTerminate //eglQueryString @@ -355,7 +354,6 @@ EGL_TRANSPARENT_GREEN_VALUE EGL_DONT_CARE Exact None EGL_TRANSPARENT_BLUE_VALUE EGL_DONT_CARE Exact None Table 3.4: Default values and match criteria for EGLConfig attributes. - 2 The special match criteria for EGL MATCH NATIVE PIXMAP was introduced due to the difficulty of determining an EGLConfig equivalent to a native pixmap using only color component depths. diff --git a/gfx/include/userland/interface/khronos/egl/egl_client_surface.c b/gfx/include/userland/interface/khronos/egl/egl_client_surface.c index 6846dfa8bf..ceb8353b1f 100644 --- a/gfx/include/userland/interface/khronos/egl/egl_client_surface.c +++ b/gfx/include/userland/interface/khronos/egl/egl_client_surface.c @@ -48,7 +48,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include - /* surface_pool @@ -767,7 +766,7 @@ EGLint egl_surface_set_attrib(EGL_SURFACE_T *surface, EGLint attrib, EGLint valu case EGL_MIPMAP_LEVEL: if (surface->type == PBUFFER) { RPC_CALL2(eglIntSelectMipmap_impl, - thread, + thread, EGLINTSELECTMIPMAP_ID, RPC_UINT(surface->serverbuffer), RPC_INT(value)); @@ -872,7 +871,6 @@ EGLint egl_surface_get_mapped_buffer_attrib(EGL_SURFACE_T *surface, EGLint attri } #endif - /* void egl_surface_maybe_free(EGL_SURFACE_T *surface) diff --git a/gfx/include/userland/interface/khronos/ext/egl_brcm_driver_monitor_client.c b/gfx/include/userland/interface/khronos/ext/egl_brcm_driver_monitor_client.c index 7aa521a121..ca2d850a4d 100644 --- a/gfx/include/userland/interface/khronos/ext/egl_brcm_driver_monitor_client.c +++ b/gfx/include/userland/interface/khronos/ext/egl_brcm_driver_monitor_client.c @@ -51,7 +51,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglInitDriverMonitorBRCM(EGLDisplay dpy, EGLint hw { CLIENT_PROCESS_STATE_T *process = client_egl_get_process_state(thread, dpy, EGL_TRUE); - if (process) + if (process) { if (!process->driver_monitor_inited) process->driver_monitor_inited = RPC_BOOLEAN_RES(RPC_CALL2_RES(eglInitDriverMonitorBRCM_impl, @@ -59,17 +59,17 @@ EGLAPI EGLBoolean EGLAPIENTRY eglInitDriverMonitorBRCM(EGLDisplay dpy, EGLint hw EGLINITDRIVERMONITORBRCM_ID, hw_bank, l3c_bank)); - if (process->driver_monitor_inited) + if (process->driver_monitor_inited) { thread->error = EGL_SUCCESS; result = EGL_TRUE; - } - else + } + else { thread->error = EGL_BAD_ALLOC; result = EGL_FALSE; } - } + } else result = EGL_FALSE; } @@ -83,10 +83,10 @@ void egl_driver_monitor_term(CLIENT_PROCESS_STATE_T *process) { CLIENT_THREAD_STATE_T *thread = CLIENT_GET_THREAD_STATE(); - if (process->driver_monitor_inited) + if (process->driver_monitor_inited) { RPC_CALL0(eglTermDriverMonitorBRCM_impl, - thread, + thread, EGLTERMDRIVERMONITORBRCM_ID); process->driver_monitor_inited = false; @@ -102,7 +102,7 @@ EGLAPI void EGLAPIENTRY eglGetDriverMonitorXMLBRCM(EGLDisplay dpy, EGLint bufSiz { CLIENT_PROCESS_STATE_T *process = client_egl_get_process_state(thread, dpy, EGL_TRUE); - if (process) + if (process) { if (process->driver_monitor_inited && xmlStats != NULL) { @@ -129,13 +129,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglTermDriverMonitorBRCM(EGLDisplay dpy) { CLIENT_PROCESS_STATE_T *process = client_egl_get_process_state(thread, dpy, EGL_TRUE); - if (process) + if (process) { egl_driver_monitor_term(process); thread->error = EGL_SUCCESS; result = EGL_TRUE; - } + } else result = EGL_FALSE; } diff --git a/gfx/include/userland/interface/khronos/ext/egl_khr_image_client.c b/gfx/include/userland/interface/khronos/ext/egl_khr_image_client.c index 4743ee8208..9c1971be18 100644 --- a/gfx/include/userland/interface/khronos/ext/egl_khr_image_client.c +++ b/gfx/include/userland/interface/khronos/ext/egl_khr_image_client.c @@ -95,7 +95,7 @@ static bool egl_init_vcsm() vcsm_vc_hdl_from_hdl = dlsym(dl, "vcsm_vc_hdl_from_hdl"); vcsm_free = dlsym(dl, "vcsm_free"); - if (vcsm_malloc_cache && vcsm_vc_hdl_from_hdl && vcsm_free) + if (vcsm_malloc_cache && vcsm_vc_hdl_from_hdl && vcsm_free) { success = true; } @@ -178,16 +178,16 @@ EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx KHRN_IMAGE_WRAP_T image; if (platform_get_pixmap_info((EGLNativePixmapType)buffer, &image)) { -//meego hack +//meego hack if(image.aux!=0) { - //image.aux refers to a server side EGL surface + //image.aux refers to a server side EGL surface //that already contains the data we're interested in buf[0] = (uint32_t)image.aux; target = EGL_IMAGE_FROM_SURFACE_BRCM; - khrn_platform_release_pixmap_info((EGLNativePixmapType)buffer, &image); + khrn_platform_release_pixmap_info((EGLNativePixmapType)buffer, &image); } -// +// else { buf[0] = image.width | image.height << 16; @@ -456,7 +456,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR im EGLBoolean result; vcos_log_trace("eglDestroyImageKHR image=%d.\n", (int)image); - + CLIENT_LOCK(); { @@ -474,7 +474,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR im } else #endif { - vcos_log_trace("%s: process %p image %p calling eglDestroyImageKHR_impl", + vcos_log_trace("%s: process %p image %p calling eglDestroyImageKHR_impl", __FUNCTION__, process, image); result = RPC_BOOLEAN_RES(RPC_CALL1_RES(eglDestroyImageKHR_impl, thread, diff --git a/gfx/include/userland/interface/khronos/ext/egl_khr_lock_surface_client.c b/gfx/include/userland/interface/khronos/ext/egl_khr_lock_surface_client.c index c28911a3c6..a91699eadf 100644 --- a/gfx/include/userland/interface/khronos/ext/egl_khr_lock_surface_client.c +++ b/gfx/include/userland/interface/khronos/ext/egl_khr_lock_surface_client.c @@ -187,4 +187,3 @@ EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay dpy, EGLSurface su CLIENT_UNLOCK(); return result; } - diff --git a/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.c b/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.c index f05e221ad5..b183c09c41 100644 --- a/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.c +++ b/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.c @@ -102,7 +102,7 @@ static EGL_SYNC_T *egl_sync_create(EGLSyncKHR sync, EGLenum type, RPC_UINT(condition), RPC_INT(threshold), RPC_UINT(sem)); - } else + } else #endif { sync_ptr->serversync = RPC_UINT_RES(RPC_CALL4_RES(eglIntCreateSync_impl, diff --git a/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.h b/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.h index 221372cd16..55d62a4887 100644 --- a/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.h +++ b/gfx/include/userland/interface/khronos/ext/egl_khr_sync_client.h @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "interface/khronos/common/khrn_client.h" #ifdef RPC_DIRECT diff --git a/gfx/include/userland/interface/khronos/ext/gl_oes_draw_texture_client.c b/gfx/include/userland/interface/khronos/ext/gl_oes_draw_texture_client.c index dfb6fbca3a..860401fbde 100644 --- a/gfx/include/userland/interface/khronos/ext/gl_oes_draw_texture_client.c +++ b/gfx/include/userland/interface/khronos/ext/gl_oes_draw_texture_client.c @@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* GL_OES_draw_texture */ -GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) +GL_API void GL_APIENTRY glDrawTexsOES (GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) { glDrawTexfOES((GLfloat)x,(GLfloat)y,(GLfloat)x, (GLfloat)width,(GLfloat)height); } diff --git a/gfx/include/userland/interface/khronos/ext/gl_oes_map_buffer.c b/gfx/include/userland/interface/khronos/ext/gl_oes_map_buffer.c index 8ebbcac4e0..9e8b9c01da 100644 --- a/gfx/include/userland/interface/khronos/ext/gl_oes_map_buffer.c +++ b/gfx/include/userland/interface/khronos/ext/gl_oes_map_buffer.c @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #define GL_GLEXT_PROTOTYPES /* we want the prototypes so the compiler will check that the signatures match */ #include "interface/khronos/common/khrn_int_common.h" @@ -41,7 +40,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/khronos/include/GLES/gl.h" #include "interface/khronos/include/GLES/glext.h" - GL_API void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access) { CLIENT_THREAD_STATE_T *thread = CLIENT_GET_THREAD_STATE(); @@ -72,7 +70,7 @@ GL_API void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access) } else { - + pointer = khrn_platform_malloc(buffer.cached_size,"glxx_mapped_buffer"); if(pointer != 0) @@ -131,7 +129,7 @@ GL_API GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target) { void * p = buffer.mapped_pointer; GLsizeiptr size = buffer.mapped_size; - + buffer.mapped_pointer = 0; buffer.mapped_size = 0; glxx_buffer_info_set(state, target, &buffer); @@ -139,14 +137,14 @@ GL_API GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target) glBufferSubData (target, 0, size, p); khrn_platform_free(p); } - } + } } } /* if (IS_OPENGLES_11_OR_20(thread)) { success = RPC_BOOLEAN_RES(RPC_CALL1_RES(glUnmapBufferOES_impl, - thread, + thread, GLUNMAPBUFFEROES_ID, RPC_ENUM(target))); */ @@ -183,9 +181,9 @@ GL_API void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLv } /* - + RPC_CALL3_OUT_CTRL(glGetBufferPointervOES_impl, - thread, + thread, GLGETBUFFERPOINTERVOES_ID, RPC_ENUM(target), RPC_ENUM(pname), diff --git a/gfx/include/userland/interface/khronos/ext/gl_oes_query_matrix_client.c b/gfx/include/userland/interface/khronos/ext/gl_oes_query_matrix_client.c index ef5efa4db1..2f929fa36a 100644 --- a/gfx/include/userland/interface/khronos/ext/gl_oes_query_matrix_client.c +++ b/gfx/include/userland/interface/khronos/ext/gl_oes_query_matrix_client.c @@ -49,12 +49,12 @@ GL_API GLbitfield GL_APIENTRY glQueryMatrixxOES( GLfixed mantissa[16], GLint exp thread, GLQUERYMATRIXXOES_ID_11, mantissa); - + for(i=0;i<16;i++) exponent[i] = 0; - - return 0; + + return 0; } - + return 0xff; /* all components invalid */ } diff --git a/gfx/include/userland/interface/khronos/glxx/gl20_int_impl.h b/gfx/include/userland/interface/khronos/glxx/gl20_int_impl.h index 2e4008a4c1..b757c530ab 100644 --- a/gfx/include/userland/interface/khronos/glxx/gl20_int_impl.h +++ b/gfx/include/userland/interface/khronos/glxx/gl20_int_impl.h @@ -90,7 +90,6 @@ FN(void, glValidateProgram_impl_20, (GLuint program)) //FN(void, glVertexAttrib3fv_impl_20, (GLuint indx, const GLfloat *values)) //FN(void, glVertexAttrib4fv_impl_20, (GLuint indx, const GLfloat *values)) - /* OES_shader_source */ FN(void, glCompileShader_impl_20, (GLuint shader)) FN(int, glGetShaderiv_impl_20, (GLuint shader, GLenum pname, GLint *params)) diff --git a/gfx/include/userland/interface/khronos/glxx/glxx_client.c b/gfx/include/userland/interface/khronos/glxx/glxx_client.c index a395707acc..f86891b612 100644 --- a/gfx/include/userland/interface/khronos/glxx/glxx_client.c +++ b/gfx/include/userland/interface/khronos/glxx/glxx_client.c @@ -1342,7 +1342,6 @@ GL_API void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count) } } - GL_API void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) { CLIENT_THREAD_STATE_T *thread = CLIENT_GET_THREAD_STATE(); @@ -2872,8 +2871,6 @@ GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLf params[0] = (GLfloat)state->attrib[index].buffer; break; - - default: set_error(state, GL_INVALID_ENUM); break; @@ -2912,7 +2909,6 @@ GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLi params[0] = (GLint) state->attrib[index].buffer; break; - //TODO: is this the best way to handle conversions? We duplicate //the entire switch statement. case GL_CURRENT_VERTEX_ATTRIB: @@ -5137,7 +5133,6 @@ GLboolean glxx_client_IsRenderbuffer(GLuint renderbuffer) return 0; } - GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer) { return glxx_client_IsRenderbuffer(renderbuffer); @@ -5160,7 +5155,6 @@ GL_APICALL void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffe glxx_client_BindRenderbuffer(target, renderbuffer); } - void glxx_client_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) { CLIENT_THREAD_STATE_T *thread = CLIENT_GET_THREAD_STATE(); diff --git a/gfx/include/userland/interface/khronos/glxx/glxx_client.h b/gfx/include/userland/interface/khronos/glxx/glxx_client.h index 82c1d03508..37a05dddc8 100644 --- a/gfx/include/userland/interface/khronos/glxx/glxx_client.h +++ b/gfx/include/userland/interface/khronos/glxx/glxx_client.h @@ -62,9 +62,9 @@ typedef struct buffer_info { } GLXX_BUFFER_INFO_T; typedef struct { - + GLenum error; - + /* Open GL version @@ -72,8 +72,8 @@ typedef struct { OPENGL_ES_11 or OPENGL_ES_20 */ - - unsigned int type; + + unsigned int type; /* alignments @@ -97,7 +97,7 @@ typedef struct { GL_FLUSH_CALLBACK_T flush_callback; KHRN_CACHE_T cache; - + //gl 1.1 specific struct { GLenum client; diff --git a/gfx/include/userland/interface/khronos/glxx/glxx_int_attrib.h b/gfx/include/userland/interface/khronos/glxx/glxx_int_attrib.h index 20a992a960..ab70f61b95 100644 --- a/gfx/include/userland/interface/khronos/glxx/glxx_int_attrib.h +++ b/gfx/include/userland/interface/khronos/glxx/glxx_int_attrib.h @@ -50,7 +50,6 @@ typedef struct { GLfloat value[4]; } GLXX_ATTRIB_T; - /* GL 1.1 specific For indexing into arrays of handles/pointers */ #define GL11_IX_COLOR 1//0 #define GL11_IX_NORMAL 2//1 diff --git a/gfx/include/userland/interface/khronos/glxx/glxx_int_config.h b/gfx/include/userland/interface/khronos/glxx/glxx_int_config.h index 04bc1ea084..2288e4bb33 100644 --- a/gfx/include/userland/interface/khronos/glxx/glxx_int_config.h +++ b/gfx/include/userland/interface/khronos/glxx/glxx_int_config.h @@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef GLXX_INT_CONFIG_H #define GLXX_INT_CONFIG_H - + #define GLXX_CONFIG_MAX_VERTEX_ATTRIBS 10 /* GL 2.0 exposes a maximum of 8 attributes */ #define GL20_CONFIG_MAX_VERTEX_ATTRIBS 8 diff --git a/gfx/include/userland/interface/khronos/include/EGL/egl.h b/gfx/include/userland/interface/khronos/include/EGL/egl.h index 0471e5a09b..18f3cd8fc5 100644 --- a/gfx/include/userland/interface/khronos/include/EGL/egl.h +++ b/gfx/include/userland/interface/khronos/include/EGL/egl.h @@ -242,8 +242,6 @@ typedef void *EGLClientBuffer; * a bug in Khronos Bugzilla against task "Registry". */ - - /* EGL Functions */ EGLAPI EGLint EGLAPIENTRY eglGetError(void); @@ -290,10 +288,8 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surfac EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer); - EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval); - EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); diff --git a/gfx/include/userland/interface/khronos/include/EGL/eglext.h b/gfx/include/userland/interface/khronos/include/EGL/eglext.h index 89a3369e3f..09e181c4f0 100644 --- a/gfx/include/userland/interface/khronos/include/EGL/eglext.h +++ b/gfx/include/userland/interface/khronos/include/EGL/eglext.h @@ -190,7 +190,6 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSy typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value); #endif - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/interface/khronos/include/EGL/eglext_android.h b/gfx/include/userland/interface/khronos/include/EGL/eglext_android.h index 9a4320de6e..b89bec9b33 100644 --- a/gfx/include/userland/interface/khronos/include/EGL/eglext_android.h +++ b/gfx/include/userland/interface/khronos/include/EGL/eglext_android.h @@ -73,7 +73,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSetSwapRectangleANDROID (EGLDisplay dpy, EGLSur typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETSWAPRECTANGLEANDROIDPROC) (EGLDisplay dpy, EGLSurface draw, EGLint left, EGLint top, EGLint width, EGLint height); #endif /* EGL_ANDROID_swap_rectangle */ - #ifndef EGL_ANDROID_render_buffer #define EGL_ANDROID_render_buffer 1 #endif diff --git a/gfx/include/userland/interface/khronos/include/EGL/eglplatform.h b/gfx/include/userland/interface/khronos/include/EGL/eglplatform.h index 1f7c930617..c585b785b3 100644 --- a/gfx/include/userland/interface/khronos/include/EGL/eglplatform.h +++ b/gfx/include/userland/interface/khronos/include/EGL/eglplatform.h @@ -149,7 +149,6 @@ typedef EGLNativeDisplayType NativeDisplayType; typedef EGLNativePixmapType NativePixmapType; typedef EGLNativeWindowType NativeWindowType; - /* Define EGLint. This must be a signed integral type large enough to contain * all legal attribute names and values passed into and out of EGL, whether * their type is boolean, bitmask, enumerant (symbolic constant), integer, diff --git a/gfx/include/userland/interface/khronos/include/GLES/gl.h b/gfx/include/userland/interface/khronos/include/GLES/gl.h index f284663153..05a48e96c9 100644 --- a/gfx/include/userland/interface/khronos/include/GLES/gl.h +++ b/gfx/include/userland/interface/khronos/include/GLES/gl.h @@ -795,4 +795,3 @@ GL_API void GL_APIENTRY glPointSizePointerOES (GLenum type, GLsizei stride, cons #endif #endif /* __gl_h_ */ - diff --git a/gfx/include/userland/interface/khronos/include/KHR/khrplatform.h b/gfx/include/userland/interface/khronos/include/KHR/khrplatform.h index ecb5199098..93574adcda 100644 --- a/gfx/include/userland/interface/khronos/include/KHR/khrplatform.h +++ b/gfx/include/userland/interface/khronos/include/KHR/khrplatform.h @@ -134,7 +134,6 @@ *-----------------------------------------------------------------------*/ #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - /* * Using */ @@ -226,7 +225,6 @@ typedef uint64_t khronos_uint64_t; #endif - /* * Types that are (so far) the same on all platforms */ @@ -236,7 +234,7 @@ typedef signed short int khronos_int16_t; typedef unsigned short int khronos_uint16_t; /* - * Types that differ between LLP64 and LP64 architectures - in LLP64, + * Types that differ between LLP64 and LP64 architectures - in LLP64, * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears * to be the only LLP64 architecture in current use. */ diff --git a/gfx/include/userland/interface/khronos/include/VG/vgext.h b/gfx/include/userland/interface/khronos/include/VG/vgext.h index f718a3547e..261d4bcf4a 100644 --- a/gfx/include/userland/interface/khronos/include/VG/vgext.h +++ b/gfx/include/userland/interface/khronos/include/VG/vgext.h @@ -31,8 +31,6 @@ * \brief VG extensions *//*-------------------------------------------------------------------*/ - - #ifndef _VGEXT_H #define _VGEXT_H @@ -78,7 +76,6 @@ typedef VGImage (VG_API_ENTRYP PFNVGCREATEEGLIMAGETARGETKHRPROC) (VGeglImageKHR #endif - #ifndef VG_KHR_iterative_average_blur #define VG_KHR_iterative_average_blur 1 @@ -89,7 +86,6 @@ typedef void (VG_API_ENTRYP PFNVGITERATIVEAVERAGEBLURKHRPROC) (VGImage dst,VGIma #endif - #ifndef VG_KHR_advanced_blending #define VG_KHR_advanced_blending 1 @@ -157,7 +153,6 @@ typedef VGUErrorCode (VGU_API_ENTRYP PFNVGUGRADIENTBEVELKHRPROC) (VGImage dst,VG #endif - /*------------------------------------------------------------------------------- * NDS extensions *------------------------------------------------------------------------------*/ @@ -180,7 +175,6 @@ typedef enum { } VGImageModeNds; #endif - #ifndef VG_NDS_projective_geometry #define VG_NDS_projective_geometry 1 diff --git a/gfx/include/userland/interface/khronos/include/VG/vgu.h b/gfx/include/userland/interface/khronos/include/VG/vgu.h index b49aee2eb7..c197e2327d 100644 --- a/gfx/include/userland/interface/khronos/include/VG/vgu.h +++ b/gfx/include/userland/interface/khronos/include/VG/vgu.h @@ -55,7 +55,6 @@ extern "C" { # error VGU_API_EXIT must be defined #endif - typedef enum { VGU_NO_ERROR = 0, VGU_BAD_HANDLE_ERROR = 0xF000, diff --git a/gfx/include/userland/interface/khronos/include/WF/wfc.h b/gfx/include/userland/interface/khronos/include/WF/wfc.h index a684dc08e7..40cfedc1f4 100644 --- a/gfx/include/userland/interface/khronos/include/WF/wfc.h +++ b/gfx/include/userland/interface/khronos/include/WF/wfc.h @@ -147,7 +147,6 @@ typedef enum { WFC_STRINGID_FORCE_32BIT = 0x7FFFFFFF } WFCStringID; - /* Function Prototypes */ /* Device */ diff --git a/gfx/include/userland/interface/khronos/vg/vg_client.c b/gfx/include/userland/interface/khronos/vg/vg_client.c index e10070cd63..0a77734b3c 100644 --- a/gfx/include/userland/interface/khronos/vg/vg_client.c +++ b/gfx/include/userland/interface/khronos/vg/vg_client.c @@ -3029,7 +3029,7 @@ VG_API_CALL void VG_API_ENTRY vgAppendPathData( coords_count += get_segment_coords_count(segments[i] & ~VG_RELATIVE); } - RPC_CALL6(vgAppendPathData_impl, thread, no_id, + RPC_CALL6(vgAppendPathData_impl, thread, no_id, vg_handle, datatype, segments_count, segments, @@ -3135,7 +3135,7 @@ VG_API_CALL void VG_API_ENTRY vgModifyPathCoords( platform_mutex_release(&state->shared_state->mutex); #ifdef RPC_DIRECT - RPC_CALL5(vgModifyPathCoords_impl, thread, no_id, + RPC_CALL5(vgModifyPathCoords_impl, thread, no_id, vg_handle, datatype, coords_offset, coords_size, coords); @@ -3830,11 +3830,11 @@ VG_API_CALL void VG_API_ENTRY vgImageSubData( if (width <= 0 || height <= 0) { return; } - + data = (const VGubyte *)data + (src_y * data_stride); #ifdef RPC_DIRECT - RPC_CALL11(vgImageSubData_impl, thread, no_id, + RPC_CALL11(vgImageSubData_impl, thread, no_id, vg_handle, dst_width, dst_height, data, data_stride, @@ -3940,11 +3940,11 @@ VG_API_CALL void VG_API_ENTRY vgGetImageSubData( if (width <= 0 || height <= 0) { return; } - + data = (VGubyte *)data + (dst_y * data_stride); #ifdef RPC_DIRECT - RPC_CALL11(vgGetImageSubData_impl, thread, no_id, + RPC_CALL11(vgGetImageSubData_impl, thread, no_id, vg_handle, src_width, src_height, data, data_stride, @@ -4214,14 +4214,14 @@ VG_API_CALL void VG_API_ENTRY vgWritePixels( if (width <= 0 || height <= 0) { return; } - + data = (const VGubyte *)data + (src_y * data_stride); if (state->render_callback) state->render_callback(); #ifdef RPC_DIRECT - RPC_CALL8(vgWritePixels_impl, thread, no_id, + RPC_CALL8(vgWritePixels_impl, thread, no_id, data, data_stride, data_format, src_x, @@ -4325,11 +4325,11 @@ VG_API_CALL void VG_API_ENTRY vgReadPixels( if (width <= 0 || height <= 0) { return; } - + data = (VGubyte *)data + (dst_y * data_stride); #ifdef RPC_DIRECT - RPC_CALL8(vgReadPixels_impl, thread, no_id, + RPC_CALL8(vgReadPixels_impl, thread, no_id, data, data_stride, data_format, dst_x, @@ -4686,7 +4686,7 @@ VG_API_CALL void VG_API_ENTRY vgDrawGlyphs( state->render_callback(); #ifdef RPC_DIRECT - RPC_CALL7(vgDrawGlyphs_impl, thread, no_id, + RPC_CALL7(vgDrawGlyphs_impl, thread, no_id, vg_handle, glyphs_count, glyph_ids, adjustments_x, adjustments_y, @@ -4826,7 +4826,7 @@ VG_API_CALL void VG_API_ENTRY vgSeparableConvolve( } #ifdef RPC_DIRECT - RPC_CALL11(vgSeparableConvolve_impl, thread, no_id, + RPC_CALL11(vgSeparableConvolve_impl, thread, no_id, dst_vg_handle, src_vg_handle, kernel_width, kernel_height, shift_x, shift_y, @@ -4896,7 +4896,7 @@ VG_API_CALL void VG_API_ENTRY vgLookup( } #ifdef RPC_DIRECT - RPC_CALL8(vgLookup_impl, thread, no_id, + RPC_CALL8(vgLookup_impl, thread, no_id, dst_vg_handle, src_vg_handle, red_lut, green_lut, blue_lut, alpha_lut, clean_boolean(output_linear), @@ -5088,7 +5088,7 @@ VGU_API_CALL VGUErrorCode VGU_API_ENTRY vguPolygon( platform_mutex_release(&state->shared_state->mutex); #ifdef RPC_DIRECT - RPC_CALL5(vguPolygon_impl, thread, no_id, + RPC_CALL5(vguPolygon_impl, thread, no_id, vg_handle, ps, ps_count, true, clean_boolean(close)); @@ -5114,7 +5114,7 @@ VGU_API_CALL VGUErrorCode VGU_API_ENTRY vguPolygon( #undef MESSAGE_SIZE - rpc_send_ctrl_begin(thread, + rpc_send_ctrl_begin(thread, sizeof(message) + (chunk_ps_count * 2 * sizeof(VGfloat))); rpc_send_ctrl_write(thread, message, sizeof(message)); diff --git a/gfx/include/userland/interface/khronos/wf/wfc_client_stream.c b/gfx/include/userland/interface/khronos/wf/wfc_client_stream.c index 77ae9275c5..2ee5bc5846 100644 --- a/gfx/include/userland/interface/khronos/wf/wfc_client_stream.c +++ b/gfx/include/userland/interface/khronos/wf/wfc_client_stream.c @@ -1040,4 +1040,3 @@ void wfc_stream_unregister(WFCNativeStreamType stream) { } //============================================================================== - diff --git a/gfx/include/userland/interface/khronos/wf/wfc_int.h b/gfx/include/userland/interface/khronos/wf/wfc_int.h index f780e279ea..f561dd4bad 100644 --- a/gfx/include/userland/interface/khronos/wf/wfc_int.h +++ b/gfx/include/userland/interface/khronos/wf/wfc_int.h @@ -198,7 +198,6 @@ typedef struct WFC_STREAM_IMAGE_FLIP_T flip; //< Flips to apply to the buffer for display } WFC_STREAM_IMAGE_T; - //============================================================================== // VideoCore-specific definitions //============================================================================== @@ -230,8 +229,6 @@ typedef enum WFC_PIXEL_FORMAT_FORCE_32BIT = 0x7FFFFFFF } WFC_PIXEL_FORMAT_T; - - //------------------------------------------------------------------------------ // Non-standard functions diff --git a/gfx/include/userland/interface/khronos/wf/wfc_ipc.h b/gfx/include/userland/interface/khronos/wf/wfc_ipc.h index 63220f5556..74fe6113b5 100644 --- a/gfx/include/userland/interface/khronos/wf/wfc_ipc.h +++ b/gfx/include/userland/interface/khronos/wf/wfc_ipc.h @@ -81,7 +81,6 @@ typedef enum { WFC_IPC_MSG_CALLBACK, /**< Sent from server to complete callback */ - WFC_IPC_MSG_MAX = 0x7FFFFFFF /**< Force type to be 32-bit */ } WFC_IPC_MSG_TYPE; @@ -315,7 +314,6 @@ typedef struct { WFC_IPC_VOID_PTR_T image_available_data; /**< Opaque client data */ } WFC_IPC_MSG_SS_ON_IMAGE_AVAILABLE_T; - /** All messages sent between the client and server must be represented in * this union. */ diff --git a/gfx/include/userland/interface/mmal/components/CMakeLists.txt b/gfx/include/userland/interface/mmal/components/CMakeLists.txt index d65fa37d95..bd7b9ca793 100644 --- a/gfx/include/userland/interface/mmal/components/CMakeLists.txt +++ b/gfx/include/userland/interface/mmal/components/CMakeLists.txt @@ -31,4 +31,3 @@ target_link_libraries(mmal_components ${container_libs} mmal_util) target_link_libraries(mmal_components mmal_core) install(TARGETS mmal_components DESTINATION lib) - diff --git a/gfx/include/userland/interface/mmal/components/clock.c b/gfx/include/userland/interface/mmal/components/clock.c index d59f4e4f1b..3b1b32f3b5 100644 --- a/gfx/include/userland/interface/mmal/components/clock.c +++ b/gfx/include/userland/interface/mmal/components/clock.c @@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "util/mmal_list.h" #include "mmal_logging.h" - #define CLOCK_PORTS_NUM 5 #define MAX_CLOCK_EVENT_SLOTS 16 @@ -152,7 +151,6 @@ typedef struct MMAL_PORT_MODULE_T CLOCK_STREAM_T *stream; /**< stream associated with this clock port */ } MMAL_PORT_MODULE_T; - /*****************************************************************************/ /** Round x up to the next power of two */ static uint32_t next_pow2(uint32_t x) @@ -717,7 +715,6 @@ static void clock_event_cb(MMAL_PORT_T *port, const MMAL_CLOCK_EVENT_T *event) clock_event_queue(port->component, port, event); } - /*****************************************************************************/ /** Actual processing function */ static MMAL_BOOL_T clock_do_processing(MMAL_COMPONENT_T *component) @@ -761,7 +758,6 @@ static void clock_do_processing_loop(MMAL_COMPONENT_T *component) while (clock_do_processing(component)); } - /*****************************************************************************/ /** Set a parameter on the clock component's control port */ static MMAL_STATUS_T clock_control_parameter_set(MMAL_PORT_T *port, const MMAL_PARAMETER_HEADER_T *param) @@ -891,7 +887,6 @@ static MMAL_STATUS_T mmal_component_create_clock(const char *name, MMAL_COMPONEN return status; } - /*****************************************************************************/ MMAL_CONSTRUCTOR(mmal_register_component_clock); void mmal_register_component_clock(void) diff --git a/gfx/include/userland/interface/mmal/components/scheduler.c b/gfx/include/userland/interface/mmal/components/scheduler.c index 753b46a65a..b7a8731635 100644 --- a/gfx/include/userland/interface/mmal/components/scheduler.c +++ b/gfx/include/userland/interface/mmal/components/scheduler.c @@ -43,14 +43,12 @@ typedef struct MMAL_COMPONENT_MODULE_T MMAL_STATUS_T status; /**< current status of the component */ } MMAL_COMPONENT_MODULE_T; - typedef struct MMAL_PORT_MODULE_T { MMAL_QUEUE_T *queue; /**< queue for the buffers sent to the port */ int64_t last_ts; /***< Last timestamp seen on the input port */ } MMAL_PORT_MODULE_T; - /*****************************************************************************/ /** Process an event buffer */ static MMAL_STATUS_T scheduler_event_process(MMAL_PORT_T *port, MMAL_BUFFER_HEADER_T *buffer) @@ -482,4 +480,3 @@ void mmal_register_component_scheduler(void) { mmal_component_supplier_register("scheduler", mmal_component_create_scheduler); } - diff --git a/gfx/include/userland/interface/mmal/components/sdl_video_render.c b/gfx/include/userland/interface/mmal/components/sdl_video_render.c index 6f95d96300..36b4ba283e 100644 --- a/gfx/include/userland/interface/mmal/components/sdl_video_render.c +++ b/gfx/include/userland/interface/mmal/components/sdl_video_render.c @@ -115,7 +115,7 @@ static MMAL_STATUS_T mmal_sdl_create_surface(MMAL_COMPONENT_MODULE_T *module) LOG_ERROR("no SDL video mode available"); return MMAL_ENOSYS; } - module->sdl_surface = SDL_SetVideoMode(w, h, bpp, flags); + module->sdl_surface = SDL_SetVideoMode(w, h, bpp, flags); if(!module->sdl_surface) { LOG_ERROR("cannot create SDL surface"); @@ -124,7 +124,6 @@ static MMAL_STATUS_T mmal_sdl_create_surface(MMAL_COMPONENT_MODULE_T *module) return MMAL_SUCCESS; } - /** Set format on a port */ static MMAL_STATUS_T sdl_port_set_format(MMAL_PORT_T *port) { diff --git a/gfx/include/userland/interface/mmal/core/mmal_clock.c b/gfx/include/userland/interface/mmal/core/mmal_clock.c index 23f3043755..2204c24d68 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_clock.c +++ b/gfx/include/userland/interface/mmal/core/mmal_clock.c @@ -37,7 +37,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # define USE_RTOS_TIMER #endif - /*****************************************************************************/ #ifdef USE_RTOS_TIMER # define MIN_TIMER_DELAY 1 /* microseconds */ @@ -82,7 +81,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define LOCK(p) vcos_mutex_lock(&(p)->lock); #define UNLOCK(p) vcos_mutex_unlock(&(p)->lock); - /*****************************************************************************/ #ifdef USE_RTOS_TIMER typedef RTOS_TIMER_T MMAL_TIMER_T; @@ -158,7 +156,6 @@ typedef struct MMAL_CLOCK_PRIVATE_T } MMAL_CLOCK_PRIVATE_T; - /*****************************************************************************/ static void mmal_clock_wake_thread(MMAL_CLOCK_PRIVATE_T *private); @@ -222,7 +219,6 @@ static inline void mmal_clock_timer_cancel(MMAL_TIMER_T *timer) #endif } - /***************************************************************************** * Clock module private functions *****************************************************************************/ diff --git a/gfx/include/userland/interface/mmal/core/mmal_clock_private.h b/gfx/include/userland/interface/mmal/core/mmal_clock_private.h index 25ebc870f5..cb06fc2397 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_clock_private.h +++ b/gfx/include/userland/interface/mmal/core/mmal_clock_private.h @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. extern "C" { #endif - /** Handle to a clock. */ typedef struct MMAL_CLOCK_T { diff --git a/gfx/include/userland/interface/mmal/core/mmal_core_private.h b/gfx/include/userland/interface/mmal/core/mmal_core_private.h index 8dc6cbab17..b90a084d3f 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_core_private.h +++ b/gfx/include/userland/interface/mmal/core/mmal_core_private.h @@ -37,4 +37,3 @@ void mmal_logging_init(void); void mmal_logging_deinit(void); #endif /* MMAL_CORE_PRIVATE_H */ - diff --git a/gfx/include/userland/interface/mmal/core/mmal_port.c b/gfx/include/userland/interface/mmal/core/mmal_port.c index 89f4bd60df..dbd3d91d54 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_port.c +++ b/gfx/include/userland/interface/mmal/core/mmal_port.c @@ -1005,7 +1005,6 @@ MMAL_STATUS_T mmal_port_connect(MMAL_PORT_T *port, MMAL_PORT_T *other_port) core->core_owns_connection = 1; other_core->core_owns_connection = 1; - finish: UNLOCK_CONNECTION(other_port); UNLOCK_CONNECTION(port); diff --git a/gfx/include/userland/interface/mmal/core/mmal_port_clock.c b/gfx/include/userland/interface/mmal/core/mmal_port_clock.c index 1eb7d105ec..a760ca389d 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_port_clock.c +++ b/gfx/include/userland/interface/mmal/core/mmal_port_clock.c @@ -83,7 +83,6 @@ static void mmal_port_clock_payload_free(MMAL_PORT_T *port, uint8_t *payload) } #endif - /* Callback invoked by the clock module in response to a client request */ static void mmal_port_clock_request_cb(MMAL_CLOCK_T* clock, int64_t media_time, void *cb_data, MMAL_CLOCK_VOID_FP cb) { @@ -800,4 +799,3 @@ void mmal_port_clock_output_buffer_info(MMAL_PORT_T *port, const MMAL_CLOCK_BUFF if (port->priv->clock->buffer_info_reporting) mmal_port_clock_forward_output_buffer_info(port, info); } - diff --git a/gfx/include/userland/interface/mmal/core/mmal_queue.c b/gfx/include/userland/interface/mmal/core/mmal_queue.c index d58b28a87f..35ee59568c 100644 --- a/gfx/include/userland/interface/mmal/core/mmal_queue.c +++ b/gfx/include/userland/interface/mmal/core/mmal_queue.c @@ -126,7 +126,6 @@ void mmal_queue_put_back(MMAL_QUEUE_T *queue, MMAL_BUFFER_HEADER_T *buffer) vcos_mutex_unlock(&queue->lock); } - /** Get a MMAL_BUFFER_HEADER_T from a QUEUE. Semaphore already claimed */ static MMAL_BUFFER_HEADER_T *mmal_queue_get_core(MMAL_QUEUE_T *queue) { diff --git a/gfx/include/userland/interface/mmal/mmal.h b/gfx/include/userland/interface/mmal/mmal.h index de0a4debd5..d4812678fe 100644 --- a/gfx/include/userland/interface/mmal/mmal.h +++ b/gfx/include/userland/interface/mmal/mmal.h @@ -167,7 +167,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * \subsection pool Pools of Buffer Headers * - * Pools (\ref MMAL_POOL_T) let clients allocate a fixed number of buffer headers, and + * Pools (\ref MMAL_POOL_T) let clients allocate a fixed number of buffer headers, and * a queue (\ref MMAL_QUEUE_T). They are used for buffer header allocation. * Optionally a pool can also allocate the payload memory for the client. * diff --git a/gfx/include/userland/interface/mmal/mmal_clock.h b/gfx/include/userland/interface/mmal/mmal_clock.h index 37e017a49e..c967a702df 100644 --- a/gfx/include/userland/interface/mmal/mmal_clock.h +++ b/gfx/include/userland/interface/mmal/mmal_clock.h @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #ifndef MMAL_CLOCK_H #define MMAL_CLOCK_H @@ -98,7 +97,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** Clock event not valid */ #define MMAL_CLOCK_EVENT_INVALID 0 - /** Thresholds used when updating a clock's media-time */ typedef struct MMAL_CLOCK_UPDATE_THRESHOLD_T { diff --git a/gfx/include/userland/interface/mmal/mmal_events.h b/gfx/include/userland/interface/mmal/mmal_events.h index 94ccd56ae8..62e616a2f8 100644 --- a/gfx/include/userland/interface/mmal/mmal_events.h +++ b/gfx/include/userland/interface/mmal/mmal_events.h @@ -60,7 +60,6 @@ extern "C" { /* @} */ - /** End-of-stream event. */ typedef struct MMAL_EVENT_END_OF_STREAM_T { diff --git a/gfx/include/userland/interface/mmal/mmal_parameters_audio.h b/gfx/include/userland/interface/mmal/mmal_parameters_audio.h index 36625f6b26..a07d8d4960 100644 --- a/gfx/include/userland/interface/mmal/mmal_parameters_audio.h +++ b/gfx/include/userland/interface/mmal/mmal_parameters_audio.h @@ -63,4 +63,3 @@ typedef struct MMAL_PARAMETER_AUDIO_LATENCY_TARGET_T } MMAL_PARAMETER_AUDIO_LATENCY_TARGET_T; #endif /* MMAL_PARAMETERS_AUDIO_H */ - diff --git a/gfx/include/userland/interface/mmal/mmal_parameters_camera.h b/gfx/include/userland/interface/mmal/mmal_parameters_camera.h index 577b7a2cdd..d8581b6d3c 100644 --- a/gfx/include/userland/interface/mmal/mmal_parameters_camera.h +++ b/gfx/include/userland/interface/mmal/mmal_parameters_camera.h @@ -503,7 +503,6 @@ typedef struct MMAL_PARAMETER_CAMERA_CONFIG_T /**< Selects algorithm for timestamping frames if there is no clock component connected. */ - } MMAL_PARAMETER_CAMERA_CONFIG_T; #define MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS 4 @@ -650,7 +649,6 @@ typedef struct MMAL_PARAMETER_ALGORITHM_CONTROL_T MMAL_BOOL_T enabled; } MMAL_PARAMETER_ALGORITHM_CONTROL_T; - typedef enum MMAL_PARAM_CAMERA_USE_CASE_T { MMAL_PARAM_CAMERA_USE_CASE_UNKNOWN, /**< Compromise on behaviour as use case totally unknown */ diff --git a/gfx/include/userland/interface/mmal/mmal_parameters_common.h b/gfx/include/userland/interface/mmal/mmal_parameters_common.h index 28c31187c4..24a340009a 100644 --- a/gfx/include/userland/interface/mmal/mmal_parameters_common.h +++ b/gfx/include/userland/interface/mmal/mmal_parameters_common.h @@ -52,7 +52,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** Miracast-specific parameter ID group. */ #define MMAL_PARAMETER_GROUP_MIRACAST (5<<16) - /**@}*/ /** Common MMAL parameter IDs. @@ -188,4 +187,3 @@ typedef struct MMAL_PARAMETER_LOGGING_T } MMAL_PARAMETER_LOGGING_T; #endif /* MMAL_PARAMETERS_COMMON_H */ - diff --git a/gfx/include/userland/interface/mmal/mmal_parameters_video.h b/gfx/include/userland/interface/mmal/mmal_parameters_video.h index f7817abe8b..1f205ee439 100644 --- a/gfx/include/userland/interface/mmal/mmal_parameters_video.h +++ b/gfx/include/userland/interface/mmal/mmal_parameters_video.h @@ -73,7 +73,7 @@ enum { MMAL_PARAMETER_VIDEO_ENCODE_QP_P, /**< Takes a @ref MMAL_PARAMETER_UINT32_T. */ MMAL_PARAMETER_VIDEO_ENCODE_RC_SLICE_DQUANT, /**< Takes a @ref MMAL_PARAMETER_UINT32_T. */ MMAL_PARAMETER_VIDEO_ENCODE_FRAME_LIMIT_BITS, /**< Takes a @ref MMAL_PARAMETER_UINT32_T */ - MMAL_PARAMETER_VIDEO_ENCODE_PEAK_RATE, /**< Takes a @ref MMAL_PARAMETER_UINT32_T. */ + MMAL_PARAMETER_VIDEO_ENCODE_PEAK_RATE, /**< Takes a @ref MMAL_PARAMETER_UINT32_T. */ /*H264 specific parameters*/ MMAL_PARAMETER_VIDEO_ENCODE_H264_DISABLE_CABAC, /**< Take a @ref MMAL_PARAMETER_BOOLEAN_T. */ @@ -406,7 +406,7 @@ typedef struct MMAL_PARAMETER_VIDEO_NALUNITFORMAT_T { MMAL_VIDEO_NALUNITFORMAT_T format; } MMAL_PARAMETER_VIDEO_NALUNITFORMAT_T; -/** H264 Only: Overrides for max macro-blocks per second, max framesize, +/** H264 Only: Overrides for max macro-blocks per second, max framesize, * and max bitrates. This overrides the default maximums for the configured level. */ typedef struct MMAL_PARAMETER_VIDEO_LEVEL_EXTENSION_T { @@ -524,5 +524,4 @@ typedef struct MMAL_PARAMETER_VIDEO_SOURCE_PATTERN_T { MMAL_RATIONAL_T framerate; /**< Framerate used when determining buffer timestamps */ } MMAL_PARAMETER_VIDEO_SOURCE_PATTERN_T; - #endif diff --git a/gfx/include/userland/interface/mmal/mmal_pool.h b/gfx/include/userland/interface/mmal/mmal_pool.h index 4df58537db..3e6e393d60 100644 --- a/gfx/include/userland/interface/mmal/mmal_pool.h +++ b/gfx/include/userland/interface/mmal/mmal_pool.h @@ -75,7 +75,7 @@ typedef void (*mmal_pool_allocator_free_t)(void *context, void *mem); * necessary by MMAL. * * @param headers Number of buffer headers to be allocated with the pool. - * @param payload_size Size of the payload buffer that will be allocated in + * @param payload_size Size of the payload buffer that will be allocated in * each of the buffer headers. * @return Pointer to the newly created pool or NULL on failure. */ diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx.h b/gfx/include/userland/interface/mmal/openmaxil/mmalomx.h index d58971a4ae..ef84f43879 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx.h +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx.h @@ -127,4 +127,3 @@ OMX_ERRORTYPE mmalomx_callback_event_handler( #define MMALOMX_UNLOCK(a) vcos_mutex_unlock(&a->lock) #define MMALOMX_LOCK_PORT(a,b) vcos_mutex_lock(&a->lock_port) #define MMALOMX_UNLOCK_PORT(a,b) vcos_mutex_unlock(&a->lock_port) - diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_buffer.c b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_buffer.c index ef78baad16..a8a5c7edb0 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_buffer.c +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_buffer.c @@ -232,4 +232,3 @@ OMX_ERRORTYPE mmalomx_buffer_return( return OMX_ErrorNone; } - diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.c b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.c index dd395d48e6..35f3c7ff6e 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.c +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.c @@ -386,7 +386,7 @@ OMX_ERRORTYPE mmalomx_command_port_disable( /*****************************************************************************/ OMX_ERRORTYPE mmalomx_command_queue( - MMALOMX_COMPONENT_T *component, + MMALOMX_COMPONENT_T *component, OMX_U32 arg1, OMX_U32 arg2) { MMAL_BUFFER_HEADER_T *cmd = mmal_queue_get(component->cmd_pool->queue); @@ -459,4 +459,3 @@ void mmalomx_commands_actions_next(MMALOMX_COMPONENT_T *component) mmalomx_command_port_disable((OMX_HANDLETYPE)&component->omx, i); } } - diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.h b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.h index 976b598615..dca9ece02e 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.h +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_commands.h @@ -82,4 +82,3 @@ OMX_ERRORTYPE mmalomx_command_dequeue( void mmalomx_commands_actions_check(MMALOMX_COMPONENT_T *component); void mmalomx_commands_actions_signal(MMALOMX_COMPONENT_T *component); void mmalomx_commands_actions_next(MMALOMX_COMPONENT_T *component); - diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_core.c b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_core.c index 20d4fc707e..30900731f7 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_core.c +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_core.c @@ -1574,4 +1574,3 @@ static void *mmalomx_cmd_thread_func(void *arg) return 0; } - diff --git a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_marks.h b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_marks.h index f543396e85..25a0c7d627 100644 --- a/gfx/include/userland/interface/mmal/openmaxil/mmalomx_marks.h +++ b/gfx/include/userland/interface/mmal/openmaxil/mmalomx_marks.h @@ -33,4 +33,3 @@ void mmalomx_mark_process_incoming(MMALOMX_COMPONENT_T *component, MMALOMX_PORT_T *port, OMX_BUFFERHEADERTYPE *omx_buffer); void mmalomx_mark_process_outgoing(MMALOMX_COMPONENT_T *component, MMALOMX_PORT_T *port, OMX_BUFFERHEADERTYPE *omx_buffer); - diff --git a/gfx/include/userland/interface/mmal/util/mmal_list.c b/gfx/include/userland/interface/mmal/util/mmal_list.c index 6f45d780b5..796018e86c 100644 --- a/gfx/include/userland/interface/mmal/util/mmal_list.c +++ b/gfx/include/userland/interface/mmal/util/mmal_list.c @@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/vcos/vcos.h" #include "interface/mmal/util/mmal_list.h" - /* Private list context */ typedef struct MMAL_LIST_PRIVATE_T { @@ -36,7 +35,6 @@ typedef struct MMAL_LIST_PRIVATE_T VCOS_MUTEX_T lock; } MMAL_LIST_PRIVATE_T; - /* Lock the list. */ static inline void mmal_list_lock(MMAL_LIST_T *list) { diff --git a/gfx/include/userland/interface/mmal/util/mmal_param_convert.c b/gfx/include/userland/interface/mmal/util/mmal_param_convert.c index ec48a5bc4d..529d911d7a 100644 --- a/gfx/include/userland/interface/mmal/util/mmal_param_convert.c +++ b/gfx/include/userland/interface/mmal/util/mmal_param_convert.c @@ -173,4 +173,3 @@ MMAL_STATUS_T mmal_parse_geometry(MMAL_RECT_T *dest, const char *str) } return ret; } - diff --git a/gfx/include/userland/interface/mmal/util/mmal_util.c b/gfx/include/userland/interface/mmal/util/mmal_util.c index b662c9a3d7..1126c64189 100644 --- a/gfx/include/userland/interface/mmal/util/mmal_util.c +++ b/gfx/include/userland/interface/mmal/util/mmal_util.c @@ -157,7 +157,6 @@ static struct { { MMAL_ENCODING_UNKNOWN, MMAL_ENCODING_UNKNOWN }, }; - uint32_t mmal_encoding_stride_to_width(uint32_t encoding, uint32_t stride) { unsigned int i; @@ -433,7 +432,6 @@ typedef struct { MMAL_FOURCC_T encodings[MAX_ENCODINGS_NUM]; } MMAL_SUPPORTED_ENCODINGS_T; - int mmal_util_rgb_order_fixed(MMAL_PORT_T *port) { int new_fw = 0; diff --git a/gfx/include/userland/interface/mmal/util/mmal_util.h b/gfx/include/userland/interface/mmal/util/mmal_util.h index 556c228e76..267d5030df 100644 --- a/gfx/include/userland/interface/mmal/util/mmal_util.h +++ b/gfx/include/userland/interface/mmal/util/mmal_util.h @@ -170,7 +170,6 @@ MMAL_PORT_T *mmal_util_get_port(MMAL_COMPONENT_T *comp, MMAL_PORT_TYPE_T type, u */ char *mmal_4cc_to_string(char *buf, size_t len, uint32_t fourcc); - /** On FW prior to June 2016, camera and video_splitter * had BGR24 and RGB24 support reversed. * This is now fixed, and this function will return whether the diff --git a/gfx/include/userland/interface/mmal/util/mmal_util_params.c b/gfx/include/userland/interface/mmal/util/mmal_util_params.c index 6e247914c1..8a65244cd7 100644 --- a/gfx/include/userland/interface/mmal/util/mmal_util_params.c +++ b/gfx/include/userland/interface/mmal/util/mmal_util_params.c @@ -202,7 +202,7 @@ MMAL_STATUS_T mmal_util_camera_use_stc_timestamp(MMAL_PORT_T *port, MMAL_CAMERA_ return mmal_port_parameter_set(port, ¶m.hdr); } -MMAL_STATUS_T mmal_util_get_core_port_stats(MMAL_PORT_T *port, +MMAL_STATUS_T mmal_util_get_core_port_stats(MMAL_PORT_T *port, MMAL_CORE_STATS_DIR dir, MMAL_BOOL_T reset, MMAL_CORE_STATISTICS_T *stats) diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_api.c b/gfx/include/userland/interface/mmal/vc/mmal_vc_api.c index 87718d04b4..30c9f4b66f 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_api.c +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_api.c @@ -127,7 +127,6 @@ MMAL_STATUS_T mmal_vc_get_stats(MMAL_VC_STATS_T *stats, int reset) MMAL_WORKER_GET_STATS, &msg, &len, MMAL_FALSE); - if (status == MMAL_SUCCESS) { vcos_assert(len == sizeof(msg)); @@ -350,7 +349,6 @@ static MMAL_STATUS_T mmal_vc_port_flush_normal(MMAL_PORT_T *port) return status; } - /** Flush a port using PORT_FLUSH - generates a dummy bulk transfer to keep it in sync * with buffers being passed using bulk transfer */ static MMAL_STATUS_T mmal_vc_port_flush_sync(MMAL_PORT_T *port) @@ -373,7 +371,6 @@ static MMAL_STATUS_T mmal_vc_port_flush_sync(MMAL_PORT_T *port) msg->drvbuf.port_handle = module->port_handle; msg->drvbuf.magic = MMAL_MAGIC; - status = mmal_vc_sendwait_message(mmal_vc_get_client(), &msg->header, sizeof(*msg), MMAL_WORKER_PORT_FLUSH, &reply, &replylen, MMAL_TRUE); if (status == MMAL_SUCCESS) @@ -427,7 +424,6 @@ static MMAL_STATUS_T mmal_vc_port_flush(MMAL_PORT_T *port) return mmal_vc_port_flush_normal(port); } - /** Connect 2 ports together */ static MMAL_STATUS_T mmal_vc_port_connect(MMAL_PORT_T *port, MMAL_PORT_T *other_port) { @@ -910,7 +906,7 @@ MMAL_STATUS_T mmal_vc_get_core_stats(MMAL_CORE_STATISTICS_T *stats, req.type = type; req.reset = reset; req.dir = dir; - + status = mmal_vc_sendwait_message(mmal_vc_get_client(), &req.header, sizeof(req), MMAL_WORKER_GET_CORE_STATS_FOR_PORT, @@ -927,7 +923,6 @@ MMAL_STATUS_T mmal_vc_get_core_stats(MMAL_CORE_STATISTICS_T *stats, return status; } - /** Get port context data. */ static MMAL_STATUS_T mmal_vc_port_info_get(MMAL_PORT_T *port) { @@ -1189,7 +1184,7 @@ static MMAL_STATUS_T mmal_vc_port_parameter_get(MMAL_PORT_T *port, MMAL_PARAMETE status = reply.status; /* Reply must include the parameter header */ vcos_assert(replylen >= MMAL_OFFSET(mmal_worker_port_param_get_reply, space)); - + /* If the call fails with MMAL_ENOSPC then reply.param.size is set to the size required for * the call to succeed, and that may be bigger than the buffers, so only check these asserts * if the call succeeded. @@ -1209,7 +1204,7 @@ static MMAL_STATUS_T mmal_vc_port_parameter_get(MMAL_PORT_T *port, MMAL_PARAMETE param->id, param->size, mmal_status_to_string(status)); return status; } - + if (status == MMAL_ENOSPC) { /* Copy only as much as we have space for but report true size of parameter */ @@ -1502,4 +1497,3 @@ void mmal_register_component_videocore(void) mmal_vc_shm_init(); mmal_component_supplier_register(VIDEOCORE_PREFIX, mmal_vc_component_create); } - diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.c b/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.c index a926a86f64..27fde06f77 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.c +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.c @@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/mmal/core/mmal_buffer_private.h" #include "interface/vcos/vcos.h" - int mmal_vc_drm_get_time(unsigned int * time) { MMAL_STATUS_T status; @@ -57,7 +56,6 @@ int mmal_vc_drm_get_time(unsigned int * time) return status; } - int mmal_vc_drm_get_lhs32(unsigned char * into) { MMAL_STATUS_T status; diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.h index 04688b6f9d..86f6215957 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_api_drm.h @@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Public API for MMAL VC client. (Divx DRM part) */ - #ifdef __cplusplus extern "C" { #endif @@ -48,7 +47,6 @@ int mmal_vc_drm_get_time(unsigned int * time); // success = mmal_vc_divx_drm_get_lhs(buffer); int mmal_vc_drm_get_lhs32(unsigned char * into); - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_client.c b/gfx/include/userland/interface/mmal/vc/mmal_vc_client.c index db64dc6fff..4648d9ff6e 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_client.c +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_client.c @@ -25,7 +25,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include "mmal.h" #include "mmal_vc_msgs.h" #include "mmal_vc_api.h" @@ -64,7 +63,7 @@ typedef struct MMAL_WAITER_T * If there are none free, the calling thread will block until * one becomes available. */ -typedef struct +typedef struct { MMAL_WAITER_T waiters[MAX_WAITERS]; VCOS_SEMAPHORE_T sem; @@ -305,7 +304,6 @@ static MMAL_STATUS_T mmal_vc_release_internal(MMAL_CLIENT_T *client) return status; } - /** Callback invoked by VCHIQ */ static VCHIQ_STATUS_T mmal_vc_vchiq_callback(VCHIQ_REASON_T reason, @@ -772,7 +770,6 @@ MMAL_STATUS_T mmal_vc_init_fd(int dev_vchiq_fd) /* assume we're not using VC immediately. Do this outside the lock */ mmal_vc_release(); - return MMAL_SUCCESS; error: diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_client_priv.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_client_priv.h index 0fc3aaa918..edce15a220 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_client_priv.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_client_priv.h @@ -60,7 +60,6 @@ typedef struct MMAL_VC_CLIENT_BUFFER_CONTEXT_T struct mmal_worker_buffer_from_host msg; } MMAL_VC_CLIENT_BUFFER_CONTEXT_T; - MMAL_CLIENT_T *mmal_vc_get_client(void); MMAL_STATUS_T mmal_vc_sendwait_message(MMAL_CLIENT_T *client, @@ -77,4 +76,3 @@ MMAL_STATUS_T mmal_vc_send_message(MMAL_CLIENT_T *client, uint32_t msgid); #endif - diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_dbglog.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_dbglog.h index 0008bc4cdd..7da00046bb 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_dbglog.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_dbglog.h @@ -46,7 +46,6 @@ typedef enum { MMAL_DBG_BULK_RX, } MMAL_DBG_EVENT_TYPE_T; - /** Debug log data. */ typedef union { @@ -156,5 +155,4 @@ void mmal_vc_dbglog_deinit(void); mmal_log_unlock_event(); \ } - #endif diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_diag.c b/gfx/include/userland/interface/mmal/vc/mmal_vc_diag.c index e9712afb4a..1387f117f6 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_diag.c +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_diag.c @@ -450,7 +450,6 @@ static int do_components(int argc, const char **argv) MMAL_VC_STATS_T stats; int rc; - if (argc > 2 && (strcasecmp(argv[2], "update") == 0)) { MMAL_STATUS_T status; diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_msgs.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_msgs.h index 343922b556..e393c78332 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_msgs.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_msgs.h @@ -532,4 +532,3 @@ static inline void mmal_vc_msg_to_buffer_header(MMAL_BUFFER_HEADER_T *header, } #endif - diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.c b/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.c index b5b5ba92c2..1116450cce 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.c +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.c @@ -84,4 +84,3 @@ MMAL_STATUS_T mmal_vc_opaque_release(unsigned int handle) ret = msg.status; return ret; } - diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.h index 60a5e56d34..d390bd7092 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_opaque_alloc.h @@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef MMAL_VC_OPAQUE_ALLOC_H #define MMAL_VC_OPAQUE_ALLOC_H - #include #include "interface/mmal/mmal.h" @@ -63,11 +62,8 @@ MMAL_STATUS_T mmal_vc_opaque_release(MMAL_OPAQUE_IMAGE_HANDLE_T h); */ MMAL_STATUS_T mmal_vc_opaque_acquire(MMAL_OPAQUE_IMAGE_HANDLE_T h); - #ifdef __cplusplus } #endif - #endif - diff --git a/gfx/include/userland/interface/mmal/vc/mmal_vc_shm.h b/gfx/include/userland/interface/mmal/vc/mmal_vc_shm.h index 0aacb5b0b4..ffe455ba6d 100644 --- a/gfx/include/userland/interface/mmal/vc/mmal_vc_shm.h +++ b/gfx/include/userland/interface/mmal/vc/mmal_vc_shm.h @@ -54,7 +54,6 @@ uint8_t *mmal_vc_shm_lock(uint8_t *mem, uint32_t workaround); /** Unlock a shared memory buffer */ uint8_t *mmal_vc_shm_unlock(uint8_t *mem, uint32_t *length, uint32_t workaround); - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/interface/peer/vc_vchi_dispmanx_common.h b/gfx/include/userland/interface/peer/vc_vchi_dispmanx_common.h index 3ccea84f04..5b66ad20b1 100644 --- a/gfx/include/userland/interface/peer/vc_vchi_dispmanx_common.h +++ b/gfx/include/userland/interface/peer/vc_vchi_dispmanx_common.h @@ -31,21 +31,21 @@ typedef enum { // IMPORTANT - DO NOT ALTER THE ORDER OF COMMANDS IN THIS ENUMERATION // NEW FUNCTIONS SHOULD BE ADDED TO THE END, AND MUST ALSO BE ADDED TO // THE HOST SIDE FUNCTION TABLE IN display_server.c. - + // No function configured - do not use EDispmanNoFunction = 0, - + // Dispman pre-configure functions EDispmanGetDevices, EDispmanGetModes, - + // Dispman resource-related functions EDispmanResourceCreate, EDispmanResourceCreateFromImage, EDispmanResourceDelete, EDispmanResourceGetData, EDispmanResourceGetImage, - + // Dispman display-related functions EDispmanDisplayOpen, EDispmanDisplayOpenMode, @@ -55,12 +55,12 @@ typedef enum { EDispmanDisplaySetBackground, EDispmanDisplayGetInfo, EDispmanDisplayClose, - + // Dispman update-related functions EDispmanUpdateStart, EDispmanUpdateSubmit, EDispmanUpdateSubmitSync, - + // Dispman element-related functions EDispmanElementAdd, EDispmanElementModified, diff --git a/gfx/include/userland/interface/vchi/connections/connection.h b/gfx/include/userland/interface/vchi/connections/connection.h index 91bc91d343..14b1a656d5 100644 --- a/gfx/include/userland/interface/vchi/connections/connection.h +++ b/gfx/include/userland/interface/vchi/connections/connection.h @@ -50,7 +50,6 @@ typedef struct opaque_vchi_connection_info_t VCHI_CONNECTION_STATE_T; typedef struct vchi_connection_t VCHI_CONNECTION_T; - /****************************************************************************** API *****************************************************************************/ @@ -208,7 +207,6 @@ typedef void * (*VCHI_BUFFER_ALLOCATE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_ // free memory allocated by buffer_allocate typedef void (*VCHI_BUFFER_FREE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_handle, void * address); - /****************************************************************************** System driver struct *****************************************************************************/ @@ -318,7 +316,6 @@ struct vchi_connection_t { #endif }; - #endif /* CONNECTION_H_ */ /****************************** End of file **********************************/ diff --git a/gfx/include/userland/interface/vchi/message_drivers/message.h b/gfx/include/userland/interface/vchi/message_drivers/message.h index 4dc4e5819e..75684a168e 100644 --- a/gfx/include/userland/interface/vchi/message_drivers/message.h +++ b/gfx/include/userland/interface/vchi/message_drivers/message.h @@ -34,7 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/vcos/vcos.h" #include "interface/vchi/vchi_common.h" - typedef enum message_event_type { MESSAGE_EVENT_NONE, MESSAGE_EVENT_NOP, @@ -107,7 +106,6 @@ typedef struct rx_bulk_slotinfo_t { VCHI_FLAGS_T flags; } RX_BULK_SLOTINFO_T; - /* ---------------------------------------------------------------------- * each connection driver will have a pool of the following struct. * @@ -151,7 +149,6 @@ typedef struct { } MESSAGE_EVENT_T; - // callbacks typedef void VCHI_MESSAGE_DRIVER_EVENT_CALLBACK_T( void *state ); @@ -159,7 +156,6 @@ typedef struct { VCHI_MESSAGE_DRIVER_EVENT_CALLBACK_T *event_callback; } VCHI_MESSAGE_DRIVER_OPEN_T; - // handle to this instance of message driver (as returned by ->open) typedef struct opaque_mhandle_t *VCHI_MDRIVER_HANDLE_T; @@ -191,7 +187,6 @@ struct opaque_vchi_message_driver_t { void (*debug)( VCHI_MDRIVER_HANDLE_T *handle ); }; - #endif // _VCHI_MESSAGE_H_ /****************************** End of file ***********************************/ diff --git a/gfx/include/userland/interface/vchi/vchi.h b/gfx/include/userland/interface/vchi/vchi.h index 8775d07a07..f9c7c2e2d9 100644 --- a/gfx/include/userland/interface/vchi/vchi.h +++ b/gfx/include/userland/interface/vchi/vchi.h @@ -36,7 +36,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/vchi/connections/connection.h" #include "vchi_mh.h" - /****************************************************************************** Global defs *****************************************************************************/ @@ -53,7 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define VCHI_BULK_ALIGNED(x) (((unsigned long)(x) & (VCHI_BULK_ALIGN-1)) == 0) #endif -typedef struct +typedef struct { uint32_t version; uint32_t version_min; @@ -97,7 +96,6 @@ typedef struct vchi_msg_vector_ex { } u; } VCHI_MSG_VECTOR_EX_T; - // Construct an entry in a msg vector for a pointer (p) of length (l) #define VCHI_VEC_POINTER(p,l) VCHI_VEC_POINTER, { { (VCHI_MEM_HANDLE_T)(p), (l) } } @@ -108,7 +106,6 @@ typedef struct vchi_msg_vector_ex { #define MAKE_FOURCC(x) ((fourcc_t)( (x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3] )) #define FOURCC_TO_CHAR(x) (x >> 24) & 0xFF,(x >> 16) & 0xFF,(x >> 8) & 0xFF, x & 0xFF - // Opaque service information struct opaque_vchi_service_t; @@ -120,8 +117,6 @@ typedef struct void *message; } VCHI_HELD_MSG_T; - - // structure used to provide the information needed to open a server or a client typedef struct { VCHI_VERSION_T version; @@ -165,7 +160,6 @@ extern "C" { extern /*@observer@*/ VCHI_CONNECTION_T * vchi_create_connection( const VCHI_CONNECTION_API_T * function_table, const VCHI_MESSAGE_DRIVER_T * low_level); - // Routine used to initialise the vchi on both local + remote connections extern int32_t vchi_initialise( VCHI_INSTANCE_T *instance_handle ); @@ -186,7 +180,6 @@ extern void * vchi_allocate_buffer(VCHI_SERVICE_HANDLE_T handle, uint32_t *lengt extern void vchi_free_buffer(VCHI_SERVICE_HANDLE_T handle, void *address); extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle); - /****************************************************************************** Global service API *****************************************************************************/ @@ -317,7 +310,6 @@ extern int32_t vchi_msg_iter_hold_next( VCHI_MSG_ITER_T *iter, uint32_t *msg_size, // } VCHI_HELD_MSG_T *message ); - /****************************************************************************** Global bulk API *****************************************************************************/ @@ -329,7 +321,6 @@ extern int32_t vchi_bulk_queue_receive( VCHI_SERVICE_HANDLE_T handle, VCHI_FLAGS_T flags, void *transfer_handle ); - // Prepare interface for a transfer from the other side into relocatable memory. int32_t vchi_bulk_queue_receive_reloc( const VCHI_SERVICE_HANDLE_T handle, VCHI_MEM_HANDLE_T h_dst, @@ -354,7 +345,6 @@ extern int32_t vchi_bulk_queue_transmit( VCHI_SERVICE_HANDLE_T handle, VCHI_FLAGS_T flags, void *transfer_handle ); - /****************************************************************************** Configuration plumbing *****************************************************************************/ diff --git a/gfx/include/userland/interface/vchi/vchi_cfg.h b/gfx/include/userland/interface/vchi/vchi_cfg.h index d179f8a876..21328bff7a 100644 --- a/gfx/include/userland/interface/vchi/vchi_cfg.h +++ b/gfx/include/userland/interface/vchi/vchi_cfg.h @@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Contains the #defines for the number of servers / clients etc, these can be // over-ridden from the platform makefile if needed - #ifndef VCHI_CFG_H_ #define VCHI_CFG_H_ diff --git a/gfx/include/userland/interface/vchi/vchi_common.h b/gfx/include/userland/interface/vchi/vchi_common.h index 4942669803..fa62ae5b86 100644 --- a/gfx/include/userland/interface/vchi/vchi_common.h +++ b/gfx/include/userland/interface/vchi/vchi_common.h @@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef VCHI_COMMON_H_ #define VCHI_COMMON_H_ - //flags used when sending messages (must be bitmapped) typedef enum { @@ -122,8 +121,6 @@ typedef void (*VCHI_CALLBACK_T)( void *callback_param, //my service local param VCHI_CALLBACK_REASON_T reason, void *handle ); //for transmitting msg's only - - /* * Define vector struct for scatter-gather (vector) operations * Vectors can be nested - if a vector element has negative length, then @@ -152,7 +149,6 @@ typedef struct opaque_vchi_connection_api_t VCHI_CONNECTION_API_T; // Opaque type for a message driver typedef struct opaque_vchi_message_driver_t VCHI_MESSAGE_DRIVER_T; - // Iterator structure for reading ahead through received message queue. Allocated by client, // initialised by vchi_msg_look_ahead. Fields are for internal VCHI use only. // Iterates over messages in queue at the instant of the call to vchi_msg_lookahead - @@ -166,5 +162,4 @@ typedef struct { void *remove; } VCHI_MSG_ITER_T; - #endif // VCHI_COMMON_H_ diff --git a/gfx/include/userland/interface/vchiq_arm/vchiq.h b/gfx/include/userland/interface/vchiq_arm/vchiq.h index 5995e82c52..b9cda2d2f1 100644 --- a/gfx/include/userland/interface/vchiq_arm/vchiq.h +++ b/gfx/include/userland/interface/vchiq_arm/vchiq.h @@ -33,4 +33,3 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "interface/vcos/vcos.h" #endif - diff --git a/gfx/include/userland/interface/vchiq_arm/vchiq_if.h b/gfx/include/userland/interface/vchiq_arm/vchiq_if.h index 8b0630df98..c28bacea07 100644 --- a/gfx/include/userland/interface/vchiq_arm/vchiq_if.h +++ b/gfx/include/userland/interface/vchiq_arm/vchiq_if.h @@ -88,7 +88,7 @@ typedef struct vchiq_header_struct { int msgid; /* Size of message data. */ - unsigned int size; + unsigned int size; char data[0]; /* message */ } VCHIQ_HEADER_T; diff --git a/gfx/include/userland/interface/vchiq_arm/vchiq_lib.c b/gfx/include/userland/interface/vchiq_arm/vchiq_lib.c index 133d5ca653..95387677e6 100644 --- a/gfx/include/userland/interface/vchiq_arm/vchiq_lib.c +++ b/gfx/include/userland/interface/vchiq_arm/vchiq_lib.c @@ -1132,7 +1132,6 @@ vchi_connect( VCHI_CONNECTION_T **connections, return (status == VCHIQ_SUCCESS) ? 0 : -1; } - /*********************************************************** * Name: vchi_disconnect * @@ -1154,7 +1153,6 @@ vchi_disconnect( VCHI_INSTANCE_T instance_handle ) return (status == VCHIQ_SUCCESS) ? 0 : -1; } - /*********************************************************** * Name: vchi_service_open * Name: vchi_service_create @@ -1410,8 +1408,6 @@ VCHIQ_STATUS_T vchiq_dump_phys_mem( VCHIQ_SERVICE_HANDLE_T handle, return (ret >= 0) ? VCHIQ_SUCCESS : VCHIQ_ERROR; } - - /* * Support functions */ @@ -1739,7 +1735,6 @@ fill_peek_buf(VCHI_SERVICE_T *service, return ret; } - static void * alloc_msgbuf(void) { diff --git a/gfx/include/userland/interface/vchiq_arm/vchiq_test.c b/gfx/include/userland/interface/vchiq_arm/vchiq_test.c index 127c6831f1..812f1facfb 100644 --- a/gfx/include/userland/interface/vchiq_arm/vchiq_test.c +++ b/gfx/include/userland/interface/vchiq_arm/vchiq_test.c @@ -51,7 +51,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. (sp_)->version_min = ver_; \ } while (0) - static struct test_params g_params = { MSG_CONFIG, 64, 100, 1, 1, 1, 0, 0, 0, 0 }; static const char *g_servname = "echo"; @@ -165,7 +164,7 @@ static int vchiq_test(int argc, char **argv) int run_signal_test = 0; int verbose = 0; int argn; - + argn = 1; while ((argn < argc) && (argv[argn][0] == '-')) { @@ -316,7 +315,6 @@ static int vchiq_test(int argc, char **argv) vcos_event_create(&g_shutdown, "g_shutdown"); vcos_mutex_create(&g_mutex, "g_mutex"); - status = VCHIQ_ERROR; if (run_bulk_test) @@ -409,7 +407,7 @@ vchiq_bulk_test(void) element->data = &g_params; element->size = sizeof(g_params); element++; - + vchiq_queue_message(vchiq_service, elements, element - elements); vcos_event_wait(&g_server_reply); @@ -1308,7 +1306,6 @@ error_exit: return VCHIQ_ERROR; } - #ifdef VCHIQ_LOCAL static void *vchiq_test_server(void *param) @@ -1332,7 +1329,7 @@ clnt_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header, vcos_mutex_lock(&g_mutex); if (reason == VCHIQ_MESSAGE_AVAILABLE) { - /* + /* * Store the header size as it is going to be released * and the size may be overwritten by the release. */ @@ -1711,8 +1708,6 @@ static int setup_auto_kill(int timeout_ms) return 0; } - - #endif #ifdef VCOS_APPLICATION_INITIALIZE diff --git a/gfx/include/userland/interface/vchiq_arm/vchiq_util.h b/gfx/include/userland/interface/vchiq_arm/vchiq_util.h index 3628da7eef..711c7f4069 100644 --- a/gfx/include/userland/interface/vchiq_arm/vchiq_util.h +++ b/gfx/include/userland/interface/vchiq_arm/vchiq_util.h @@ -62,4 +62,3 @@ extern VCHIQ_HEADER_T *vchiu_queue_pop(VCHIU_QUEUE_T *queue); #endif #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_abort.c b/gfx/include/userland/interface/vcos/generic/vcos_abort.c index 7da16ac6e4..77373ef01e 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_abort.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_abort.c @@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include - int vcos_verify_bkpts = 0; #ifdef __VIDEOCORE__ VC_DEBUG_VAR(vcos_verify_bkpts); diff --git a/gfx/include/userland/interface/vcos/generic/vcos_cmd.c b/gfx/include/userland/interface/vcos/generic/vcos_cmd.c index 3dfbdb3468..fd1c3d6277 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_cmd.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_cmd.c @@ -25,11 +25,11 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/***************************************************************************** -* +/***************************************************************************** +* * This file provides a generic command line interface which allows * vcos internals to be manipulated and/or displayed. -* +* *****************************************************************************/ /* ---- Include Files ---------------------------------------------------- */ @@ -79,7 +79,7 @@ static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param ); /* ---- Functions ------------------------------------------------------- */ -/***************************************************************************** +/***************************************************************************** * * Walks through the commands looking for a particular command * @@ -101,9 +101,9 @@ static VCOS_CMD_T *find_cmd( VCOS_CMD_T *cmd_entry, const char *name ) return NULL; } -/***************************************************************************** +/***************************************************************************** * -* Saves away +* Saves away * each line individually. * *****************************************************************************/ @@ -113,7 +113,7 @@ void vcos_cmd_always_log_output( VCOS_LOG_CAT_T *log_category ) cmd_globals.log_category = log_category; } -/***************************************************************************** +/***************************************************************************** * * Walks through a buffer containing newline separated lines, and logs * each line individually. @@ -158,7 +158,7 @@ static void cmd_log_results( VCOS_CMD_PARAM_T *param ) param->result_buf[0] = '\0'; } -/***************************************************************************** +/***************************************************************************** * * Since we may have limited output space, we create a generic routine * which tries to use the result space, but will switch over to using @@ -181,7 +181,7 @@ void vcos_cmd_vprintf( VCOS_CMD_PARAM_T *param, const char *fmt, va_list args ) * doesn't end in a newline, then we'll wait for one first. */ - if ( (( bytes_written + 1 ) >= bytes_remaining ) + if ( (( bytes_written + 1 ) >= bytes_remaining ) || ( param->result_ptr[ bytes_written - 1 ] == '\n' )) { cmd_log_results( param ); @@ -209,7 +209,7 @@ void vcos_cmd_vprintf( VCOS_CMD_PARAM_T *param, const char *fmt, va_list args ) } } -/***************************************************************************** +/***************************************************************************** * * Prints the output. * @@ -224,7 +224,7 @@ void vcos_cmd_printf( VCOS_CMD_PARAM_T *param, const char *fmt, ... ) va_end( args ); } -/***************************************************************************** +/***************************************************************************** * * Prints the arguments which were on the command line prior to ours. * @@ -240,7 +240,7 @@ static void print_argument_prefix( VCOS_CMD_PARAM_T *param ) } } -/***************************************************************************** +/***************************************************************************** * * Prints an error message, prefixed by the command chain required to get * to where we're at. @@ -302,7 +302,7 @@ static void usage( VCOS_CMD_PARAM_T *param, VCOS_CMD_T *cmd_entry ) { scan_entry = &cmd_entry[cmd_idx]; - vcos_cmd_printf( param, " %-*s %-*s - %s\n", + vcos_cmd_printf( param, " %-*s %-*s - %s\n", nameWidth, scan_entry->name, argsWidth, scan_entry->args, scan_entry->descr ); @@ -338,12 +338,12 @@ void vcos_cmd_usage( VCOS_CMD_PARAM_T *param ) } } -/***************************************************************************** +/***************************************************************************** * * Command to print out the help -* +* * This help command is only called from the main menu. -* +* *****************************************************************************/ static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param ) @@ -377,7 +377,7 @@ static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param ) } /* For all other cases help requires an argument */ - + vcos_cmd_error( param, "%s requires an argument", param->argv[0] ); return VCOS_EINVAL; } @@ -403,7 +403,7 @@ static VCOS_STATUS_T help_cmd( VCOS_CMD_PARAM_T *param ) return VCOS_ENOENT; } -/***************************************************************************** +/***************************************************************************** * * Command to print out the version/build information. * @@ -439,7 +439,7 @@ static VCOS_CMD_T cmd_help = { "help", "[command]", help_cmd, NULL, "Pr static VCOS_CMD_T cmd_version = { "version", "", version_cmd, NULL, "Prints build/version information" }; #endif -/***************************************************************************** +/***************************************************************************** * * Walks the command table and executes the commands * @@ -505,7 +505,7 @@ static VCOS_STATUS_T execute_cmd( VCOS_CMD_PARAM_T *param, VCOS_CMD_T *cmd_entry return VCOS_ENOENT; } -/***************************************************************************** +/***************************************************************************** * * Initializes the command line parser. * @@ -524,7 +524,7 @@ static void vcos_cmd_init( void ) #endif } -/***************************************************************************** +/***************************************************************************** * * Shuts down the command line parser. * @@ -586,7 +586,7 @@ VCOS_STATUS_T vcos_cmd_execute( int argc, char **argv, size_t result_size, char return rc; } -/***************************************************************************** +/***************************************************************************** * * Registers a command entry with the command line processor * @@ -699,7 +699,7 @@ out: return rc; } -/***************************************************************************** +/***************************************************************************** * * Registers multiple commands. * @@ -719,4 +719,3 @@ VCOS_STATUS_T vcos_cmd_register_multiple( VCOS_CMD_T *cmd_entry ) } return VCOS_SUCCESS; } - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_common.h b/gfx/include/userland/interface/vcos/generic/vcos_common.h index 93949e0c7f..844c0a1b4c 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_common.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_common.h @@ -72,7 +72,7 @@ VideoCore OS Abstraction Layer - common postamble code #error Can stack addresses be set on this platform? Please set this macro to either 0 or 1. #endif -#if (_VCOS_AFFINITY_CPU0|_VCOS_AFFINITY_CPU1) & (~_VCOS_AFFINITY_MASK) +#if (_VCOS_AFFINITY_CPU0|_VCOS_AFFINITY_CPU1) & (~_VCOS_AFFINITY_MASK) #error _VCOS_AFFINITY_CPUxxx values are not consistent with _VCOS_AFFINITY_MASK #endif @@ -93,4 +93,3 @@ VideoCore OS Abstraction Layer - common postamble code #ifndef VCOS_HAVE_TIMER VCOSPRE_ void VCOSPOST_ vcos_timer_init(void); #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.c b/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.c index 5b228a80ea..6b8f4d89d8 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.c @@ -501,7 +501,6 @@ void *vcos_generic_blockpool_elem_from_handle( uint32_t index; void *ret = NULL; - ASSERT_POOL(pool); vcos_mutex_lock(&pool->mutex); subpool_id = VCOS_BLOCKPOOL_HANDLE_GET_SUBPOOL(handle); diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.h index 1301f9069b..3376284fc1 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_blockpool.h @@ -286,9 +286,7 @@ uint32_t vcos_blockpool_is_valid_elem(VCOS_BLOCKPOOL_T *pool, const void *block) } #endif /* VCOS_INLINE_BODIES */ - #ifdef __cplusplus } #endif #endif /* VCOS_GENERIC_BLOCKPOOL_H */ - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.c b/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.c index 9a7c1bbf07..676d65a210 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.c @@ -240,7 +240,6 @@ extern VCOS_STATUS_T vcos_generic_event_flags_get(VCOS_EVENT_FLAGS_T *flags, return rc; } - /** Called when a get call times out. Remove this thread's * entry from the waiting queue, then resume the thread. */ diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.h index a21abd49f0..a0c15f9dae 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_event_flags.h @@ -44,7 +44,7 @@ extern "C" { * This provides event flags (as per Nucleus Event Groups) based on a * mutex, a semaphore (per waiting thread) and a timer (per waiting * thread). - * + * * The data structure is a 32 bit unsigned int (the current set of * flags) and a linked list of clients waiting to be 'satisfied'. * @@ -124,4 +124,3 @@ VCOS_STATUS_T vcos_event_flags_get(VCOS_EVENT_FLAGS_T *flags, } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_named_sem.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_named_sem.h index 81a07165d6..20e523f514 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_named_sem.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_named_sem.h @@ -90,7 +90,6 @@ void vcos_named_semaphore_post(VCOS_NAMED_SEMAPHORE_T *sem) { vcos_semaphore_post(sem->sem); } - #endif #ifdef __cplusplus @@ -98,4 +97,3 @@ void vcos_named_semaphore_post(VCOS_NAMED_SEMAPHORE_T *sem) { #endif #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_quickslow_mutex.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_quickslow_mutex.h index ddc7b9731f..89c4a343e0 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_quickslow_mutex.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_quickslow_mutex.h @@ -86,10 +86,8 @@ void vcos_quickslow_mutex_unlock_quick(VCOS_QUICKSLOW_MUTEX_T *m) #endif - #ifdef __cplusplus } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.c b/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.c index 7258cbfe4c..cba51fdb8e 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.c @@ -69,8 +69,3 @@ void vcos_generic_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m) } } - - - - - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.h index 21ae1c96a4..724868b58e 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_reentrant_mtx.h @@ -92,4 +92,3 @@ void vcos_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m) { #endif #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_safe_string.c b/gfx/include/userland/interface/vcos/generic/vcos_generic_safe_string.c index 6b88694a2f..0501df8938 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_safe_string.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_safe_string.c @@ -57,7 +57,7 @@ size_t vcos_safe_sprintf(char *buf, size_t buflen, size_t offset, const char *fm { size_t space = (offset < buflen) ? (buflen - offset) : 0; va_list ap; - + va_start(ap, fmt); offset += vcos_vsnprintf(buf ? (buf + offset) : NULL, space, fmt, ap); diff --git a/gfx/include/userland/interface/vcos/generic/vcos_generic_tls.h b/gfx/include/userland/interface/vcos/generic/vcos_generic_tls.h index 6460ae7a6f..dad5e32e88 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_generic_tls.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_generic_tls.h @@ -62,7 +62,7 @@ extern "C" { */ #define VCOS_TLS_MAX_SLOTS 4 -/** TLS key. Allocating one of these reserves the client one of the +/** TLS key. Allocating one of these reserves the client one of the * available slots. */ typedef VCOS_UNSIGNED VCOS_TLS_KEY_T; @@ -77,7 +77,7 @@ typedef struct VCOS_TLS_THREAD_T } VCOS_TLS_THREAD_T; /* - * Internal APIs + * Internal APIs */ /** Register this thread's TLS storage area. */ @@ -161,4 +161,3 @@ void vcos_tls_delete(VCOS_TLS_KEY_T tls) { #endif - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_init.c b/gfx/include/userland/interface/vcos/generic/vcos_init.c index 6f4c1bbcf6..c084cc48c8 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_init.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_init.c @@ -30,7 +30,7 @@ The following header is included in order to provide one instance of the symbol Any other inclusions of this header (or "vcos_deprecated_code.inc" for assembly language) will cause the linker to warn about multiple definitions of vcos_deprecated_code. The idea is to include this header file for the source files which are deprecated. -Therefore the above warnning in a build indicates that the build is using deprecated code! +Therefore the above warnning in a build indicates that the build is using deprecated code! Contact the person named in the accompanying comment for advice - do not remove the inclusion. */ #include "vcos_deprecated.h" diff --git a/gfx/include/userland/interface/vcos/generic/vcos_joinable_thread_from_plain.h b/gfx/include/userland/interface/vcos/generic/vcos_joinable_thread_from_plain.h index 4471168d84..858e26f41a 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_joinable_thread_from_plain.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_joinable_thread_from_plain.h @@ -110,7 +110,6 @@ typedef const char * VCOS_LLTHREAD_T_NAME; * Simulated TLS support */ - /** Thread structure. * * \warning Do not access the members of this structure directly! diff --git a/gfx/include/userland/interface/vcos/generic/vcos_latch_from_sem.h b/gfx/include/userland/interface/vcos/generic/vcos_latch_from_sem.h index 94f4b13786..3a7d7607f5 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_latch_from_sem.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_latch_from_sem.h @@ -65,4 +65,3 @@ void vcos_mutex_unlock(VCOS_MUTEX_T *latch) { } #endif /* VCOS_INLINE_BODIES */ - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_logcat.c b/gfx/include/userland/interface/vcos/generic/vcos_logcat.c index effb82dd0f..3811ca3268 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_logcat.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_logcat.c @@ -46,12 +46,12 @@ static int inited; #if VCOS_HAVE_CMD /* - * For kernel or videocore purposes, we generally want the log command. For - * user-space apps, they might want to provide their own log command, so we - * don't include the built in on. - * - * So pthreads/vcos_platform.h defines VCOS_WANT_LOG_CMD to be 0. It is - * undefined elsewhere. + * For kernel or videocore purposes, we generally want the log command. For + * user-space apps, they might want to provide their own log command, so we + * don't include the built in on. + * + * So pthreads/vcos_platform.h defines VCOS_WANT_LOG_CMD to be 0. It is + * undefined elsewhere. */ # if !defined( VCOS_WANT_LOG_CMD ) @@ -574,4 +574,3 @@ void vcos_set_vlog_impl( VCOS_VLOG_IMPL_FUNC_T vlog_impl_func ) vcos_vlog_impl_func = vlog_impl_func; } } - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.c b/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.c index 02f9f28a44..f44f478c26 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.c +++ b/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.c @@ -44,7 +44,6 @@ typedef struct malloc_header_s { void *ptr; } MALLOC_HEADER_T; - #define MIN_ALIGN sizeof(MALLOC_HEADER_T) #define GUARDWORDHEAP 0xa55a5aa5 @@ -95,4 +94,3 @@ void vcos_generic_mem_free(void *ptr) vcos_assert(h->guardword == GUARDWORDHEAP); _vcos_platform_free(h->ptr); } - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.h b/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.h index e0bd99d440..3eca4fe2c3 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_mem_from_malloc.h @@ -77,4 +77,3 @@ unsigned long VCOS_DEPRECATED("returns invalid result") vcos_get_free_mem(void) #endif /* VCOS_INLINE_BODIES */ - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_mutexes_are_reentrant.h b/gfx/include/userland/interface/vcos/generic/vcos_mutexes_are_reentrant.h index 976b61a2f8..6d4d3c45a5 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_mutexes_are_reentrant.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_mutexes_are_reentrant.h @@ -84,5 +84,3 @@ int vcos_reentrant_mutex_is_locked(VCOS_REENTRANT_MUTEX_T *m) { #endif #endif - - diff --git a/gfx/include/userland/interface/vcos/generic/vcos_thread_reaper.h b/gfx/include/userland/interface/vcos/generic/vcos_thread_reaper.h index 4190dba58b..26c10b01c4 100644 --- a/gfx/include/userland/interface/vcos/generic/vcos_thread_reaper.h +++ b/gfx/include/userland/interface/vcos/generic/vcos_thread_reaper.h @@ -52,4 +52,3 @@ void vcos_thread_reap(VCOS_THREAD_T *thread, void (*on_terminated)(void*), void #endif - diff --git a/gfx/include/userland/interface/vcos/glibc/vcos_backtrace.c b/gfx/include/userland/interface/vcos/glibc/vcos_backtrace.c index 3bb8aa30c2..28c9172c85 100644 --- a/gfx/include/userland/interface/vcos/glibc/vcos_backtrace.c +++ b/gfx/include/userland/interface/vcos/glibc/vcos_backtrace.c @@ -53,4 +53,3 @@ void vcos_backtrace_self(void) } #endif } - diff --git a/gfx/include/userland/interface/vcos/pthreads/CMakeLists.txt b/gfx/include/userland/interface/vcos/pthreads/CMakeLists.txt index 1d81ca3c65..2d6625c4e6 100644 --- a/gfx/include/userland/interface/vcos/pthreads/CMakeLists.txt +++ b/gfx/include/userland/interface/vcos/pthreads/CMakeLists.txt @@ -41,6 +41,5 @@ else () target_link_libraries (vcos pthread rt) endif () - #install(FILES ${HEADERS} DESTINATION include) install(TARGETS vcos DESTINATION lib) diff --git a/gfx/include/userland/interface/vcos/pthreads/vcos_dlfcn.c b/gfx/include/userland/interface/vcos/pthreads/vcos_dlfcn.c index 85d18c635f..1582c3c4e5 100644 --- a/gfx/include/userland/interface/vcos/pthreads/vcos_dlfcn.c +++ b/gfx/include/userland/interface/vcos/pthreads/vcos_dlfcn.c @@ -66,6 +66,3 @@ int vcos_dlerror(int *err, char *buf, size_t buflen) return 0; } - - - diff --git a/gfx/include/userland/interface/vcos/pthreads/vcos_futex_mutex.h b/gfx/include/userland/interface/vcos/pthreads/vcos_futex_mutex.h index 3c4472088f..e348a471a1 100644 --- a/gfx/include/userland/interface/vcos/pthreads/vcos_futex_mutex.h +++ b/gfx/include/userland/interface/vcos/pthreads/vcos_futex_mutex.h @@ -99,4 +99,3 @@ VCOS_STATUS_T vcos_mutex_trylock(VCOS_MUTEX_T *m) { } #endif #endif /* VCOS_MUTEX_FROM_FUTEX_H */ - diff --git a/gfx/include/userland/interface/vcos/pthreads/vcos_platform.h b/gfx/include/userland/interface/vcos/pthreads/vcos_platform.h index ba64e16cd1..0cae014b0c 100644 --- a/gfx/include/userland/interface/vcos/pthreads/vcos_platform.h +++ b/gfx/include/userland/interface/vcos/pthreads/vcos_platform.h @@ -59,7 +59,6 @@ extern "C" { #include #include - #define VCOS_HAVE_RTOS 1 #define VCOS_HAVE_SEMAPHORE 1 #define VCOS_HAVE_EVENT 1 @@ -243,7 +242,6 @@ typedef struct { #undef VCOS_ASSERT_LOGGING_DISABLE #define VCOS_ASSERT_LOGGING_DISABLE 1 - /* * Counted Semaphores */ @@ -351,7 +349,6 @@ VCOS_STATUS_T vcos_semaphore_post(VCOS_SEMAPHORE_T *sem) { * ***********************************************************/ - extern VCOS_THREAD_T *vcos_dummy_thread_create(void); extern pthread_key_t _vcos_thread_current_key; extern uint64_t vcos_getmicrosecs64_internal(void); @@ -423,7 +420,6 @@ void vcos_thread_set_affinity(VCOS_THREAD_T *thread, VCOS_UNSIGNED affinity) { vcos_unused(affinity); } - VCOS_INLINE_IMPL void vcos_thread_attr_setaffinity(VCOS_THREAD_ATTR_T *attrs, VCOS_UNSIGNED affinity) { attrs->ta_affinity = affinity; @@ -481,7 +477,6 @@ void vcos_thread_resume(VCOS_THREAD_T *thread) { /* Nothing to do */ } - /* * Mutexes */ @@ -698,7 +693,6 @@ void vcos_pthreads_timer_delete(VCOS_TIMER_T *timer); * and VOID* are the same size. */ - VCOS_INLINE_IMPL VCOS_STATUS_T vcos_timer_create(VCOS_TIMER_T *timer, const char *name, @@ -825,4 +819,3 @@ typedef void (*VCOS_ISR_HANDLER_T)(VCOS_UNSIGNED vecnum); } #endif #endif /* VCOS_PLATFORM_H */ - diff --git a/gfx/include/userland/interface/vcos/pthreads/vcos_pthreads.c b/gfx/include/userland/interface/vcos/pthreads/vcos_pthreads.c index 77ce58c2c0..309041888a 100644 --- a/gfx/include/userland/interface/vcos/pthreads/vcos_pthreads.c +++ b/gfx/include/userland/interface/vcos/pthreads/vcos_pthreads.c @@ -115,7 +115,6 @@ static void current_thread_key_init(void) _vcos_thread_current_key_created = 1; } - /* A VCOS wrapper for the thread which called vcos_init. */ static VCOS_THREAD_T vcos_thread_main; @@ -451,7 +450,6 @@ void vcos_thread_exit(void *arg) pthread_exit(arg); } - void vcos_thread_attr_init(VCOS_THREAD_ATTR_T *attrs) { *attrs = default_attrs; @@ -627,7 +625,6 @@ VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control, } } - VCOS_THREAD_T *vcos_dummy_thread_create(void) { VCOS_STATUS_T st; @@ -658,7 +655,6 @@ VCOS_THREAD_T *vcos_dummy_thread_create(void) return( thread_hndl ); } - /*********************************************************** * * Timers @@ -894,4 +890,3 @@ void vcos_pthreads_timer_delete(VCOS_TIMER_T *timer) pthread_mutex_destroy(&timer->lock); pthread_cond_destroy(&timer->settings_changed); } - diff --git a/gfx/include/userland/interface/vcos/vcos.h b/gfx/include/userland/interface/vcos/vcos.h index 2b83226c1e..586525bef3 100644 --- a/gfx/include/userland/interface/vcos/vcos.h +++ b/gfx/include/userland/interface/vcos/vcos.h @@ -223,4 +223,3 @@ VideoCore OS Abstraction Layer - public header file #endif #endif /* VCOS_H */ - diff --git a/gfx/include/userland/interface/vcos/vcos_assert.h b/gfx/include/userland/interface/vcos/vcos_assert.h index 3645494a93..a60c6052c6 100644 --- a/gfx/include/userland/interface/vcos/vcos_assert.h +++ b/gfx/include/userland/interface/vcos/vcos_assert.h @@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VideoCore OS Abstraction Layer - Assertion and error-handling macros. =============================================================================*/ - #ifndef VCOS_ASSERT_H #define VCOS_ASSERT_H @@ -245,7 +244,6 @@ extern void logging_assert_dump(void); #endif /* VCOS_ASSERT_ENABLED */ - #if VCOS_DEMAND_ENABLED #ifndef vcos_demand @@ -272,7 +270,6 @@ extern void logging_assert_dump(void); #endif /* VCOS_DEMAND_ENABLED */ - #if VCOS_VERIFY_ENABLED #ifndef vcos_verify @@ -297,7 +294,6 @@ extern void logging_assert_dump(void); #endif /* VCOS_VERIFY_ENABLED */ - #ifndef vcos_static_assert #if defined(__GNUC__) #define vcos_static_assert(cond) __attribute__((unused)) extern int vcos_static_assert[(cond)?1:-1] diff --git a/gfx/include/userland/interface/vcos/vcos_build_info.h b/gfx/include/userland/interface/vcos/vcos_build_info.h index 710619e3d7..b84baad5f6 100644 --- a/gfx/include/userland/interface/vcos/vcos_build_info.h +++ b/gfx/include/userland/interface/vcos/vcos_build_info.h @@ -29,4 +29,3 @@ const char *vcos_get_build_hostname( void ); const char *vcos_get_build_version( void ); const char *vcos_get_build_time( void ); const char *vcos_get_build_date( void ); - diff --git a/gfx/include/userland/interface/vcos/vcos_cfg.h b/gfx/include/userland/interface/vcos/vcos_cfg.h index 132ed3eef3..93e8714f39 100644 --- a/gfx/include/userland/interface/vcos/vcos_cfg.h +++ b/gfx/include/userland/interface/vcos/vcos_cfg.h @@ -50,24 +50,24 @@ typedef void (*VCOS_CFG_PARSE_FPTR)( VCOS_CFG_BUF_T buf, void *data ); /** Create a configuration directory. * * @param entry Place to store the created config entry. - * @param parent Parent entry (for directory like config + * @param parent Parent entry (for directory like config * options). * @param entryName Name of the directory. */ VCOS_STATUS_T vcos_cfg_mkdir( VCOS_CFG_ENTRY_T *entry, VCOS_CFG_ENTRY_T *parent, - const char *dirName ); + const char *dirName ); /** Create a configuration entry. * * @param entry Place to store the created config entry. - * @param parent Parent entry (for directory like config + * @param parent Parent entry (for directory like config * options). * @param entryName Name of the configuration entry. - * @param showFunc Function pointer to show configuration + * @param showFunc Function pointer to show configuration * data. - * @param parseFunc Function pointer to parse new data. + * @param parseFunc Function pointer to parse new data. */ VCOS_STATUS_T vcos_cfg_create_entry( VCOS_CFG_ENTRY_T *entry, @@ -98,12 +98,11 @@ const char *vcos_cfg_get_entry_name( VCOS_CFG_ENTRY_T entry ); VCOS_STATUS_T vcos_cfg_remove_entry( VCOS_CFG_ENTRY_T *entry ); - /** Writes data into a configuration buffer. Only valid inside - * the show function. + * the show function. * * @param buf Buffer to write data into. - * @param fmt printf style format string. + * @param fmt printf style format string. */ void vcos_cfg_buf_printf( VCOS_CFG_BUF_T buf, const char *fmt, ... ); @@ -112,7 +111,7 @@ void vcos_cfg_buf_printf( VCOS_CFG_BUF_T buf, const char *fmt, ... ); * with the buffer. Only valid inside the parse function. * * @param buf Buffer to get data from. - * @param fmt printf style format string. + * @param fmt printf style format string. */ char *vcos_cfg_buf_get_str( VCOS_CFG_BUF_T buf ); @@ -123,4 +122,3 @@ void *vcos_cfg_get_proc_entry( VCOS_CFG_ENTRY_T entry ); } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_cmd.h b/gfx/include/userland/interface/vcos/vcos_cmd.h index 9d617fd939..01fa818cc6 100644 --- a/gfx/include/userland/interface/vcos/vcos_cmd.h +++ b/gfx/include/userland/interface/vcos/vcos_cmd.h @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include "interface/vcos/vcos_stdint.h" - /* ---- Constants and Types ---------------------------------------------- */ struct VCOS_CMD_S; @@ -117,4 +116,3 @@ VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_cmd_execute( int argc, char **argv, size_t VCOSPRE_ void VCOSPOST_ vcos_cmd_shutdown( void ); #endif /* VCOS_CMD_H */ - diff --git a/gfx/include/userland/interface/vcos/vcos_ctype.h b/gfx/include/userland/interface/vcos/vcos_ctype.h index 64bda969b2..8fd16fcc46 100644 --- a/gfx/include/userland/interface/vcos/vcos_ctype.h +++ b/gfx/include/userland/interface/vcos/vcos_ctype.h @@ -46,4 +46,3 @@ VideoCore OS Abstraction Layer - public header file #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_dlfcn.h b/gfx/include/userland/interface/vcos/vcos_dlfcn.h index 6971d74768..466cf51c5d 100644 --- a/gfx/include/userland/interface/vcos/vcos_dlfcn.h +++ b/gfx/include/userland/interface/vcos/vcos_dlfcn.h @@ -77,10 +77,8 @@ VCOSPRE_ int VCOSPOST_ vcos_dlclose (void *handle); */ VCOSPRE_ int VCOSPOST_ vcos_dlerror(int *err, char *buf, size_t buflen); - #ifdef __cplusplus } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_event.h b/gfx/include/userland/interface/vcos/vcos_event.h index f047ded9be..65bb1f6a96 100644 --- a/gfx/include/userland/interface/vcos/vcos_event.h +++ b/gfx/include/userland/interface/vcos/vcos_event.h @@ -39,7 +39,7 @@ extern "C" { #include "interface/vcos/vcos_types.h" #include "vcos.h" -/** +/** * \file * * An event is akin to the Win32 auto-reset event. @@ -48,7 +48,7 @@ extern "C" { * Signalling an event will wake up one waiting thread only. Once one * thread has been woken the event atomically returns to the unsignalled * state. - * + * * If no threads are waiting on the event when it is signalled it remains * signalled. * @@ -114,4 +114,3 @@ void vcos_event_delete(VCOS_EVENT_T *event); #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_event_flags.h b/gfx/include/userland/interface/vcos/vcos_event_flags.h index cd5fbb2fb5..9ecf5c907d 100644 --- a/gfx/include/userland/interface/vcos/vcos_event_flags.h +++ b/gfx/include/userland/interface/vcos/vcos_event_flags.h @@ -32,7 +32,6 @@ VideoCore OS Abstraction Layer - public header file #ifndef VCOS_EVENT_FLAGS_H #define VCOS_EVENT_FLAGS_H - #ifdef __cplusplus extern "C" { #endif @@ -103,7 +102,6 @@ VCOS_STATUS_T vcos_event_flags_get(VCOS_EVENT_FLAGS_T *flags, VCOS_UNSIGNED ms_suspend, VCOS_UNSIGNED *retrieved_events); - /** * Delete an event flags instance. */ @@ -115,4 +113,3 @@ void vcos_event_flags_delete(VCOS_EVENT_FLAGS_T *); #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_init.h b/gfx/include/userland/interface/vcos/vcos_init.h index 2d770a5a9f..955794b24c 100644 --- a/gfx/include/userland/interface/vcos/vcos_init.h +++ b/gfx/include/userland/interface/vcos/vcos_init.h @@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VideoCore OS Abstraction Layer - initialization routines =============================================================================*/ - #include "interface/vcos/vcos_types.h" #include "vcos.h" @@ -107,4 +106,3 @@ VCOSPRE_ void VCOSPOST_ vcos_platform_deinit(void); #ifdef __cplusplus } #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_isr.h b/gfx/include/userland/interface/vcos/vcos_isr.h index 79e371b22f..0023462206 100644 --- a/gfx/include/userland/interface/vcos/vcos_isr.h +++ b/gfx/include/userland/interface/vcos/vcos_isr.h @@ -87,4 +87,3 @@ void vcos_int_restore(VCOS_UNSIGNED previous); } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_legacy_isr.h b/gfx/include/userland/interface/vcos/vcos_legacy_isr.h index dd8c3bf096..49e92054b7 100644 --- a/gfx/include/userland/interface/vcos/vcos_legacy_isr.h +++ b/gfx/include/userland/interface/vcos/vcos_legacy_isr.h @@ -45,7 +45,7 @@ extern "C" { * New code should use the single-dispatch scheme - the LISR/HISR * distinction is not necessary. * - * Under ThreadX, a HISR is implemented as a high-priority thread which + * Under ThreadX, a HISR is implemented as a high-priority thread which * waits on a counting semaphore to call the HISR function. Although this * provides a good approximation to the Nucleus semantics, it is potentially * slow if all you are trying to do is to wake a thread from LISR context. @@ -73,7 +73,7 @@ VCOS_STATUS_T vcos_legacy_hisr_create(VCOS_HISR_T *hisr, const char *name, VCOS_INLINE_DECL void vcos_legacy_hisr_activate(VCOS_HISR_T *hisr); -/** Delete a HISR. +/** Delete a HISR. * * @param hisr HISR to delete. */ diff --git a/gfx/include/userland/interface/vcos/vcos_logging.h b/gfx/include/userland/interface/vcos/vcos_logging.h index a2f9fe08d5..08d537c969 100644 --- a/gfx/include/userland/interface/vcos/vcos_logging.h +++ b/gfx/include/userland/interface/vcos/vcos_logging.h @@ -87,7 +87,6 @@ typedef enum VCOS_LOG_LEVEL_T VCOS_LOG_TRACE, } VCOS_LOG_LEVEL_T; - /** Initialize a logging category without going through vcos_log_register(). * * This is useful for the case where there is no obvious point to do the @@ -182,10 +181,9 @@ VCOS_STATIC_INLINE void vcos_log_set_level(VCOS_LOG_CAT_T *category, VCOS_LOG_LE category->level = level; } - /** Set the logging levels for many categories at once. * - * Set lots of categorys from a string cat:lev,cat:lev This can + * Set lots of categorys from a string cat:lev,cat:lev This can * be used at startup time to set a bunch of category levels from * a single string. Used with C(vcos_logging_level) */ @@ -238,8 +236,6 @@ void vcos_log_dump_mem_impl( const VCOS_LOG_CAT_T *cat, # define _VCOS_VLOG_X(cat, _level, fmt, ap) (void)0 # endif - - # define vcos_log_error(...) _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_ERROR, __VA_ARGS__) # define vcos_log_warn(...) _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_WARN, __VA_ARGS__) # define vcos_log_info(...) _VCOS_LOG_X(VCOS_LOG_CATEGORY, VCOS_LOG_INFO, __VA_ARGS__) @@ -306,9 +302,9 @@ void vcos_log_dump_mem_impl( const VCOS_LOG_CAT_T *cat, #include "interface/vcos/vcos_cmd.h" /* - * These are the log sub-commands. They're exported here for user-mode apps which - * may want to call these, since the "log" command isn't registered for user-mode - * apps (vcdbg for example, has its own log command). + * These are the log sub-commands. They're exported here for user-mode apps which + * may want to call these, since the "log" command isn't registered for user-mode + * apps (vcdbg for example, has its own log command). */ VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_assert_cmd( VCOS_CMD_PARAM_T *param ); VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_set_cmd( VCOS_CMD_PARAM_T *param ); @@ -321,4 +317,3 @@ VCOSPRE_ VCOS_STATUS_T VCOSPOST_ vcos_log_test_cmd( VCOS_CMD_PARAM_T *param ); #endif #endif /* VCOS_LOGGING_H */ - diff --git a/gfx/include/userland/interface/vcos/vcos_logging_control.h b/gfx/include/userland/interface/vcos/vcos_logging_control.h index b180ad8642..4a46f1d394 100644 --- a/gfx/include/userland/interface/vcos/vcos_logging_control.h +++ b/gfx/include/userland/interface/vcos/vcos_logging_control.h @@ -25,4 +25,3 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - diff --git a/gfx/include/userland/interface/vcos/vcos_lowlevel_thread.h b/gfx/include/userland/interface/vcos/vcos_lowlevel_thread.h index c6e3ced920..c86cf0cf9e 100644 --- a/gfx/include/userland/interface/vcos/vcos_lowlevel_thread.h +++ b/gfx/include/userland/interface/vcos/vcos_lowlevel_thread.h @@ -126,4 +126,3 @@ extern VCOS_STATUS_T _vcos_llthread_create_attach(VCOS_LLTHREAD_T *thread); } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_mem.h b/gfx/include/userland/interface/vcos/vcos_mem.h index 03720dffce..e67e9d0c1a 100644 --- a/gfx/include/userland/interface/vcos/vcos_mem.h +++ b/gfx/include/userland/interface/vcos/vcos_mem.h @@ -46,7 +46,6 @@ extern "C" { * */ - /** Allocate memory * * @param size Size of memory to allocate @@ -98,4 +97,3 @@ unsigned long vcos_get_free_mem(void); #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_mempool.h b/gfx/include/userland/interface/vcos/vcos_mempool.h index 4fb9596054..12ba3dd4d1 100644 --- a/gfx/include/userland/interface/vcos/vcos_mempool.h +++ b/gfx/include/userland/interface/vcos/vcos_mempool.h @@ -53,7 +53,6 @@ extern "C" { * */ - /** Initialize a memory pool. The control data is taken from the memory * supplied itself. * @@ -105,5 +104,3 @@ void vcos_mempool_delete(VCOS_MEMPOOL_T *pool); #endif #endif - - diff --git a/gfx/include/userland/interface/vcos/vcos_msgqueue.h b/gfx/include/userland/interface/vcos/vcos_msgqueue.h index 99144d064d..ca38847d0b 100644 --- a/gfx/include/userland/interface/vcos/vcos_msgqueue.h +++ b/gfx/include/userland/interface/vcos/vcos_msgqueue.h @@ -277,4 +277,3 @@ VCOSPRE_ void VCOSPOST_ vcos_msgq_pool_free(VCOS_MSG_T *msg); #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_mutex.h b/gfx/include/userland/interface/vcos/vcos_mutex.h index 48250744a8..ca761b880c 100644 --- a/gfx/include/userland/interface/vcos/vcos_mutex.h +++ b/gfx/include/userland/interface/vcos/vcos_mutex.h @@ -105,7 +105,6 @@ VCOS_INLINE_DECL VCOS_STATUS_T vcos_mutex_trylock(VCOS_MUTEX_T *m); #endif - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/interface/vcos/vcos_named_semaphore.h b/gfx/include/userland/interface/vcos/vcos_named_semaphore.h index a477577af9..c55d12a7ba 100644 --- a/gfx/include/userland/interface/vcos/vcos_named_semaphore.h +++ b/gfx/include/userland/interface/vcos/vcos_named_semaphore.h @@ -46,7 +46,7 @@ extern "C" { * */ -/** +/** * \brief Create a named semaphore. * * Semaphores are not re-entrant. @@ -56,7 +56,7 @@ extern "C" { * @param count The initial count for the semaphore. * * @return VCOS_SUCCESS if the semaphore was created. - * + * */ VCOS_INLINE_DECL VCOS_STATUS_T vcos_named_semaphore_create(VCOS_NAMED_SEMAPHORE_T *sem, const char *name, VCOS_UNSIGNED count); @@ -105,9 +105,7 @@ void vcos_named_semaphore_post(VCOS_NAMED_SEMAPHORE_T *sem); */ void vcos_named_semaphore_delete(VCOS_NAMED_SEMAPHORE_T *sem); - #ifdef __cplusplus } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_once.h b/gfx/include/userland/interface/vcos/vcos_once.h index f5d82c1086..1ecffdeed5 100644 --- a/gfx/include/userland/interface/vcos/vcos_once.h +++ b/gfx/include/userland/interface/vcos/vcos_once.h @@ -59,4 +59,3 @@ VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control, } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_queue.h b/gfx/include/userland/interface/vcos/vcos_queue.h index 751586080e..bb9aeecf53 100644 --- a/gfx/include/userland/interface/vcos/vcos_queue.h +++ b/gfx/include/userland/interface/vcos/vcos_queue.h @@ -102,4 +102,3 @@ VCOS_STATUS_T vcos_queue_receive(VCOS_QUEUE_T *queue, void *dst, VCOS_UNSIGNED w } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_quickslow_mutex.h b/gfx/include/userland/interface/vcos/vcos_quickslow_mutex.h index 2a4465d3b7..eb811d45e6 100644 --- a/gfx/include/userland/interface/vcos/vcos_quickslow_mutex.h +++ b/gfx/include/userland/interface/vcos/vcos_quickslow_mutex.h @@ -94,7 +94,6 @@ void vcos_quickslow_mutex_lock_quick(VCOS_QUICKSLOW_MUTEX_T *m); VCOS_INLINE_DECL void vcos_quickslow_mutex_unlock_quick(VCOS_QUICKSLOW_MUTEX_T *m); - #ifdef __cplusplus } #endif diff --git a/gfx/include/userland/interface/vcos/vcos_reentrant_mutex.h b/gfx/include/userland/interface/vcos/vcos_reentrant_mutex.h index 69777d87fb..0366174a86 100644 --- a/gfx/include/userland/interface/vcos/vcos_reentrant_mutex.h +++ b/gfx/include/userland/interface/vcos/vcos_reentrant_mutex.h @@ -78,9 +78,7 @@ VCOS_INLINE_DECL void vcos_reentrant_mutex_unlock(VCOS_REENTRANT_MUTEX_T *m); #endif - #ifdef __cplusplus } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_semaphore.h b/gfx/include/userland/interface/vcos/vcos_semaphore.h index 839faacead..fcadb4a59d 100644 --- a/gfx/include/userland/interface/vcos/vcos_semaphore.h +++ b/gfx/include/userland/interface/vcos/vcos_semaphore.h @@ -47,7 +47,7 @@ extern "C" { * \section sem Semaphores * * This provides counting semaphores. Semaphores are not re-entrant. On sensible - * operating systems a semaphore can always be posted but can only be taken in + * operating systems a semaphore can always be posted but can only be taken in * thread (not interrupt) context. Under Nucleus, a LISR cannot post a semaphore, * although it would not be hard to lift this restriction. * @@ -66,10 +66,10 @@ extern "C" { * \arg there's no support for NU_PRIORITY in threadx (though it can be emulated, slowly) * \arg we don't appear to actually consciously use it - for example, Dispmanx uses * it, but all threads waiting are the same priority. - * + * */ -/** +/** * \brief Create a semaphore. * * Create a semaphore. @@ -79,7 +79,7 @@ extern "C" { * @param count The initial count for the semaphore. * * @return VCOS_SUCCESS if the semaphore was created. - * + * */ VCOS_INLINE_DECL VCOS_STATUS_T vcos_semaphore_create(VCOS_SEMAPHORE_T *sem, const char *name, VCOS_UNSIGNED count); @@ -155,4 +155,3 @@ void vcos_semaphore_delete(VCOS_SEMAPHORE_T *sem); } #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_thread.h b/gfx/include/userland/interface/vcos/vcos_thread.h index e43d5917f2..26dd78869d 100644 --- a/gfx/include/userland/interface/vcos/vcos_thread.h +++ b/gfx/include/userland/interface/vcos/vcos_thread.h @@ -123,7 +123,6 @@ VCOSPRE_ void VCOSPOST_ vcos_thread_exit(void *data); VCOSPRE_ void VCOSPOST_ vcos_thread_join(VCOS_THREAD_T *thread, void **pData); - /** * \brief Create a thread using an API similar to the one "traditionally" * used under Nucleus. diff --git a/gfx/include/userland/interface/vcos/vcos_timer.h b/gfx/include/userland/interface/vcos/vcos_timer.h index d61391c5e3..920c1cb06a 100644 --- a/gfx/include/userland/interface/vcos/vcos_timer.h +++ b/gfx/include/userland/interface/vcos/vcos_timer.h @@ -82,8 +82,6 @@ VCOS_STATUS_T vcos_timer_create(VCOS_TIMER_T *timer, void (*expiration_routine)(void *context), void *context); - - /** Start a timer running. * * Timer must be stopped. diff --git a/gfx/include/userland/interface/vcos/vcos_tls.h b/gfx/include/userland/interface/vcos/vcos_tls.h index a0df40c43d..d12218c156 100644 --- a/gfx/include/userland/interface/vcos/vcos_tls.h +++ b/gfx/include/userland/interface/vcos/vcos_tls.h @@ -39,7 +39,6 @@ extern "C" { #include "interface/vcos/vcos_types.h" #include "vcos.h" - /** Create a new thread local storage data key visible to all threads in * the current process. * @@ -81,4 +80,3 @@ void *vcos_tls_get(VCOS_TLS_KEY_T tls); #endif #endif - diff --git a/gfx/include/userland/interface/vcos/vcos_types.h b/gfx/include/userland/interface/vcos/vcos_types.h index e2945c4f65..fd4b4db709 100644 --- a/gfx/include/userland/interface/vcos/vcos_types.h +++ b/gfx/include/userland/interface/vcos/vcos_types.h @@ -68,7 +68,6 @@ typedef void (*VCOS_LLTHREAD_ENTRY_FN_T)(void *); */ typedef void *(*VCOS_THREAD_ENTRY_FN_T)(void*); - /* Error return codes - chosen to be similar to errno values */ typedef enum { diff --git a/gfx/include/userland/interface/vctypes/vc_display_types.h b/gfx/include/userland/interface/vctypes/vc_display_types.h index 298a6c5698..2305af3ba0 100644 --- a/gfx/include/userland/interface/vctypes/vc_display_types.h +++ b/gfx/include/userland/interface/vctypes/vc_display_types.h @@ -113,4 +113,3 @@ typedef struct #endif /* __VC_INCLUDE_IMAGE_TYPES_H__ */ - diff --git a/gfx/include/userland/interface/vctypes/vc_image_structs.h b/gfx/include/userland/interface/vctypes/vc_image_structs.h index 53eac2643a..6c84f0cfba 100644 --- a/gfx/include/userland/interface/vctypes/vc_image_structs.h +++ b/gfx/include/userland/interface/vctypes/vc_image_structs.h @@ -179,7 +179,6 @@ unsigned int cube_map : 1; unsigned short info; /* dummy, force size to min 16 bits */ } VC_IMAGE_INFO_T; - /** * Image handle object, which must be locked before image data becomes * accessible. @@ -217,12 +216,11 @@ unsigned int cube_map : 1; uint8_t linked_multichann_flag;/* Indicate the header has the linked-multichannel structure*/ uint8_t is_channel_linked; /* Track if the above structure is been used to link the header into a linked-mulitchannel image */ - uint8_t channel_index; /* index of the channel this header represents while + uint8_t channel_index; /* index of the channel this header represents while it is being linked. */ uint8_t _dummy[3]; /* pad struct to 64 bytes */ }; - # ifdef __COVERITY__ /* Currently battling with the size of enums when running through static analysis stage */ typedef int vc_image_t_size_check[(sizeof(VC_IMAGE_T) == 68) * 2 - 1]; @@ -243,4 +241,3 @@ extern DEBUG_WRITE_RULE_T vc_image_info_rule[]; extern DEBUG_WRITE_RULE_T vc_image_rule[]; #endif /* __VC_INCLUDE_IMAGE_TYPES_H__ */ - diff --git a/gfx/include/userland/interface/vctypes/vc_image_types.h b/gfx/include/userland/interface/vctypes/vc_image_types.h index c9248e9c6b..f82e82861e 100644 --- a/gfx/include/userland/interface/vctypes/vc_image_types.h +++ b/gfx/include/userland/interface/vctypes/vc_image_types.h @@ -110,12 +110,12 @@ typedef enum VC_IMAGE_BGRX8888, /* 32bpp, corresponding to BGRA with unused alpha */ VC_IMAGE_YUV420SP, /* Y as a plane, then UV byte interleaved in plane with with same pitch, half height */ - + VC_IMAGE_YUV444PLANAR, /* Y, U, & V planes separately 4:4:4 */ VC_IMAGE_TF_U8, /* T-format 8-bit U - same as TF_Y8 buf from U plane */ VC_IMAGE_TF_V8, /* T-format 8-bit U - same as TF_Y8 buf from V plane */ - + VC_IMAGE_YUV420_16, /* YUV4:2:0 planar, 16bit values */ VC_IMAGE_YUV_UV_16, /* YUV4:2:0 codec format, 16bit values */ VC_IMAGE_YUV420_S, /* YUV4:2:0 with U,V in side-by-side format */ @@ -166,9 +166,8 @@ typedef enum VC_IMAGE_BAYER_RAW10L = 11, VC_IMAGE_BAYER_RAW12L = 12, VC_IMAGE_BAYER_RAW14L = 13, - VC_IMAGE_BAYER_RAW16_BIG_ENDIAN = 14, + VC_IMAGE_BAYER_RAW16_BIG_ENDIAN = 14, VC_IMAGE_BAYER_RAW4 = 15, } VC_IMAGE_BAYER_FORMAT_T; #endif /* __VC_INCLUDE_IMAGE_TYPES_H__ */ - diff --git a/gfx/include/userland/interface/vmcs_host/CMakeLists.txt b/gfx/include/userland/interface/vmcs_host/CMakeLists.txt index fde18dafc3..dc07b261b3 100644 --- a/gfx/include/userland/interface/vmcs_host/CMakeLists.txt +++ b/gfx/include/userland/interface/vmcs_host/CMakeLists.txt @@ -32,4 +32,3 @@ target_link_libraries(vchostif vchiq_arm vcos vcfiled_check) add_subdirectory(linux/vcfiled) install(TARGETS vchostif vcilcs DESTINATION lib) - diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Audio.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Audio.h index 75d83c8774..e44cabe55c 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Audio.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Audio.h @@ -1,23 +1,23 @@ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -33,10 +33,9 @@ extern "C" { #endif /* __cplusplus */ - /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include "OMX_Core.h" @@ -44,7 +43,7 @@ extern "C" { /** @defgroup midi MIDI * @ingroup audio */ - + /** @defgroup effects Audio effects * @ingroup audio */ @@ -54,10 +53,10 @@ extern "C" { * @{ */ -/** Enumeration used to define the possible audio codings. - * If "OMX_AUDIO_CodingUnused" is selected, the coding selection must - * be done in a vendor specific way. Since this is for an audio - * processing element this enum is relevant. However, for another +/** Enumeration used to define the possible audio codings. + * If "OMX_AUDIO_CodingUnused" is selected, the coding selection must + * be done in a vendor specific way. Since this is for an audio + * processing element this enum is relevant. However, for another * type of component other enums would be in this area. */ typedef enum OMX_AUDIO_CODINGTYPE { @@ -89,7 +88,7 @@ typedef enum OMX_AUDIO_CODINGTYPE { OMX_AUDIO_CodingWMA, /**< Any variant of WMA encoded data */ OMX_AUDIO_CodingRA, /**< Any variant of RA encoded data */ OMX_AUDIO_CodingMIDI, /**< Any variant of MIDI encoded data */ - OMX_AUDIO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ #define OMX_AUDIO_CodingFLAC_Supported 1 @@ -110,9 +109,8 @@ typedef enum OMX_AUDIO_CODINGTYPE { OMX_AUDIO_CodingMax = 0x7FFFFFFF } OMX_AUDIO_CODINGTYPE; - -/** The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output audio +/** The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output audio * path. If additional information is needed to define the parameters of the * port (such as frequency), additional structures must be sent such as the * OMX_AUDIO_PARAM_PCMMODETYPE structure to supply the extra parameters for the port. @@ -120,15 +118,14 @@ typedef enum OMX_AUDIO_CODINGTYPE { typedef struct OMX_AUDIO_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; /**< MIME type of data for the port */ OMX_NATIVE_DEVICETYPE pNativeRender; /** < platform specific reference - for an output device, + for an output device, otherwise this field is 0 */ - OMX_BOOL bFlagErrorConcealment; /**< Turns on error concealment if it is + OMX_BOOL bFlagErrorConcealment; /**< Turns on error concealment if it is supported by the OMX component */ - OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this + OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this port (e.g. PCM, AMR, MP3, etc) */ } OMX_AUDIO_PORTDEFINITIONTYPE; - /** Port format parameter. This structure is used to enumerate * the various data input/output format supported by the port. */ @@ -140,17 +137,15 @@ typedef struct OMX_AUDIO_PARAM_PORTFORMATTYPE { OMX_AUDIO_CODINGTYPE eEncoding; /**< Type of data expected for this port (e.g. PCM, AMR, MP3, etc) */ } OMX_AUDIO_PARAM_PORTFORMATTYPE; - -/** PCM mode type */ -typedef enum OMX_AUDIO_PCMMODETYPE { - OMX_AUDIO_PCMModeLinear = 0, /**< Linear PCM encoded data */ - OMX_AUDIO_PCMModeALaw, /**< A law PCM encoded data (G.711) */ - OMX_AUDIO_PCMModeMULaw, /**< Mu law PCM encoded data (G.711) */ - OMX_AUDIO_PCMModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ +/** PCM mode type */ +typedef enum OMX_AUDIO_PCMMODETYPE { + OMX_AUDIO_PCMModeLinear = 0, /**< Linear PCM encoded data */ + OMX_AUDIO_PCMModeALaw, /**< A law PCM encoded data (G.711) */ + OMX_AUDIO_PCMModeMULaw, /**< Mu law PCM encoded data (G.711) */ + OMX_AUDIO_PCMModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_PCMModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_PCMModeMax = 0x7FFFFFFF -} OMX_AUDIO_PCMMODETYPE; - + OMX_AUDIO_PCMModeMax = 0x7FFFFFFF +} OMX_AUDIO_PCMMODETYPE; typedef enum OMX_AUDIO_CHANNELTYPE { OMX_AUDIO_ChannelNone = 0x0, /**< Unused or empty */ @@ -163,55 +158,53 @@ typedef enum OMX_AUDIO_CHANNELTYPE { OMX_AUDIO_ChannelCS = 0x7, /**< Back surround */ OMX_AUDIO_ChannelLR = 0x8, /**< Left rear. */ OMX_AUDIO_ChannelRR = 0x9, /**< Right rear. */ - OMX_AUDIO_ChannelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_ChannelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_ChannelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_ChannelMax = 0x7FFFFFFF + OMX_AUDIO_ChannelMax = 0x7FFFFFFF } OMX_AUDIO_CHANNELTYPE; #define OMX_AUDIO_MAXCHANNELS 16 /**< maximum number distinct audio channels that a buffer may contain */ #define OMX_MIN_PCMPAYLOAD_MSEC 5 /**< Minimum audio buffer payload size for uncompressed (PCM) audio */ -/** PCM format description */ -typedef struct OMX_AUDIO_PARAM_PCMMODETYPE { - OMX_U32 nSize; /**< Size of this structure, in Bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nChannels; /**< Number of channels (e.g. 2 for stereo) */ - OMX_NUMERICALDATATYPE eNumData; /**< indicates PCM data as signed or unsigned */ - OMX_ENDIANTYPE eEndian; /**< indicates PCM data as little or big endian */ - OMX_BOOL bInterleaved; /**< True for normal interleaved data; false for - non-interleaved data (e.g. block data) */ - OMX_U32 nBitPerSample; /**< Bit per sample */ - OMX_U32 nSamplingRate; /**< Sampling rate of the source data. Use 0 for - variable or unknown sampling rate. */ - OMX_AUDIO_PCMMODETYPE ePCMMode; /**< PCM mode enumeration */ +/** PCM format description */ +typedef struct OMX_AUDIO_PARAM_PCMMODETYPE { + OMX_U32 nSize; /**< Size of this structure, in Bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nChannels; /**< Number of channels (e.g. 2 for stereo) */ + OMX_NUMERICALDATATYPE eNumData; /**< indicates PCM data as signed or unsigned */ + OMX_ENDIANTYPE eEndian; /**< indicates PCM data as little or big endian */ + OMX_BOOL bInterleaved; /**< True for normal interleaved data; false for + non-interleaved data (e.g. block data) */ + OMX_U32 nBitPerSample; /**< Bit per sample */ + OMX_U32 nSamplingRate; /**< Sampling rate of the source data. Use 0 for + variable or unknown sampling rate. */ + OMX_AUDIO_PCMMODETYPE ePCMMode; /**< PCM mode enumeration */ OMX_AUDIO_CHANNELTYPE eChannelMapping[OMX_AUDIO_MAXCHANNELS]; /**< Slot i contains channel defined by eChannelMap[i] */ -} OMX_AUDIO_PARAM_PCMMODETYPE; - +} OMX_AUDIO_PARAM_PCMMODETYPE; /** Audio channel mode. This is used by both AAC and MP3, although the names are more appropriate - * for the MP3. For example, JointStereo for MP3 is CouplingChannels for AAC. + * for the MP3. For example, JointStereo for MP3 is CouplingChannels for AAC. */ typedef enum OMX_AUDIO_CHANNELMODETYPE { - OMX_AUDIO_ChannelModeStereo = 0, /**< 2 channels, the bitrate allocation between those + OMX_AUDIO_ChannelModeStereo = 0, /**< 2 channels, the bitrate allocation between those two channels changes accordingly to each channel information */ - OMX_AUDIO_ChannelModeJointStereo, /**< mode that takes advantage of what is common between + OMX_AUDIO_ChannelModeJointStereo, /**< mode that takes advantage of what is common between 2 channels for higher compression gain */ - OMX_AUDIO_ChannelModeDual, /**< 2 mono-channels, each channel is encoded with half + OMX_AUDIO_ChannelModeDual, /**< 2 mono-channels, each channel is encoded with half the bitrate of the overall bitrate */ OMX_AUDIO_ChannelModeMono, /**< Mono channel mode */ - OMX_AUDIO_ChannelModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_ChannelModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_ChannelModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_ChannelModeMax = 0x7FFFFFFF } OMX_AUDIO_CHANNELMODETYPE; - typedef enum OMX_AUDIO_MP3STREAMFORMATTYPE { OMX_AUDIO_MP3StreamFormatMP1Layer3 = 0, /**< MP3 Audio MPEG 1 Layer 3 Stream format */ OMX_AUDIO_MP3StreamFormatMP2Layer3, /**< MP3 Audio MPEG 2 Layer 3 Stream format */ OMX_AUDIO_MP3StreamFormatMP2_5Layer3, /**< MP3 Audio MPEG2.5 Layer 3 Stream format */ - OMX_AUDIO_MP3StreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MP3StreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MP3StreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MP3StreamFormatMax = 0x7FFFFFFF } OMX_AUDIO_MP3STREAMFORMATTYPE; @@ -235,7 +228,7 @@ typedef struct OMX_AUDIO_PARAM_MP3TYPE { typedef enum OMX_AUDIO_DDPBITSTREAMID { OMX_AUDIO_DDPBitStreamIdAC3 = 8, OMX_AUDIO_DDPBitStreamIdEAC3 = 16, - OMX_AUDIO_DDPBitStreamIdKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_DDPBitStreamIdKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_DDPBitStreamIdVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_DDPBitStreamIdMax = 0x7FFFFFFF } OMX_AUDIO_DDPBITSTREAMID; @@ -250,7 +243,7 @@ typedef enum OMX_AUDIO_DDPBITSTREAMMODE { OMX_AUDIO_DDPBitStreamModeE, /**< DDP any associated service: emergency (E) */ OMX_AUDIO_DDPBitStreamModeVO, /**< DDP associated service: voice over (VO) */ OMX_AUDIO_DDPBitStreamModeK, /**< DDP main audio service: karaoke */ - OMX_AUDIO_DDPBitStreamModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_DDPBitStreamModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_DDPBitStreamModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_DDPBitStreamModeMax = 0x7FFFFFFF } OMX_AUDIO_DDPBITSTREAMMODE; @@ -260,7 +253,7 @@ typedef enum OMX_AUDIO_DDPDOLBYSURROUNDMODE { OMX_AUDIO_DDPDolbySurroundModeNotDolbySurround, /**< Not Dolby Surround */ OMX_AUDIO_DDPDolbySurroundModeDolbySurroundEncoded, /**< Dolby Surround encoded */ OMX_AUDIO_DDPDolbySurroundModeReserverd, /**< Reserved */ - OMX_AUDIO_DDPDolbySurroundModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_DDPDolbySurroundModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_DDPDolbySurroundModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_DDPDolbySurroundModeMax = 0x7FFFFFFF } OMX_AUDIO_DDPDOLBYSURROUNDMODE; @@ -278,7 +271,7 @@ typedef struct OMX_AUDIO_PARAM_DDPTYPE { OMX_AUDIO_DDPBITSTREAMID eBitStreamId; OMX_AUDIO_DDPBITSTREAMMODE eBitStreamMode; OMX_AUDIO_DDPDOLBYSURROUNDMODE eDolbySurroundMode; - OMX_AUDIO_CHANNELTYPE eChannelMapping[OMX_AUDIO_MAXCHANNELS]; /**< Slot i contains channel defined by eChannelMapping[i] */ + OMX_AUDIO_CHANNELTYPE eChannelMapping[OMX_AUDIO_MAXCHANNELS]; /**< Slot i contains channel defined by eChannelMapping[i] */ } OMX_AUDIO_PARAM_DDPTYPE; /** DTS params */ @@ -305,12 +298,11 @@ typedef enum OMX_AUDIO_AACSTREAMFORMATTYPE { OMX_AUDIO_AACStreamFormatADIF, /**< AAC Audio Data Interchange Format */ OMX_AUDIO_AACStreamFormatMP4FF, /**< AAC inside MPEG-4/ISO File Format */ OMX_AUDIO_AACStreamFormatRAW, /**< AAC Raw Format */ - OMX_AUDIO_AACStreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AACStreamFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AACStreamFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AACStreamFormatMax = 0x7FFFFFFF } OMX_AUDIO_AACSTREAMFORMATTYPE; - /** AAC mode type. Note that the term profile is used with the MPEG-2 * standard and the term object type and profile is used with MPEG-4 */ typedef enum OMX_AUDIO_AACPROFILETYPE{ @@ -324,12 +316,11 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ OMX_AUDIO_AACObjectERLC = 17, /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */ OMX_AUDIO_AACObjectLD = 23, /**< AAC Low Delay object (Error Resilient) */ OMX_AUDIO_AACObjectHE_PS = 29, /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */ - OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AACObjectMax = 0x7FFFFFFF } OMX_AUDIO_AACPROFILETYPE; - /** AAC tool usage (for nAACtools in OMX_AUDIO_PARAM_AACPROFILETYPE). * Required for encoder configuration and optional as decoder info output. * For MP3, OMX_AUDIO_CHANNELMODETYPE is sufficient. */ @@ -349,7 +340,6 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ #define OMX_AUDIO_AACERHCR 0x00000004 /**< HCR: Huffman Codeword Reordering */ #define OMX_AUDIO_AACERAll 0x7FFFFFFF /**< all AAC ER tools allowed/used */ - /** AAC params */ typedef struct OMX_AUDIO_PARAM_AACPROFILETYPE { OMX_U32 nSize; /**< Size of this structure, in Bytes */ @@ -372,7 +362,6 @@ typedef struct OMX_AUDIO_PARAM_AACPROFILETYPE { OMX_AUDIO_CHANNELMODETYPE eChannelMode; /**< Channel mode enumeration */ } OMX_AUDIO_PARAM_AACPROFILETYPE; - /** VORBIS params */ typedef struct OMX_AUDIO_PARAM_VORBISTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -397,35 +386,32 @@ typedef struct OMX_AUDIO_PARAM_VORBISTYPE { constraints to be enforced by the encoder. This mode can be slower, and may also be lower quality. It is primarily useful for streaming. */ - OMX_BOOL bDownmix; /**< Downmix input from stereo to mono (has no effect on - non-stereo streams). Useful for lower-bitrate encoding. */ + OMX_BOOL bDownmix; /**< Downmix input from stereo to mono (has no effect on + non-stereo streams). Useful for lower-bitrate encoding. */ } OMX_AUDIO_PARAM_VORBISTYPE; - /** WMA Version */ typedef enum OMX_AUDIO_WMAFORMATTYPE { OMX_AUDIO_WMAFormatUnused = 0, /**< format unused or unknown */ OMX_AUDIO_WMAFormat7, /**< Windows Media Audio format 7 */ OMX_AUDIO_WMAFormat8, /**< Windows Media Audio format 8 */ OMX_AUDIO_WMAFormat9, /**< Windows Media Audio format 9 */ - OMX_AUDIO_WMAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_WMAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_WMAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_WMAFormatMax = 0x7FFFFFFF } OMX_AUDIO_WMAFORMATTYPE; - /** WMA Profile */ typedef enum OMX_AUDIO_WMAPROFILETYPE { OMX_AUDIO_WMAProfileUnused = 0, /**< profile unused or unknown */ OMX_AUDIO_WMAProfileL1, /**< Windows Media audio version 9 profile L1 */ OMX_AUDIO_WMAProfileL2, /**< Windows Media audio version 9 profile L2 */ OMX_AUDIO_WMAProfileL3, /**< Windows Media audio version 9 profile L3 */ - OMX_AUDIO_WMAProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_WMAProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_WMAProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_WMAProfileMax = 0x7FFFFFFF } OMX_AUDIO_WMAPROFILETYPE; - /** WMA params */ typedef struct OMX_AUDIO_PARAM_WMATYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -442,7 +428,7 @@ typedef struct OMX_AUDIO_PARAM_WMATYPE { OMX_U32 nSuperBlockAlign; /**< WMA Type-specific data */ } OMX_AUDIO_PARAM_WMATYPE; -/** +/** * RealAudio format */ typedef enum OMX_AUDIO_RAFORMATTYPE { @@ -454,37 +440,35 @@ typedef enum OMX_AUDIO_RAFORMATTYPE { OMX_AUDIO_RA10_LOSSLESS, /**< RealAudio Lossless */ OMX_AUDIO_RA10_MULTICHANNEL, /**< RealAudio Multichannel */ OMX_AUDIO_RA10_VOICE, /**< RealAudio Voice for bitrates below 15 kbps */ - OMX_AUDIO_RAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_RAFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_RAFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_RAFormatMax = 0x7FFFFFFF } OMX_AUDIO_RAFORMATTYPE; -/** RA (Real Audio) params */ -typedef struct OMX_AUDIO_PARAM_RATYPE { - OMX_U32 nSize; /**< Size of this structure, in Bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port that this structure applies to */ - OMX_U32 nChannels; /**< Number of channels */ - OMX_U32 nSamplingRate; /**< is the sampling rate of the source data */ - OMX_U32 nBitsPerFrame; /**< is the value for bits per frame */ - OMX_U32 nSamplePerFrame; /**< is the value for samples per frame */ - OMX_U32 nCouplingQuantBits; /**< is the number of coupling quantization bits in the stream */ - OMX_U32 nCouplingStartRegion; /**< is the coupling start region in the stream */ - OMX_U32 nNumRegions; /**< is the number of regions value */ +/** RA (Real Audio) params */ +typedef struct OMX_AUDIO_PARAM_RATYPE { + OMX_U32 nSize; /**< Size of this structure, in Bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< Port that this structure applies to */ + OMX_U32 nChannels; /**< Number of channels */ + OMX_U32 nSamplingRate; /**< is the sampling rate of the source data */ + OMX_U32 nBitsPerFrame; /**< is the value for bits per frame */ + OMX_U32 nSamplePerFrame; /**< is the value for samples per frame */ + OMX_U32 nCouplingQuantBits; /**< is the number of coupling quantization bits in the stream */ + OMX_U32 nCouplingStartRegion; /**< is the coupling start region in the stream */ + OMX_U32 nNumRegions; /**< is the number of regions value */ OMX_AUDIO_RAFORMATTYPE eFormat; /**< is the RealAudio audio format */ -} OMX_AUDIO_PARAM_RATYPE; - +} OMX_AUDIO_PARAM_RATYPE; /** SBC Allocation Method Type */ typedef enum OMX_AUDIO_SBCALLOCMETHODTYPE { OMX_AUDIO_SBCAllocMethodLoudness, /**< Loudness allocation method */ OMX_AUDIO_SBCAllocMethodSNR, /**< SNR allocation method */ - OMX_AUDIO_SBCAllocMethodKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_SBCAllocMethodKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_SBCAllocMethodVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_SBCAllocMethodMax = 0x7FFFFFFF } OMX_AUDIO_SBCALLOCMETHODTYPE; - /** SBC params */ typedef struct OMX_AUDIO_PARAM_SBCTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -503,46 +487,42 @@ typedef struct OMX_AUDIO_PARAM_SBCTYPE { OMX_AUDIO_SBCALLOCMETHODTYPE eSBCAllocType; /**< SBC Allocation method type */ } OMX_AUDIO_PARAM_SBCTYPE; - -/** ADPCM stream format parameters */ -typedef struct OMX_AUDIO_PARAM_ADPCMTYPE { - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nChannels; /**< Number of channels in the data stream (not - necessarily the same as the number of channels - to be rendered. */ - OMX_U32 nBitsPerSample; /**< Number of bits in each sample */ - OMX_U32 nSampleRate; /**< Sampling rate of the source data. Use 0 for - variable or unknown sampling rate. */ -} OMX_AUDIO_PARAM_ADPCMTYPE; - +/** ADPCM stream format parameters */ +typedef struct OMX_AUDIO_PARAM_ADPCMTYPE { + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nChannels; /**< Number of channels in the data stream (not + necessarily the same as the number of channels + to be rendered. */ + OMX_U32 nBitsPerSample; /**< Number of bits in each sample */ + OMX_U32 nSampleRate; /**< Sampling rate of the source data. Use 0 for + variable or unknown sampling rate. */ +} OMX_AUDIO_PARAM_ADPCMTYPE; /** G723 rate */ typedef enum OMX_AUDIO_G723RATE { OMX_AUDIO_G723ModeUnused = 0, /**< AMRNB Mode unused / unknown */ OMX_AUDIO_G723ModeLow, /**< 5300 bps */ OMX_AUDIO_G723ModeHigh, /**< 6300 bps */ - OMX_AUDIO_G723ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G723ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G723ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G723ModeMax = 0x7FFFFFFF } OMX_AUDIO_G723RATE; - /** G723 - Sample rate must be 8 KHz */ -typedef struct OMX_AUDIO_PARAM_G723TYPE { - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nChannels; /**< Number of channels in the data stream (not - necessarily the same as the number of channels - to be rendered. */ - OMX_BOOL bDTX; /**< Enable Discontinuous Transmisssion */ +typedef struct OMX_AUDIO_PARAM_G723TYPE { + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nChannels; /**< Number of channels in the data stream (not + necessarily the same as the number of channels + to be rendered. */ + OMX_BOOL bDTX; /**< Enable Discontinuous Transmisssion */ OMX_AUDIO_G723RATE eBitRate; /**< todo: Should this be moved to a config? */ - OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ - OMX_BOOL bPostFilter; /**< Enable Post Filter */ -} OMX_AUDIO_PARAM_G723TYPE; - + OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ + OMX_BOOL bPostFilter; /**< Enable Post Filter */ +} OMX_AUDIO_PARAM_G723TYPE; /** ITU G726 (ADPCM) rate */ typedef enum OMX_AUDIO_G726MODE { @@ -551,23 +531,21 @@ typedef enum OMX_AUDIO_G726MODE { OMX_AUDIO_G726Mode24, /**< 24 kbps */ OMX_AUDIO_G726Mode32, /**< 32 kbps, most common rate, also G721 */ OMX_AUDIO_G726Mode40, /**< 40 kbps */ - OMX_AUDIO_G726ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G726ModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G726ModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G726ModeMax = 0x7FFFFFFF } OMX_AUDIO_G726MODE; - -/** G.726 stream format parameters - must be at 8KHz */ -typedef struct OMX_AUDIO_PARAM_G726TYPE { - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nChannels; /**< Number of channels in the data stream (not - necessarily the same as the number of channels - to be rendered. */ +/** G.726 stream format parameters - must be at 8KHz */ +typedef struct OMX_AUDIO_PARAM_G726TYPE { + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nChannels; /**< Number of channels in the data stream (not + necessarily the same as the number of channels + to be rendered. */ OMX_AUDIO_G726MODE eG726Mode; -} OMX_AUDIO_PARAM_G726TYPE; - +} OMX_AUDIO_PARAM_G726TYPE; /** G729 coder type */ typedef enum OMX_AUDIO_G729TYPE { @@ -575,12 +553,11 @@ typedef enum OMX_AUDIO_G729TYPE { OMX_AUDIO_G729A, /**< ITU G.729 annex A encoded data */ OMX_AUDIO_G729B, /**< ITU G.729 with annex B encoded data */ OMX_AUDIO_G729AB, /**< ITU G.729 annexes A and B encoded data */ - OMX_AUDIO_G729KhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_G729KhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_G729VendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_G729Max = 0x7FFFFFFF } OMX_AUDIO_G729TYPE; - /** G729 stream format parameters - fixed 6KHz sample rate */ typedef struct OMX_AUDIO_PARAM_G729TYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -593,32 +570,30 @@ typedef struct OMX_AUDIO_PARAM_G729TYPE { OMX_AUDIO_G729TYPE eBitType; } OMX_AUDIO_PARAM_G729TYPE; - -/** AMR Frame format */ -typedef enum OMX_AUDIO_AMRFRAMEFORMATTYPE { - OMX_AUDIO_AMRFrameFormatConformance = 0, /**< Frame Format is AMR Conformance - (Standard) Format */ - OMX_AUDIO_AMRFrameFormatIF1, /**< Frame Format is AMR Interface - Format 1 */ - OMX_AUDIO_AMRFrameFormatIF2, /**< Frame Format is AMR Interface - Format 2*/ - OMX_AUDIO_AMRFrameFormatFSF, /**< Frame Format is AMR File Storage - Format */ - OMX_AUDIO_AMRFrameFormatRTPPayload, /**< Frame Format is AMR Real-Time - Transport Protocol Payload Format */ - OMX_AUDIO_AMRFrameFormatITU, /**< Frame Format is ITU Format (added at Motorola request) */ - OMX_AUDIO_AMRFrameFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ +/** AMR Frame format */ +typedef enum OMX_AUDIO_AMRFRAMEFORMATTYPE { + OMX_AUDIO_AMRFrameFormatConformance = 0, /**< Frame Format is AMR Conformance + (Standard) Format */ + OMX_AUDIO_AMRFrameFormatIF1, /**< Frame Format is AMR Interface + Format 1 */ + OMX_AUDIO_AMRFrameFormatIF2, /**< Frame Format is AMR Interface + Format 2*/ + OMX_AUDIO_AMRFrameFormatFSF, /**< Frame Format is AMR File Storage + Format */ + OMX_AUDIO_AMRFrameFormatRTPPayload, /**< Frame Format is AMR Real-Time + Transport Protocol Payload Format */ + OMX_AUDIO_AMRFrameFormatITU, /**< Frame Format is ITU Format (added at Motorola request) */ + OMX_AUDIO_AMRFrameFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRFrameFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF -} OMX_AUDIO_AMRFRAMEFORMATTYPE; - + OMX_AUDIO_AMRFrameFormatMax = 0x7FFFFFFF +} OMX_AUDIO_AMRFRAMEFORMATTYPE; /** AMR band mode */ typedef enum OMX_AUDIO_AMRBANDMODETYPE { OMX_AUDIO_AMRBandModeUnused = 0, /**< AMRNB Mode unused / unknown */ OMX_AUDIO_AMRBandModeNB0, /**< AMRNB Mode 0 = 4750 bps */ OMX_AUDIO_AMRBandModeNB1, /**< AMRNB Mode 1 = 5150 bps */ - OMX_AUDIO_AMRBandModeNB2, /**< AMRNB Mode 2 = 5900 bps */ + OMX_AUDIO_AMRBandModeNB2, /**< AMRNB Mode 2 = 5900 bps */ OMX_AUDIO_AMRBandModeNB3, /**< AMRNB Mode 3 = 6700 bps */ OMX_AUDIO_AMRBandModeNB4, /**< AMRNB Mode 4 = 7400 bps */ OMX_AUDIO_AMRBandModeNB5, /**< AMRNB Mode 5 = 7950 bps */ @@ -626,36 +601,34 @@ typedef enum OMX_AUDIO_AMRBANDMODETYPE { OMX_AUDIO_AMRBandModeNB7, /**< AMRNB Mode 7 = 12200 bps */ OMX_AUDIO_AMRBandModeWB0, /**< AMRWB Mode 0 = 6600 bps */ OMX_AUDIO_AMRBandModeWB1, /**< AMRWB Mode 1 = 8850 bps */ - OMX_AUDIO_AMRBandModeWB2, /**< AMRWB Mode 2 = 12650 bps */ - OMX_AUDIO_AMRBandModeWB3, /**< AMRWB Mode 3 = 14250 bps */ + OMX_AUDIO_AMRBandModeWB2, /**< AMRWB Mode 2 = 12650 bps */ + OMX_AUDIO_AMRBandModeWB3, /**< AMRWB Mode 3 = 14250 bps */ OMX_AUDIO_AMRBandModeWB4, /**< AMRWB Mode 4 = 15850 bps */ OMX_AUDIO_AMRBandModeWB5, /**< AMRWB Mode 5 = 18250 bps */ OMX_AUDIO_AMRBandModeWB6, /**< AMRWB Mode 6 = 19850 bps */ OMX_AUDIO_AMRBandModeWB7, /**< AMRWB Mode 7 = 23050 bps */ - OMX_AUDIO_AMRBandModeWB8, /**< AMRWB Mode 8 = 23850 bps */ - OMX_AUDIO_AMRBandModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AMRBandModeWB8, /**< AMRWB Mode 8 = 23850 bps */ + OMX_AUDIO_AMRBandModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRBandModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_AMRBandModeMax = 0x7FFFFFFF } OMX_AUDIO_AMRBANDMODETYPE; - -/** AMR Discontinuous Transmission mode */ -typedef enum OMX_AUDIO_AMRDTXMODETYPE { - OMX_AUDIO_AMRDTXModeOff = 0, /**< AMR Discontinuous Transmission Mode is disabled */ - OMX_AUDIO_AMRDTXModeOnVAD1, /**< AMR Discontinuous Transmission Mode using - Voice Activity Detector 1 (VAD1) is enabled */ - OMX_AUDIO_AMRDTXModeOnVAD2, /**< AMR Discontinuous Transmission Mode using - Voice Activity Detector 2 (VAD2) is enabled */ - OMX_AUDIO_AMRDTXModeOnAuto, /**< The codec will automatically select between - Off, VAD1 or VAD2 modes */ +/** AMR Discontinuous Transmission mode */ +typedef enum OMX_AUDIO_AMRDTXMODETYPE { + OMX_AUDIO_AMRDTXModeOff = 0, /**< AMR Discontinuous Transmission Mode is disabled */ + OMX_AUDIO_AMRDTXModeOnVAD1, /**< AMR Discontinuous Transmission Mode using + Voice Activity Detector 1 (VAD1) is enabled */ + OMX_AUDIO_AMRDTXModeOnVAD2, /**< AMR Discontinuous Transmission Mode using + Voice Activity Detector 2 (VAD2) is enabled */ + OMX_AUDIO_AMRDTXModeOnAuto, /**< The codec will automatically select between + Off, VAD1 or VAD2 modes */ OMX_AUDIO_AMRDTXasEFR, /**< DTX as EFR instead of AMR standard (3GPP 26.101, frame type =8,9,10) */ - OMX_AUDIO_AMRDTXModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_AMRDTXModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_AMRDTXModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF -} OMX_AUDIO_AMRDTXMODETYPE; - + OMX_AUDIO_AMRDTXModeMax = 0x7FFFFFFF +} OMX_AUDIO_AMRDTXMODETYPE; /** AMR params */ typedef struct OMX_AUDIO_PARAM_AMRTYPE { @@ -664,12 +637,11 @@ typedef struct OMX_AUDIO_PARAM_AMRTYPE { OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_U32 nChannels; /**< Number of channels */ OMX_U32 nBitRate; /**< Bit rate read only field */ - OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */ + OMX_AUDIO_AMRBANDMODETYPE eAMRBandMode; /**< AMR Band Mode enumeration */ OMX_AUDIO_AMRDTXMODETYPE eAMRDTXMode; /**< AMR DTX Mode enumeration */ OMX_AUDIO_AMRFRAMEFORMATTYPE eAMRFrameFormat; /**< AMR frame format enumeration */ } OMX_AUDIO_PARAM_AMRTYPE; - /** GSM_FR (ETSI 06.10, 3GPP 46.010) stream format parameters */ typedef struct OMX_AUDIO_PARAM_GSMFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -679,7 +651,6 @@ typedef struct OMX_AUDIO_PARAM_GSMFRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_GSMFRTYPE; - /** GSM-HR (ETSI 06.20, 3GPP 46.020) stream format parameters */ typedef struct OMX_AUDIO_PARAM_GSMHRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -689,7 +660,6 @@ typedef struct OMX_AUDIO_PARAM_GSMHRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_GSMHRTYPE; - /** GSM-EFR (ETSI 06.60, 3GPP 46.060) stream format parameters */ typedef struct OMX_AUDIO_PARAM_GSMEFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -699,7 +669,6 @@ typedef struct OMX_AUDIO_PARAM_GSMEFRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_GSMEFRTYPE; - /** TDMA FR (TIA/EIA-136-420, VSELP 7.95kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_TDMAFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -712,7 +681,6 @@ typedef struct OMX_AUDIO_PARAM_TDMAFRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_TDMAFRTYPE; - /** TDMA EFR (TIA/EIA-136-410, ACELP 7.4kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_TDMAEFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -725,7 +693,6 @@ typedef struct OMX_AUDIO_PARAM_TDMAEFRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_TDMAEFRTYPE; - /** PDC FR ( RCR-27, VSELP 6.7kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_PDCFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -738,7 +705,6 @@ typedef struct OMX_AUDIO_PARAM_PDCFRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_PDCFRTYPE; - /** PDC EFR ( RCR-27, ACELP 6.7kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_PDCEFRTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -763,7 +729,6 @@ typedef struct OMX_AUDIO_PARAM_PDCHRTYPE { OMX_BOOL bHiPassFilter; /**< Enable High Pass Filter */ } OMX_AUDIO_PARAM_PDCHRTYPE; - /** CDMA Rate types */ typedef enum OMX_AUDIO_CDMARATETYPE { OMX_AUDIO_CDMARateBlank = 0, /**< CDMA encoded frame is blank */ @@ -772,12 +737,11 @@ typedef enum OMX_AUDIO_CDMARATETYPE { OMX_AUDIO_CDMARateQuarter, /**< CDMA encoded frame in quarter rate */ OMX_AUDIO_CDMARateEighth, /**< CDMA encoded frame in eighth rate (DTX)*/ OMX_AUDIO_CDMARateErasure, /**< CDMA erasure frame */ - OMX_AUDIO_CDMARateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_CDMARateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_CDMARateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_CDMARateMax = 0x7FFFFFFF } OMX_AUDIO_CDMARATETYPE; - /** QCELP8 (TIA/EIA-96, up to 8kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_QCELP8TYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -793,7 +757,6 @@ typedef struct OMX_AUDIO_PARAM_QCELP8TYPE { OMX_U32 nMaxBitRate; /**< maximal rate for the encoder = 1,2,3,4, default = 4 */ } OMX_AUDIO_PARAM_QCELP8TYPE; - /** QCELP13 ( CDMA, EIA/TIA-733, 13.3kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_QCELP13TYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -807,7 +770,6 @@ typedef struct OMX_AUDIO_PARAM_QCELP13TYPE { OMX_U32 nMaxBitRate; /**< maximal rate for the encoder = 1,2,3,4, default = 4 */ } OMX_AUDIO_PARAM_QCELP13TYPE; - /** EVRC ( CDMA, EIA/TIA-127, RCELP up to 8.55kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_EVRCTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -825,7 +787,6 @@ typedef struct OMX_AUDIO_PARAM_EVRCTYPE { OMX_BOOL bPostFilter; /**< Enable decoder's post Filter */ } OMX_AUDIO_PARAM_EVRCTYPE; - /** SMV ( up to 8.55kbps coder) stream format parameters */ typedef struct OMX_AUDIO_PARAM_SMVTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ @@ -843,8 +804,7 @@ typedef struct OMX_AUDIO_PARAM_SMVTYPE { OMX_BOOL bPostFilter; /**< Enable decoder's post Filter ??*/ } OMX_AUDIO_PARAM_SMVTYPE; - -/** MIDI Format +/** MIDI Format * @ingroup midi */ typedef enum OMX_AUDIO_MIDIFORMATTYPE @@ -857,33 +817,31 @@ typedef enum OMX_AUDIO_MIDIFORMATTYPE OMX_AUDIO_MIDIFormatXMF0, /**< eXtensible Music Format type 0 */ OMX_AUDIO_MIDIFormatXMF1, /**< eXtensible Music Format type 1 */ OMX_AUDIO_MIDIFormatMobileXMF, /**< Mobile XMF (eXtensible Music Format type 2) */ - OMX_AUDIO_MIDIFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDIFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDIFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDIFormatMax = 0x7FFFFFFF } OMX_AUDIO_MIDIFORMATTYPE; - -/** MIDI params +/** MIDI params * @ingroup midi */ typedef struct OMX_AUDIO_PARAM_MIDITYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nFileSize; /**< size of the MIDI file in bytes, where the entire - MIDI file passed in, otherwise if 0x0, the MIDI data - is merged and streamed (instead of passed as an + OMX_U32 nFileSize; /**< size of the MIDI file in bytes, where the entire + MIDI file passed in, otherwise if 0x0, the MIDI data + is merged and streamed (instead of passed as an entire MIDI file) */ - OMX_BU32 sMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic - voices. A value of zero indicates that the default - polyphony of the device is used */ - OMX_BOOL bLoadDefaultSound; /**< Whether to load default sound + OMX_BU32 sMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic + voices. A value of zero indicates that the default + polyphony of the device is used */ + OMX_BOOL bLoadDefaultSound; /**< Whether to load default sound bank at initialization */ - OMX_AUDIO_MIDIFORMATTYPE eMidiFormat; /**< Version of the MIDI file */ + OMX_AUDIO_MIDIFORMATTYPE eMidiFormat; /**< Version of the MIDI file */ } OMX_AUDIO_PARAM_MIDITYPE; - -/** Type of the MIDI sound bank +/** Type of the MIDI sound bank * @ingroup midi */ typedef enum OMX_AUDIO_MIDISOUNDBANKTYPE { @@ -892,13 +850,12 @@ typedef enum OMX_AUDIO_MIDISOUNDBANKTYPE { OMX_AUDIO_MIDISoundBankDLS2, /**< DLS version 2 */ OMX_AUDIO_MIDISoundBankMobileDLSBase, /**< Mobile DLS, using the base functionality */ OMX_AUDIO_MIDISoundBankMobileDLSPlusOptions, /**< Mobile DLS, using the specification-defined optional feature set */ - OMX_AUDIO_MIDISoundBankKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDISoundBankKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDISoundBankVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDISoundBankMax = 0x7FFFFFFF } OMX_AUDIO_MIDISOUNDBANKTYPE; - -/** Bank Layout describes how bank MSB & LSB are used in the DLS instrument definitions sound bank +/** Bank Layout describes how bank MSB & LSB are used in the DLS instrument definitions sound bank * @ingroup midi */ typedef enum OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE { @@ -906,13 +863,12 @@ typedef enum OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE { OMX_AUDIO_MIDISoundBankLayoutGM, /**< GS layout (based on bank MSB 0x00) */ OMX_AUDIO_MIDISoundBankLayoutGM2, /**< General MIDI 2 layout (using MSB 0x78/0x79, LSB 0x00) */ OMX_AUDIO_MIDISoundBankLayoutUser, /**< Does not conform to any bank numbering standards */ - OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDISoundBankLayoutKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDISoundBankLayoutVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDISoundBankLayoutMax = 0x7FFFFFFF } OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE; - -/** MIDI params to load/unload user soundbank +/** MIDI params to load/unload user soundbank * @ingroup midi */ typedef struct OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE { @@ -926,9 +882,8 @@ typedef struct OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE { OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE eMidiSoundBankLayout; /**< Midi sound bank layout enumeration */ } OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE; - -/** Structure for Live MIDI events and MIP messages. - * (MIP = Maximum Instantaneous Polyphony; part of the SP-MIDI standard.) +/** Structure for Live MIDI events and MIP messages. + * (MIP = Maximum Instantaneous Polyphony; part of the SP-MIDI standard.) * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE { @@ -937,12 +892,11 @@ typedef struct OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE { OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_U32 nMidiEventSize; /**< Size of immediate MIDI events or MIP message in bytes */ OMX_U8 nMidiEvents[1]; /**< MIDI event array to be rendered immediately, or an - array for the MIP message buffer, where the size is + array for the MIP message buffer, where the size is indicated by nMidiEventSize */ } OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE; - -/** MIDI sound bank/ program pair in a given channel +/** MIDI sound bank/ program pair in a given channel * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE { @@ -952,29 +906,28 @@ typedef struct OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE { OMX_U32 nChannel; /**< Valid channel values range from 1 to 16 */ OMX_U16 nIDProgram; /**< Valid program ID range is 1 to 128 */ OMX_U16 nIDSoundBank; /**< Sound bank ID */ - OMX_U32 nUserSoundBankIndex;/**< User soundbank index, easier to access soundbanks + OMX_U32 nUserSoundBankIndex;/**< User soundbank index, easier to access soundbanks by index if multiple banks are present */ } OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE; - -/** MIDI control +/** MIDI control * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDICONTROLTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_BS32 sPitchTransposition; /**< Pitch transposition in semitones, stored as Q22.10 + OMX_BS32 sPitchTransposition; /**< Pitch transposition in semitones, stored as Q22.10 format based on JAVA MMAPI (JSR-135) requirement */ OMX_BU32 sPlayBackRate; /**< Relative playback rate, stored as Q14.17 fixed-point number based on JSR-135 requirement */ - OMX_BU32 sTempo ; /**< Tempo in beats per minute (BPM), stored as Q22.10 + OMX_BU32 sTempo ; /**< Tempo in beats per minute (BPM), stored as Q22.10 fixed-point number based on JSR-135 requirement */ - OMX_U32 nMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic - voices. A value of zero indicates that the default + OMX_U32 nMaxPolyphony; /**< Specifies the maximum simultaneous polyphonic + voices. A value of zero indicates that the default polyphony of the device is used */ OMX_U32 nNumRepeat; /**< Number of times to repeat playback */ - OMX_U32 nStopTime; /**< Time in milliseconds to indicate when playback + OMX_U32 nStopTime; /**< Time in milliseconds to indicate when playback will stop automatically. Set to zero if not used */ OMX_U16 nChannelMuteMask; /**< 16 bit mask for channel mute status */ OMX_U16 nChannelSoloMask; /**< 16 bit mask for channel solo status */ @@ -985,23 +938,22 @@ typedef struct OMX_AUDIO_CONFIG_MIDICONTROLTYPE { } OMX_AUDIO_CONFIG_MIDICONTROLTYPE; - -/** MIDI Playback States +/** MIDI Playback States * @ingroup midi */ typedef enum OMX_AUDIO_MIDIPLAYBACKSTATETYPE { - OMX_AUDIO_MIDIPlayBackStateUnknown = 0, /**< Unknown state or state does not map to + OMX_AUDIO_MIDIPlayBackStateUnknown = 0, /**< Unknown state or state does not map to other defined states */ - OMX_AUDIO_MIDIPlayBackStateClosedEngaged, /**< No MIDI resource is currently open. - The MIDI engine is currently processing + OMX_AUDIO_MIDIPlayBackStateClosedEngaged, /**< No MIDI resource is currently open. + The MIDI engine is currently processing MIDI events. */ - OMX_AUDIO_MIDIPlayBackStateParsing, /**< A MIDI resource is open and is being - primed. The MIDI engine is currently + OMX_AUDIO_MIDIPlayBackStateParsing, /**< A MIDI resource is open and is being + primed. The MIDI engine is currently processing MIDI events. */ - OMX_AUDIO_MIDIPlayBackStateOpenEngaged, /**< A MIDI resource is open and primed but + OMX_AUDIO_MIDIPlayBackStateOpenEngaged, /**< A MIDI resource is open and primed but not playing. The MIDI engine is currently processing MIDI events. The transition to - this state is only possible from the + this state is only possible from the OMX_AUDIO_MIDIPlayBackStatePlaying state, when the 'playback head' reaches the end of media data or the playback stops due @@ -1016,95 +968,91 @@ typedef enum OMX_AUDIO_MIDIPLAYBACKSTATETYPE { no audible MIDI content during playback currently. The situation may change if resources are freed later.*/ - OMX_AUDIO_MIDIPlayBackStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_MIDIPlayBackStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_MIDIPlayBackStateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_MIDIPlayBackStateMax = 0x7FFFFFFF } OMX_AUDIO_MIDIPLAYBACKSTATETYPE; - -/** MIDI status +/** MIDI status * @ingroup midi */ typedef struct OMX_AUDIO_CONFIG_MIDISTATUSTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U16 nNumTracks; /**< Number of MIDI tracks in the file, read only field. - NOTE: May not return a meaningful value until the entire + OMX_U16 nNumTracks; /**< Number of MIDI tracks in the file, read only field. + NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ - OMX_U32 nDuration; /**< The length of the currently open MIDI resource - in milliseconds. NOTE: May not return a meaningful value - until the entire file is parsed and buffered. */ - OMX_U32 nPosition; /**< Current Position of the MIDI resource being played - in milliseconds */ - OMX_BOOL bVibra; /**< Does Vibra track exist? NOTE: May not return a meaningful - value until the entire file is parsed and buffered. */ - OMX_U32 nNumMetaEvents; /**< Total number of MIDI Meta Events in the currently - open MIDI resource. NOTE: May not return a meaningful value + OMX_U32 nDuration; /**< The length of the currently open MIDI resource + in milliseconds. NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ - OMX_U32 nNumActiveVoices; /**< Number of active voices in the currently playing - MIDI resource. NOTE: May not return a meaningful value until + OMX_U32 nPosition; /**< Current Position of the MIDI resource being played + in milliseconds */ + OMX_BOOL bVibra; /**< Does Vibra track exist? NOTE: May not return a meaningful + value until the entire file is parsed and buffered. */ + OMX_U32 nNumMetaEvents; /**< Total number of MIDI Meta Events in the currently + open MIDI resource. NOTE: May not return a meaningful value + until the entire file is parsed and buffered. */ + OMX_U32 nNumActiveVoices; /**< Number of active voices in the currently playing + MIDI resource. NOTE: May not return a meaningful value until the entire file is parsed and buffered. */ OMX_AUDIO_MIDIPLAYBACKSTATETYPE eMIDIPlayBackState; /**< MIDI playback state enumeration, read only field */ } OMX_AUDIO_CONFIG_MIDISTATUSTYPE; - /** MIDI Meta Event structure one per Meta Event. - * MIDI Meta Events are like audio metadata, except that they are interspersed - * with the MIDI content throughout the file and are not localized in the header. - * As such, it is necessary to retrieve information about these Meta Events from - * the engine, as it encounters these Meta Events within the MIDI content. - * For example, SMF files can have up to 14 types of MIDI Meta Events (copyright, - * author, default tempo, etc.) scattered throughout the file. + * MIDI Meta Events are like audio metadata, except that they are interspersed + * with the MIDI content throughout the file and are not localized in the header. + * As such, it is necessary to retrieve information about these Meta Events from + * the engine, as it encounters these Meta Events within the MIDI content. + * For example, SMF files can have up to 14 types of MIDI Meta Events (copyright, + * author, default tempo, etc.) scattered throughout the file. * @ingroup midi */ -typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE{ - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nIndex; /**< Index of Meta Event */ - OMX_U8 nMetaEventType; /**< Meta Event Type, 7bits (i.e. 0 - 127) */ - OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ +typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE{ + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nIndex; /**< Index of Meta Event */ + OMX_U8 nMetaEventType; /**< Meta Event Type, 7bits (i.e. 0 - 127) */ + OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ OMX_U32 nTrack; /**< track number for the meta event */ OMX_U32 nPosition; /**< Position of the meta-event in milliseconds */ -} OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE; +} OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE; - -/** MIDI Meta Event Data structure - one per Meta Event. +/** MIDI Meta Event Data structure - one per Meta Event. * @ingroup midi - */ -typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE{ - OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nIndex; /**< Index of Meta Event */ - OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ - OMX_U8 nData[1]; /**< array of one or more bytes of meta data - as indicated by the nMetaEventSize field */ -} OMX_AUDIO_CONFIG__MIDIMETAEVENTDATATYPE; - + */ +typedef struct OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE{ + OMX_U32 nSize; /**< size of the structure in bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ + OMX_U32 nIndex; /**< Index of Meta Event */ + OMX_U32 nMetaEventSize; /**< size of the Meta Event in bytes */ + OMX_U8 nData[1]; /**< array of one or more bytes of meta data + as indicated by the nMetaEventSize field */ +} OMX_AUDIO_CONFIG__MIDIMETAEVENTDATATYPE; /** Audio Volume adjustment for a port */ typedef struct OMX_AUDIO_CONFIG_VOLUMETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's volume. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's volume. Select the + output port to adjust the master volume. */ - OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) + OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or logarithmic scale (mB) */ OMX_BS32 sVolume; /**< Volume linear setting in the 0..100 range, OR Volume logarithmic setting for this port. The values for volume are in mB (millibels = 1/100 dB) relative - to a gain of 1 (e.g. the output is the same as the - input level). Values are in mB from nMax + to a gain of 1 (e.g. the output is the same as the + input level). Values are in mB from nMax (maximum volume) to nMin mB (typically negative). Since the volume is "voltage" and not a "power", it takes a setting of -600 mB to decrease the volume by 1/2. If - a component cannot accurately set the + a component cannot accurately set the volume to the requested value, it must set the volume to the closest value BELOW the requested value. When getting the @@ -1112,32 +1060,31 @@ typedef struct OMX_AUDIO_CONFIG_VOLUMETYPE { must be returned. */ } OMX_AUDIO_CONFIG_VOLUMETYPE; - /** Audio Volume adjustment for a channel */ typedef struct OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's volume. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's volume. Select the + output port to adjust the master volume. */ - OMX_U32 nChannel; /**< channel to select from 0 to N-1, + OMX_U32 nChannel; /**< channel to select from 0 to N-1, using OMX_ALL to apply volume settings to all channels */ - OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or + OMX_BOOL bLinear; /**< Is the volume to be set in linear (0.100) or logarithmic scale (mB) */ OMX_BS32 sVolume; /**< Volume linear setting in the 0..100 range, OR - Volume logarithmic setting for this port. - The values for volume are in mB + Volume logarithmic setting for this port. + The values for volume are in mB (millibels = 1/100 dB) relative to a gain - of 1 (e.g. the output is the same as the - input level). Values are in mB from nMax - (maximum volume) to nMin mB (typically negative). + of 1 (e.g. the output is the same as the + input level). Values are in mB from nMax + (maximum volume) to nMin mB (typically negative). Since the volume is "voltage" and not a "power", it takes a setting of -600 mB to decrease the volume by 1/2. If - a component cannot accurately set the + a component cannot accurately set the volume to the requested value, it must set the volume to the closest value BELOW the requested value. When getting the @@ -1147,54 +1094,49 @@ typedef struct OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE { FALSE otherwise */ } OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE; - /** Audio balance setting */ typedef struct OMX_AUDIO_CONFIG_BALANCETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's balance. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's balance. Select the + output port to adjust the master balance. */ - OMX_S32 nBalance; /**< balance setting for this port + OMX_S32 nBalance; /**< balance setting for this port (-100 to 100, where -100 indicates all left, and no right */ } OMX_AUDIO_CONFIG_BALANCETYPE; - /** Audio Port mute */ typedef struct OMX_AUDIO_CONFIG_MUTETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< Port index indicating which port to - set. Select the input port to set - just that port's mute. Select the - output port to adjust the master + OMX_U32 nPortIndex; /**< Port index indicating which port to + set. Select the input port to set + just that port's mute. Select the + output port to adjust the master mute. */ OMX_BOOL bMute; /**< Mute setting for this port */ } OMX_AUDIO_CONFIG_MUTETYPE; - /** Audio Channel mute */ typedef struct OMX_AUDIO_CONFIG_CHANNELMUTETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_U32 nChannel; /**< channel to select from 0 to N-1, + OMX_U32 nChannel; /**< channel to select from 0 to N-1, using OMX_ALL to apply mute settings to all channels */ OMX_BOOL bMute; /**< Mute setting for this channel */ OMX_BOOL bIsMIDI; /**< TRUE if nChannel refers to a MIDI channel, - FALSE otherwise */ + FALSE otherwise */ } OMX_AUDIO_CONFIG_CHANNELMUTETYPE; - - -/** Enable / Disable for loudness control, which boosts bass and to a +/** Enable / Disable for loudness control, which boosts bass and to a * smaller extent high end frequencies to compensate for hearing * ability at the extreme ends of the audio spectrum - */ + */ typedef struct OMX_AUDIO_CONFIG_LOUDNESSTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1202,35 +1144,32 @@ typedef struct OMX_AUDIO_CONFIG_LOUDNESSTYPE { OMX_BOOL bLoudness; /**< Enable/disable for loudness */ } OMX_AUDIO_CONFIG_LOUDNESSTYPE; - /** Enable / Disable for bass, which controls low frequencies - */ + */ typedef struct OMX_AUDIO_CONFIG_BASSTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for bass control */ - OMX_S32 nBass; /**< bass setting for the port, as a - continuous value from -100 to 100 + OMX_S32 nBass; /**< bass setting for the port, as a + continuous value from -100 to 100 (0 means no change in bass level)*/ } OMX_AUDIO_CONFIG_BASSTYPE; - /** Enable / Disable for treble, which controls high frequencies tones - */ + */ typedef struct OMX_AUDIO_CONFIG_TREBLETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for treble control */ OMX_S32 nTreble; /**< treble setting for the port, as a - continuous value from -100 to 100 + continuous value from -100 to 100 (0 means no change in treble level) */ } OMX_AUDIO_CONFIG_TREBLETYPE; - -/** An equalizer is typically used for two reasons: to compensate for an - * sub-optimal frequency response of a system to make it sound more natural +/** An equalizer is typically used for two reasons: to compensate for an + * sub-optimal frequency response of a system to make it sound more natural * or to create intentionally some unnatural coloring to the sound to create * an effect. * @ingroup effects @@ -1240,33 +1179,31 @@ typedef struct OMX_AUDIO_CONFIG_EQUALIZERTYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for equalizer */ - OMX_BU32 sBandIndex; /**< Band number to be set. Upper Limit is + OMX_BU32 sBandIndex; /**< Band number to be set. Upper Limit is N-1, where N is the number of bands, lower limit is 0 */ OMX_BU32 sCenterFreq; /**< Center frequecies in Hz. This is a - read only element and is used to determine - the lower, center and upper frequency of + read only element and is used to determine + the lower, center and upper frequency of this band. */ OMX_BS32 sBandLevel; /**< band level in millibels */ } OMX_AUDIO_CONFIG_EQUALIZERTYPE; - -/** Stereo widening mode type +/** Stereo widening mode type * @ingroup effects - */ + */ typedef enum OMX_AUDIO_STEREOWIDENINGTYPE { OMX_AUDIO_StereoWideningHeadphones, /**< Stereo widening for loudspeakers */ OMX_AUDIO_StereoWideningLoudspeakers, /**< Stereo widening for closely spaced loudspeakers */ - OMX_AUDIO_StereoWideningKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_StereoWideningKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_StereoWideningVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_StereoWideningMax = 0x7FFFFFFF } OMX_AUDIO_STEREOWIDENINGTYPE; - /** Control for stereo widening, which is a special 2-channel - * case of the audio virtualizer effect. For example, for 5.1-channel - * output, it translates to virtual surround sound. + * case of the audio virtualizer effect. For example, for 5.1-channel + * output, it translates to virtual surround sound. * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1277,12 +1214,11 @@ typedef struct OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE { as a continuous value from 0 to 100 */ } OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE; - /** The chorus effect (or ``choralizer'') is any signal processor which makes - * one sound source (such as a voice) sound like many such sources singing - * (or playing) in unison. Since performance in unison is never exact, chorus - * effects simulate this by making independently modified copies of the input - * signal. Modifications may include (1) delay, (2) frequency shift, and + * one sound source (such as a voice) sound like many such sources singing + * (or playing) in unison. Since performance in unison is never exact, chorus + * effects simulate this by making independently modified copies of the input + * signal. Modifications may include (1) delay, (2) frequency shift, and * (3) amplitude modulation. * @ingroup effects */ @@ -1293,16 +1229,15 @@ typedef struct OMX_AUDIO_CONFIG_CHORUSTYPE { OMX_BOOL bEnable; /**< Enable/disable for chorus */ OMX_BU32 sDelay; /**< average delay in milliseconds */ OMX_BU32 sModulationRate; /**< rate of modulation in millihertz */ - OMX_U32 nModulationDepth; /**< depth of modulation as a percentage of + OMX_U32 nModulationDepth; /**< depth of modulation as a percentage of delay (i.e. 0 to 100) */ OMX_BU32 nFeedback; /**< Feedback from chorus output to input in percentage */ } OMX_AUDIO_CONFIG_CHORUSTYPE; - -/** Reverberation is part of the reflected sound that follows the early - * reflections. In a typical room, this consists of a dense succession of - * echoes whose energy decays exponentially. The reverberation effect structure - * as defined here includes both (early) reflections as well as (late) reverberations. +/** Reverberation is part of the reflected sound that follows the early + * reflections. In a typical room, this consists of a dense succession of + * echoes whose energy decays exponentially. The reverberation effect structure + * as defined here includes both (early) reflections as well as (late) reverberations. * @ingroup effects */ typedef struct OMX_AUDIO_CONFIG_REVERBERATIONTYPE { @@ -1310,57 +1245,55 @@ typedef struct OMX_AUDIO_CONFIG_REVERBERATIONTYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_BOOL bEnable; /**< Enable/disable for reverberation control */ - OMX_BS32 sRoomLevel; /**< Intensity level for the whole room effect - (i.e. both early reflections and late + OMX_BS32 sRoomLevel; /**< Intensity level for the whole room effect + (i.e. both early reflections and late reverberation) in millibels */ OMX_BS32 sRoomHighFreqLevel; /**< Attenuation at high frequencies relative to the intensity at low frequencies in millibels */ OMX_BS32 sReflectionsLevel; /**< Intensity level of early reflections (relative to room value), in millibels */ - OMX_BU32 sReflectionsDelay; /**< Delay time of the first reflection relative + OMX_BU32 sReflectionsDelay; /**< Delay time of the first reflection relative to the direct path, in milliseconds */ OMX_BS32 sReverbLevel; /**< Intensity level of late reverberation relative to room level, in millibels */ - OMX_BU32 sReverbDelay; /**< Time delay from the first early reflection - to the beginning of the late reverberation + OMX_BU32 sReverbDelay; /**< Time delay from the first early reflection + to the beginning of the late reverberation section, in milliseconds */ OMX_BU32 sDecayTime; /**< Late reverberation decay time at low frequencies, in milliseconds */ - OMX_BU32 nDecayHighFreqRatio; /**< Ratio of high frequency decay time relative + OMX_BU32 nDecayHighFreqRatio; /**< Ratio of high frequency decay time relative to low frequency decay time in percent */ OMX_U32 nDensity; /**< Modal density in the late reverberation decay, in percent (i.e. 0 - 100) */ OMX_U32 nDiffusion; /**< Echo density in the late reverberation decay, in percent (i.e. 0 - 100) */ - OMX_BU32 sReferenceHighFreq; /**< Reference high frequency in Hertz. This is - the frequency used as the reference for all + OMX_BU32 sReferenceHighFreq; /**< Reference high frequency in Hertz. This is + the frequency used as the reference for all the high-frequency settings above */ } OMX_AUDIO_CONFIG_REVERBERATIONTYPE; - -/** Possible settings for the Echo Cancelation structure to use +/** Possible settings for the Echo Cancelation structure to use * @ingroup effects */ typedef enum OMX_AUDIO_ECHOCANTYPE { OMX_AUDIO_EchoCanOff = 0, /**< Echo Cancellation is disabled */ - OMX_AUDIO_EchoCanNormal, /**< Echo Cancellation normal operation - + OMX_AUDIO_EchoCanNormal, /**< Echo Cancellation normal operation - echo from plastics and face */ - OMX_AUDIO_EchoCanHFree, /**< Echo Cancellation optimized for + OMX_AUDIO_EchoCanHFree, /**< Echo Cancellation optimized for Hands Free operation */ - OMX_AUDIO_EchoCanCarKit, /**< Echo Cancellation optimized for + OMX_AUDIO_EchoCanCarKit, /**< Echo Cancellation optimized for Car Kit (longer echo) */ - OMX_AUDIO_EchoCanKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_AUDIO_EchoCanKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_AUDIO_EchoCanVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_AUDIO_EchoCanMax = 0x7FFFFFFF } OMX_AUDIO_ECHOCANTYPE; - /** Enable / Disable for echo cancelation, which removes undesired echo's * from the audio * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1368,11 +1301,10 @@ typedef struct OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE { OMX_AUDIO_ECHOCANTYPE eEchoCancelation; /**< Echo cancelation settings */ } OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE; - /** Enable / Disable for noise reduction, which undesired noise from * the audio * @ingroup effects - */ + */ typedef struct OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ @@ -1388,4 +1320,3 @@ typedef struct OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE { #endif /* File EOF */ - diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Broadcom.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Broadcom.h index 0ecdb445de..e36f4cbd2e 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Broadcom.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Broadcom.h @@ -110,7 +110,6 @@ The boolean \code{bEnabled} value determines whether the component uses the standard IJG quality tables when encoding images. */ - /* OMX_IndexConfigTimeInvalidStartTime: Invalid Start Times */ /* This allows clock clients to supply a start time notification to the @@ -211,7 +210,7 @@ an audio rendering component has received but have not been played. /* OMX_IndexConfigBrcmPoolMemAllocSize: Pool memory usage values */ /* This config allows the client to query how much memory is being used by -the component for any image pools. +the component for any image pools. */ /* OMX_IndexConfigDisplayRegion: Display Region */ @@ -332,8 +331,6 @@ Set the \code{layer} that the image will appear on with the \code{layer} field. */ - - /* OMX_IndexParamSource: Source Image Configuration */ typedef enum OMX_SOURCETYPE { OMX_SOURCE_WHITE = 0, // all white images @@ -497,13 +494,13 @@ typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS { OMX_U32 coeff[16]; } OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS; /* -This config sets the platform-specific audio downmixing coefficients for the +This config sets the platform-specific audio downmixing coefficients for the audio mixer component. The coefficients are 16.16 fixed point. -The even coefficients contribute to the left channel. -The odd coefficients contribute to the right channel. -L' = coeff[0] * sample[N] + coeff[2] * sample[N+1] + coeff[4] * sample[N+2] + coeff[6] * sample[N+3] +The even coefficients contribute to the left channel. +The odd coefficients contribute to the right channel. +L' = coeff[0] * sample[N] + coeff[2] * sample[N+1] + coeff[4] * sample[N+2] + coeff[6] * sample[N+3] + coeff[8] * sample[N+4] + coeff[10] * sample[N+5] + coeff[12] * sample[N+6] + coeff[14] * sample[N+7] -R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + coeff[7] * sample[N+3] +R' = coeff[1] * sample[N] + coeff[3] * sample[N+1] + coeff[5] * sample[N+2] + coeff[7] * sample[N+3] + coeff[9] * sample[N+4] + coeff[11] * sample[N+5] + coeff[13] * sample[N+6] + coeff[15] * sample[N+7] \code{coeff} describes the downmixing coefficients @@ -517,7 +514,7 @@ typedef struct OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8 { OMX_U32 coeff[64]; } OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8; /* -This config sets the platform-specific audio downmixing coefficients for the +This config sets the platform-specific audio downmixing coefficients for the audio mixer component. The coefficients are 16.16 fixed point. The coefficients are a 8*8 mixing matrix from 8 input channels to 8 outputs channels @@ -533,9 +530,9 @@ typedef struct OMX_CONFIG_BRCMAUDIOMAXSAMPLE { OMX_TICKS nTimeStamp; } OMX_CONFIG_BRCMAUDIOMAXSAMPLE; /* -This gets the largest sample produced (after downmixing with OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8) -since this config was last read. The nTimestamp is the earliest timestamp processed. -This can be used for DRC schemes +This gets the largest sample produced (after downmixing with OMX_CONFIG_BRCMAUDIODOWNMIXCOEFFICIENTS8x8) +since this config was last read. The nTimestamp is the earliest timestamp processed. +This can be used for DRC schemes \code{coeff} maximum sample seen in current block */ @@ -686,7 +683,6 @@ Default is \code{"272"}. */ - /* OMX_IndexConfigTransitionControl: Transition Control */ typedef struct OMX_CONFIG_TRANSITIONCONTROLTYPE { OMX_U32 nSize; @@ -722,13 +718,11 @@ is \code{nPosStart}. The last frame position generated is increment by \code{nFrameIncrement}. */ - /* This parameter is used to provide a callback function pointer for release events. It is used for internal clients on VideoCore. */ - /* OMX_IndexConfigAudioMonoTrackControl: Dual Mono Control */ typedef enum OMX_AUDIOMONOTRACKOPERATIONSTYPE { OMX_AUDIOMONOTRACKOPERATIONS_NOP, @@ -827,7 +821,6 @@ can be reset by setting this parameter with all three fields set to zero. */ - /* OMX_IndexParamImagePoolExternal: Client Allocated Image Pools */ struct opaque_vc_pool_s; typedef struct opaque_vc_pool_s OMX_BRCM_POOL_T; @@ -846,7 +839,6 @@ This config allows the client to pass in handles to pre-allocated image pools for use within the component. */ - struct _IL_FIFO_T; typedef struct OMX_PARAM_RUTILFIFOINFOTYPE { OMX_U32 nSize; @@ -1002,7 +994,6 @@ typedef struct OMX_CONFIG_BRCMCAMERASTATSTYPE { // for backward compatibility typedef struct OMX_CONFIG_BRCMCAMERASTATSTYPE OMX_CONFIG_BRCMCAMERASTATS; - #define OMX_BRCM_MAXIOPERFBANDS 10 typedef struct { OMX_U32 count[OMX_BRCM_MAXIOPERFBANDS]; @@ -1076,7 +1067,6 @@ typedef struct OMX_CONFIG_REDEYEREMOVALTYPE { reduced complexity algorithm to reduce the processing time. */ - typedef enum OMX_FACEDETECTIONCONTROLTYPE { OMX_FaceDetectionControlNone, /**< Disables face detection */ OMX_FaceDetectionControlOn, /**< Enables face detection */ @@ -1290,7 +1280,6 @@ must be requested at least every 200ms if the indicator is to remain on. */ - /* OMX_IndexParamCameraFlashType: Select flash type */ typedef enum OMX_CAMERAFLASHTYPE { OMX_CameraFlashDefault, @@ -1366,7 +1355,6 @@ typedef struct OMX_CONFIG_BRCMAUDIOTRACKGAPLESSPLAYBACKTYPE { This config allows communication between components to facilitate gapless playback. */ - /* OMX_IndexConfigBrcmAudioTrackChangeControl: Configure gapless/crossfaded audio track change. */ typedef struct OMX_CONFIG_BRCMAUDIOTRACKCHANGECONTROLTYPE { OMX_U32 nSize; @@ -1524,7 +1512,6 @@ typedef struct OMX_PARAM_BRCMDISABLEPROPRIETARYTUNNELSTYPE { Tell a source component to refuse to support proprietary tunnelling. Buffers will be used instead. */ - // // Control for memory allocation and component-internal buffering // @@ -1592,7 +1579,6 @@ typedef struct OMX_CONFIG_CAMERAINFOTYPE OMX_U32 xFocalLength; } OMX_CONFIG_CAMERAINFOTYPE; - typedef enum OMX_CONFIG_CAMERAFEATURESSHUTTER { OMX_CameraFeaturesShutterUnknown, OMX_CameraFeaturesShutterNotPresent, @@ -1610,7 +1596,6 @@ typedef struct OMX_CONFIG_CAMERAFEATURESTYPE OMX_BOOL bHasLens; } OMX_CONFIG_CAMERAFEATURESTYPE; - //Should be added to the spec as part of IL416c /* OMX_IndexConfigRequestCallback: Enable config change notifications. */ typedef struct OMX_CONFIG_REQUESTCALLBACKTYPE @@ -1892,7 +1877,6 @@ for the buffers). . */ - /* OMX_IndexParamBrcmThreadAffinity: Control the CPU affinity of component thread(s) */ typedef enum OMX_BRCMTHREADAFFINITYTYPE { OMX_BrcmThreadAffinityCPU0, @@ -2080,7 +2064,6 @@ typedef struct OMX_PARAM_BRCMDRMENCRYPTIONTYPE Query/set the DRM encryption scheme used by a port writing out data. */ - /* OMX_IndexConfigBufferStall: Advertise buffer stall state */ typedef struct OMX_CONFIG_BUFFERSTALLTYPE { @@ -2166,7 +2149,7 @@ typedef struct OMX_BRCMVEGLIMAGETYPE OMX_U32 nFlipped; /* Non-zero -> vertically flipped image */ } OMX_BRCMVEGLIMAGETYPE; -/* Provides field of view +/* Provides field of view */ typedef struct OMX_CONFIG_BRCMFOVTYPE { @@ -2191,7 +2174,7 @@ act as a clock reference source or act as a slave. /* OMX_IndexConfigEncLevelExtension: AVC Override encode capabilities */ typedef struct OMX_VIDEO_CONFIG_LEVEL_EXTEND { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nCustomMaxMBPS; /**< Specifies maximum macro-blocks per second */ @@ -2278,7 +2261,7 @@ to minimise fragmentation of output buffers. /* OMX_IndexConfigBrcmBufferFlagFilter: Filter buffers based on flags */ /* -This control can be set to request that buffers are conditionally forwarded on +This control can be set to request that buffers are conditionally forwarded on output ports based on matching flags set on that buffer. */ @@ -2605,7 +2588,6 @@ typedef struct OMX_PARAM_CAMERARXTIMING_TYPE { OMX_U32 nCpiTiming2; } OMX_PARAM_CAMERARXTIMING_TYPE; - /* OMX_IndexParamBrcmBayerOrder: Bayer order */ typedef enum OMX_BAYERORDERTYPE { OMX_BayerOrderRGGB = 0, diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Component.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Component.h index b0b9b817c8..5e983859c4 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Component.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Component.h @@ -1,23 +1,23 @@ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -34,11 +34,9 @@ extern "C" { #endif /* __cplusplus */ - - /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include "OMX_Audio.h" @@ -47,12 +45,12 @@ extern "C" { #include "OMX_Other.h" /** @ingroup comp */ -typedef enum OMX_PORTDOMAINTYPE { - OMX_PortDomainAudio, - OMX_PortDomainVideo, - OMX_PortDomainImage, +typedef enum OMX_PORTDOMAINTYPE { + OMX_PortDomainAudio, + OMX_PortDomainVideo, + OMX_PortDomainImage, OMX_PortDomainOther, - OMX_PortDomainKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_PortDomainKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_PortDomainVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_PortDomainMax = 0x7ffffff } OMX_PORTDOMAINTYPE; @@ -71,7 +69,7 @@ typedef struct OMX_PARAM_PORTDEFINITIONTYPE { When disabled a port is unpopulated. A disabled port is not populated with buffers on a transition to IDLE. */ OMX_BOOL bPopulated; /**< Port is populated with all of its buffers as indicated by - nBufferCountActual. A disabled port is always unpopulated. + nBufferCountActual. A disabled port is always unpopulated. An enabled port is populated on a transition to OMX_StateIdle and unpopulated on a transition to loaded. */ OMX_PORTDOMAINTYPE eDomain; /**< Domain of the port. Determines the contents of metadata below. */ @@ -86,26 +84,26 @@ typedef struct OMX_PARAM_PORTDEFINITIONTYPE { } OMX_PARAM_PORTDEFINITIONTYPE; /** @ingroup comp */ -typedef struct OMX_PARAM_U32TYPE { - OMX_U32 nSize; /**< Size of this structure, in Bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nPortIndex; /**< port that this structure applies to */ +typedef struct OMX_PARAM_U32TYPE { + OMX_U32 nSize; /**< Size of this structure, in Bytes */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_U32 nPortIndex; /**< port that this structure applies to */ OMX_U32 nU32; /**< U32 value */ } OMX_PARAM_U32TYPE; /** @ingroup rpm */ typedef enum OMX_SUSPENSIONPOLICYTYPE { OMX_SuspensionDisabled, /**< No suspension; v1.0 behavior */ - OMX_SuspensionEnabled, /**< Suspension allowed */ - OMX_SuspensionPolicyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_SuspensionEnabled, /**< Suspension allowed */ + OMX_SuspensionPolicyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_SuspensionPolicyStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_SuspensionPolicyMax = 0x7fffffff } OMX_SUSPENSIONPOLICYTYPE; /** @ingroup rpm */ typedef struct OMX_PARAM_SUSPENSIONPOLICYTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; OMX_SUSPENSIONPOLICYTYPE ePolicy; } OMX_PARAM_SUSPENSIONPOLICYTYPE; @@ -113,22 +111,22 @@ typedef struct OMX_PARAM_SUSPENSIONPOLICYTYPE { typedef enum OMX_SUSPENSIONTYPE { OMX_NotSuspended, /**< component is not suspended */ OMX_Suspended, /**< component is suspended */ - OMX_SuspensionKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_SuspensionKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_SuspensionVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_SuspendMax = 0x7FFFFFFF } OMX_SUSPENSIONTYPE; /** @ingroup rpm */ typedef struct OMX_PARAM_SUSPENSIONTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_SUSPENSIONTYPE eType; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_SUSPENSIONTYPE eType; } OMX_PARAM_SUSPENSIONTYPE ; typedef struct OMX_CONFIG_BOOLEANTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_BOOL bEnabled; + OMX_BOOL bEnabled; } OMX_CONFIG_BOOLEANTYPE; /* Parameter specifying the content uri to use. */ @@ -154,13 +152,12 @@ typedef struct OMX_PARAM_CONTENTPIPETYPE typedef struct OMX_RESOURCECONCEALMENTTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_BOOL bResourceConcealmentForbidden; /**< disallow the use of resource concealment - methods (like degrading algorithm quality to - lower resource consumption or functional bypass) + OMX_BOOL bResourceConcealmentForbidden; /**< disallow the use of resource concealment + methods (like degrading algorithm quality to + lower resource consumption or functional bypass) on a component as a resolution to resource conflicts. */ } OMX_RESOURCECONCEALMENTTYPE; - /** @ingroup metadata */ typedef enum OMX_METADATACHARSETTYPE { OMX_MetadataCharsetUnknown = 0, @@ -171,7 +168,7 @@ typedef enum OMX_METADATACHARSETTYPE { OMX_MetadataCharsetJavaConformantUTF8, OMX_MetadataCharsetUTF7, OMX_MetadataCharsetImapUTF7, - OMX_MetadataCharsetUTF16LE, + OMX_MetadataCharsetUTF16LE, OMX_MetadataCharsetUTF16BE, OMX_MetadataCharsetGB12345, OMX_MetadataCharsetHZGB2312, @@ -197,7 +194,7 @@ typedef enum OMX_METADATACHARSETTYPE { OMX_MetadataCharsetISO2022JP1, OMX_MetadataCharsetISOEUCJP, OMX_MetadataCharsetSMS7Bit, - OMX_MetadataCharsetKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataCharsetKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataCharsetVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataCharsetTypeMax= 0x7FFFFFFF } OMX_METADATACHARSETTYPE; @@ -209,7 +206,7 @@ typedef enum OMX_METADATASCOPETYPE OMX_MetadataScopeTopLevel, OMX_MetadataScopePortLevel, OMX_MetadataScopeNodeLevel, - OMX_MetadataScopeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataScopeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataScopeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataScopeTypeMax = 0x7fffffff } OMX_METADATASCOPETYPE; @@ -220,7 +217,7 @@ typedef enum OMX_METADATASEARCHMODETYPE OMX_MetadataSearchValueSizeByIndex, OMX_MetadataSearchItemByIndex, OMX_MetadataSearchNextItemByKey, - OMX_MetadataSearchKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MetadataSearchKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MetadataSearchVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MetadataSearchTypeMax = 0x7fffffff } OMX_METADATASEARCHMODETYPE; @@ -241,7 +238,7 @@ typedef struct OMX_CONFIG_METADATAITEMTYPE OMX_VERSIONTYPE nVersion; OMX_METADATASCOPETYPE eScopeMode; OMX_U32 nScopeSpecifier; - OMX_U32 nMetadataItemIndex; + OMX_U32 nMetadataItemIndex; OMX_METADATASEARCHMODETYPE eSearchMode; OMX_METADATACHARSETTYPE eKeyCharset; OMX_U8 nKeySizeUsed; @@ -270,30 +267,30 @@ typedef struct OMX_CONFIG_CONTAINERNODEIDTYPE OMX_VERSIONTYPE nVersion; OMX_BOOL bAllKeys; OMX_U32 nParentNodeID; - OMX_U32 nNodeIndex; - OMX_U32 nNodeID; + OMX_U32 nNodeIndex; + OMX_U32 nNodeID; OMX_STRING cNodeName; OMX_BOOL bIsLeafType; } OMX_CONFIG_CONTAINERNODEIDTYPE; /** @ingroup metadata */ -typedef struct OMX_PARAM_METADATAFILTERTYPE -{ - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_BOOL bAllKeys; /* if true then this structure refers to all keys and +typedef struct OMX_PARAM_METADATAFILTERTYPE +{ + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_BOOL bAllKeys; /* if true then this structure refers to all keys and * the three key fields below are ignored */ OMX_METADATACHARSETTYPE eKeyCharset; - OMX_U32 nKeySizeUsed; - OMX_U8 nKey [128]; + OMX_U32 nKeySizeUsed; + OMX_U8 nKey [128]; OMX_U32 nLanguageCountrySizeUsed; OMX_U8 nLanguageCountry[128]; - OMX_BOOL bEnabled; /* if true then key is part of filter (e.g. + OMX_BOOL bEnabled; /* if true then key is part of filter (e.g. * retained for query later). If false then * key is not part of filter */ -} OMX_PARAM_METADATAFILTERTYPE; +} OMX_PARAM_METADATAFILTERTYPE; -/** The OMX_HANDLETYPE structure defines the component handle. The component +/** The OMX_HANDLETYPE structure defines the component handle. The component * handle is used to access all of the component's public methods and also * contains pointers to the component's private data area. The component * handle is initialized by the OMX core (with help from the component) @@ -301,7 +298,7 @@ typedef struct OMX_PARAM_METADATAFILTERTYPE * successfully loaded, the application can safely access any of the * component's public functions (although some may return an error because * the state is inappropriate for the access). - * + * * @ingroup comp */ typedef struct OMX_COMPONENTTYPE @@ -312,26 +309,26 @@ typedef struct OMX_COMPONENTTYPE function will fill in this value. */ OMX_U32 nSize; - /** nVersion is the version of the OMX specification that the structure - is built against. It is the responsibility of the creator of this - structure to initialize this value and every user of this structure - should verify that it knows how to use the exact version of + /** nVersion is the version of the OMX specification that the structure + is built against. It is the responsibility of the creator of this + structure to initialize this value and every user of this structure + should verify that it knows how to use the exact version of this structure found herein. */ OMX_VERSIONTYPE nVersion; - /** pComponentPrivate is a pointer to the component private data area. - This member is allocated and initialized by the component when the - component is first loaded. The application should not access this + /** pComponentPrivate is a pointer to the component private data area. + This member is allocated and initialized by the component when the + component is first loaded. The application should not access this data area. */ OMX_PTR pComponentPrivate; - /** pApplicationPrivate is a pointer that is a parameter to the - OMX_GetHandle method, and contains an application private value - provided by the IL client. This application private data is + /** pApplicationPrivate is a pointer that is a parameter to the + OMX_GetHandle method, and contains an application private value + provided by the IL client. This application private data is returned to the IL Client by OMX in all callbacks */ OMX_PTR pApplicationPrivate; - /** refer to OMX_GetComponentVersion in OMX_core.h or the OMX IL + /** refer to OMX_GetComponentVersion in OMX_core.h or the OMX IL specification for details on the GetComponentVersion method. */ OMX_ERRORTYPE (*GetComponentVersion)( @@ -341,7 +338,7 @@ typedef struct OMX_COMPONENTTYPE OMX_OUT OMX_VERSIONTYPE* pSpecVersion, OMX_OUT OMX_UUIDTYPE* pComponentUUID); - /** refer to OMX_SendCommand in OMX_core.h or the OMX IL + /** refer to OMX_SendCommand in OMX_core.h or the OMX IL specification for details on the SendCommand method. */ OMX_ERRORTYPE (*SendCommand)( @@ -350,43 +347,39 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nParam1, OMX_IN OMX_PTR pCmdData); - /** refer to OMX_GetParameter in OMX_core.h or the OMX IL + /** refer to OMX_GetParameter in OMX_core.h or the OMX IL specification for details on the GetParameter method. */ OMX_ERRORTYPE (*GetParameter)( - OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nParamIndex, + OMX_IN OMX_HANDLETYPE hComponent, + OMX_IN OMX_INDEXTYPE nParamIndex, OMX_INOUT OMX_PTR pComponentParameterStructure); - - /** refer to OMX_SetParameter in OMX_core.h or the OMX IL + /** refer to OMX_SetParameter in OMX_core.h or the OMX IL specification for details on the SetParameter method. */ OMX_ERRORTYPE (*SetParameter)( - OMX_IN OMX_HANDLETYPE hComponent, + OMX_IN OMX_HANDLETYPE hComponent, OMX_IN OMX_INDEXTYPE nIndex, OMX_IN OMX_PTR pComponentParameterStructure); - - /** refer to OMX_GetConfig in OMX_core.h or the OMX IL + /** refer to OMX_GetConfig in OMX_core.h or the OMX IL specification for details on the GetConfig method. */ OMX_ERRORTYPE (*GetConfig)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nIndex, + OMX_IN OMX_INDEXTYPE nIndex, OMX_INOUT OMX_PTR pComponentConfigStructure); - - /** refer to OMX_SetConfig in OMX_core.h or the OMX IL + /** refer to OMX_SetConfig in OMX_core.h or the OMX IL specification for details on the SetConfig method. */ OMX_ERRORTYPE (*SetConfig)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_INDEXTYPE nIndex, + OMX_IN OMX_INDEXTYPE nIndex, OMX_IN OMX_PTR pComponentConfigStructure); - - /** refer to OMX_GetExtensionIndex in OMX_core.h or the OMX IL + /** refer to OMX_GetExtensionIndex in OMX_core.h or the OMX IL specification for details on the GetExtensionIndex method. */ OMX_ERRORTYPE (*GetExtensionIndex)( @@ -394,51 +387,49 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_STRING cParameterName, OMX_OUT OMX_INDEXTYPE* pIndexType); - - /** refer to OMX_GetState in OMX_core.h or the OMX IL + /** refer to OMX_GetState in OMX_core.h or the OMX IL specification for details on the GetState method. */ OMX_ERRORTYPE (*GetState)( OMX_IN OMX_HANDLETYPE hComponent, OMX_OUT OMX_STATETYPE* pState); - /** The ComponentTunnelRequest method will interact with another OMX component to determine if tunneling is possible and to setup the - tunneling. The return codes for this method can be used to + tunneling. The return codes for this method can be used to determine if tunneling is not possible, or if tunneling is not - supported. - - Base profile components (i.e. non-interop) do not support this - method and should return OMX_ErrorNotImplemented + supported. - The interop profile component MUST support tunneling to another - interop profile component with a compatible port parameters. + Base profile components (i.e. non-interop) do not support this + method and should return OMX_ErrorNotImplemented + + The interop profile component MUST support tunneling to another + interop profile component with a compatible port parameters. A component may also support proprietary communication. - - If proprietary communication is supported the negotiation of - proprietary communication is done outside of OMX in a vendor - specific way. It is only required that the proper result be - returned and the details of how the setup is done is left - to the component implementation. - + + If proprietary communication is supported the negotiation of + proprietary communication is done outside of OMX in a vendor + specific way. It is only required that the proper result be + returned and the details of how the setup is done is left + to the component implementation. + When this method is invoked when nPort in an output port, the component will: - 1. Populate the pTunnelSetup structure with the output port's + 1. Populate the pTunnelSetup structure with the output port's requirements and constraints for the tunnel. When this method is invoked when nPort in an input port, the component will: - 1. Query the necessary parameters from the output port to + 1. Query the necessary parameters from the output port to determine if the ports are compatible for tunneling 2. If the ports are compatible, the component should store the tunnel step provided by the output port 3. Determine which port (either input or output) is the buffer supplier, and call OMX_SetParameter on the output port to indicate this selection. - + The component will return from this call within 5 msec. - + @param [in] hComp Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle method. @@ -446,7 +437,7 @@ typedef struct OMX_COMPONENTTYPE nPort is used to select the port on the component to be used for tunneling. @param [in] hTunneledComp - Handle of the component to tunnel with. This is the component + Handle of the component to tunnel with. This is the component handle returned by the call to the OMX_GetHandle method. When this parameter is 0x0 the component should setup the port for communication with the application / IL Client. @@ -469,9 +460,9 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nPort, OMX_IN OMX_HANDLETYPE hTunneledComp, OMX_IN OMX_U32 nTunneledPort, - OMX_INOUT OMX_TUNNELSETUPTYPE* pTunnelSetup); + OMX_INOUT OMX_TUNNELSETUPTYPE* pTunnelSetup); - /** refer to OMX_UseBuffer in OMX_core.h or the OMX IL + /** refer to OMX_UseBuffer in OMX_core.h or the OMX IL specification for details on the UseBuffer method. @ingroup buf */ @@ -483,7 +474,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nSizeBytes, OMX_IN OMX_U8* pBuffer); - /** refer to OMX_AllocateBuffer in OMX_core.h or the OMX IL + /** refer to OMX_AllocateBuffer in OMX_core.h or the OMX IL specification for details on the AllocateBuffer method. @ingroup buf */ @@ -494,7 +485,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_PTR pAppPrivate, OMX_IN OMX_U32 nSizeBytes); - /** refer to OMX_FreeBuffer in OMX_core.h or the OMX IL + /** refer to OMX_FreeBuffer in OMX_core.h or the OMX IL specification for details on the FreeBuffer method. @ingroup buf */ @@ -503,7 +494,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_U32 nPortIndex, OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); - /** refer to OMX_EmptyThisBuffer in OMX_core.h or the OMX IL + /** refer to OMX_EmptyThisBuffer in OMX_core.h or the OMX IL specification for details on the EmptyThisBuffer method. @ingroup buf */ @@ -511,7 +502,7 @@ typedef struct OMX_COMPONENTTYPE OMX_IN OMX_HANDLETYPE hComponent, OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); - /** refer to OMX_FillThisBuffer in OMX_core.h or the OMX IL + /** refer to OMX_FillThisBuffer in OMX_core.h or the OMX IL specification for details on the FillThisBuffer method. @ingroup buf */ @@ -526,10 +517,10 @@ typedef struct OMX_COMPONENTTYPE Handle of the component to be accessed. This is the component handle returned by the call to the GetHandle function. @param [in] pCallbacks - pointer to an OMX_CALLBACKTYPE structure used to provide the + pointer to an OMX_CALLBACKTYPE structure used to provide the callback information to the component @param [in] pAppData - pointer to an application defined value. It is anticipated that + pointer to an application defined value. It is anticipated that the application will pass a pointer to a data structure or a "this pointer" in this area to allow the callback (in the application) to determine the context of the call @@ -539,7 +530,7 @@ typedef struct OMX_COMPONENTTYPE */ OMX_ERRORTYPE (*SetCallbacks)( OMX_IN OMX_HANDLETYPE hComponent, - OMX_IN OMX_CALLBACKTYPE* pCallbacks, + OMX_IN OMX_CALLBACKTYPE* pCallbacks, OMX_IN OMX_PTR pAppData); /** ComponentDeInit method is used to deinitialize the component diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Core.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Core.h index d883d94cec..660243bc98 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Core.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Core.h @@ -1,23 +1,23 @@ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -47,14 +47,13 @@ extern "C" { /* Each OMX header shall include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include "OMX_Index.h" - /** The OMX_COMMANDTYPE enumeration is used to specify the action in the - * OMX_SendCommand macro. + * OMX_SendCommand macro. * @ingroup core */ typedef enum OMX_COMMANDTYPE @@ -64,13 +63,11 @@ typedef enum OMX_COMMANDTYPE OMX_CommandPortDisable, /**< Disable a port on a component. */ OMX_CommandPortEnable, /**< Enable a port on a component. */ OMX_CommandMarkBuffer, /**< Mark a component/buffer for observation */ - OMX_CommandKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_CommandKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_CommandVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_CommandMax = 0X7FFFFFFF } OMX_COMMANDTYPE; - - /** The OMX_STATETYPE enumeration is used to indicate or change the component * state. This enumeration reflects the current state of the component when * used with the OMX_GetState macro or becomes the parameter in a state change @@ -87,28 +84,28 @@ typedef enum OMX_COMMANDTYPE * specified configuration and will transition to the idle state if the * allocation is successful. If the component cannot successfully * transition to the idle state for any reason, the state of the component - * shall be fully rolled back to the Loaded state (e.g. all allocated + * shall be fully rolled back to the Loaded state (e.g. all allocated * resources shall be released). When the component receives the command * to go to the Executing state, it shall begin processing buffers by * sending all input buffers it holds to the application. While * the component is in the Idle state, the application may also send the * Pause command. If the component receives the pause command while in the - * Idle state, the component shall send all input buffers it holds to the + * Idle state, the component shall send all input buffers it holds to the * application, but shall not begin processing buffers. This will allow the * application to prefill buffers. - * + * * @ingroup comp */ typedef enum OMX_STATETYPE { - OMX_StateInvalid, /**< component has detected that it's internal data + OMX_StateInvalid, /**< component has detected that it's internal data structures are corrupted to the point that it cannot determine it's state properly */ OMX_StateLoaded, /**< component has been loaded but has not completed initialization. The OMX_SetParameter macro - and the OMX_GetParameter macro are the only - valid macros allowed to be sent to the + and the OMX_GetParameter macro are the only + valid macros allowed to be sent to the component in this state. */ OMX_StateIdle, /**< component initialization has been completed successfully and the component is ready to @@ -116,17 +113,17 @@ typedef enum OMX_STATETYPE OMX_StateExecuting, /**< component has accepted the start command and is processing data (if data is available) */ OMX_StatePause, /**< component has received pause command */ - OMX_StateWaitForResources, /**< component is waiting for resources, either after + OMX_StateWaitForResources, /**< component is waiting for resources, either after preemption or before it gets the resources requested. See specification for complete details. */ - OMX_StateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_StateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_StateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_StateMax = 0X7FFFFFFF } OMX_STATETYPE; -/** The OMX_ERRORTYPE enumeration defines the standard OMX Errors. These - * errors should cover most of the common failure cases. However, - * vendors are free to add additional error messages of their own as +/** The OMX_ERRORTYPE enumeration defines the standard OMX Errors. These + * errors should cover most of the common failure cases. However, + * vendors are free to add additional error messages of their own as * long as they follow these rules: * 1. Vendor error messages shall be in the range of 0x90000000 to * 0x9000FFFF. @@ -197,25 +194,25 @@ typedef enum OMX_ERRORTYPE /** This error occurs when trying to transition into the state you are already in */ OMX_ErrorSameState = (OMX_S32) 0x80001012, - /** Resources allocated to an executing or paused component have been + /** Resources allocated to an executing or paused component have been preempted, causing the component to return to the idle state */ - OMX_ErrorResourcesPreempted = (OMX_S32) 0x80001013, + OMX_ErrorResourcesPreempted = (OMX_S32) 0x80001013, - /** A non-supplier port sends this error to the IL client (via the EventHandler callback) + /** A non-supplier port sends this error to the IL client (via the EventHandler callback) during the allocation of buffers (on a transition from the LOADED to the IDLE state or - on a port restart) when it deems that it has waited an unusually long time for the supplier + on a port restart) when it deems that it has waited an unusually long time for the supplier to send it an allocated buffer via a UseBuffer call. */ OMX_ErrorPortUnresponsiveDuringAllocation = (OMX_S32) 0x80001014, - /** A non-supplier port sends this error to the IL client (via the EventHandler callback) - during the deallocation of buffers (on a transition from the IDLE to LOADED state or - on a port stop) when it deems that it has waited an unusually long time for the supplier + /** A non-supplier port sends this error to the IL client (via the EventHandler callback) + during the deallocation of buffers (on a transition from the IDLE to LOADED state or + on a port stop) when it deems that it has waited an unusually long time for the supplier to request the deallocation of a buffer header via a FreeBuffer call. */ OMX_ErrorPortUnresponsiveDuringDeallocation = (OMX_S32) 0x80001015, - /** A supplier port sends this error to the IL client (via the EventHandler callback) - during the stopping of a port (either on a transition from the IDLE to LOADED - state or a port stop) when it deems that it has waited an unusually long time for + /** A supplier port sends this error to the IL client (via the EventHandler callback) + during the stopping of a port (either on a transition from the IDLE to LOADED + state or a port stop) when it deems that it has waited an unusually long time for the non-supplier to return a buffer via an EmptyThisBuffer or FillThisBuffer call. */ OMX_ErrorPortUnresponsiveDuringStop = (OMX_S32) 0x80001016, @@ -223,7 +220,7 @@ typedef enum OMX_ERRORTYPE OMX_ErrorIncorrectStateTransition = (OMX_S32) 0x80001017, /* Attempting a command that is not allowed during the present state. */ - OMX_ErrorIncorrectStateOperation = (OMX_S32) 0x80001018, + OMX_ErrorIncorrectStateOperation = (OMX_S32) 0x80001018, /** The values encapsulated in the parameter or config structure are not supported. */ OMX_ErrorUnsupportedSetting = (OMX_S32) 0x80001019, @@ -243,12 +240,12 @@ typedef enum OMX_ERRORTYPE /** Component suspended due to an inability to acquire dynamic resources */ OMX_ErrorDynamicResourcesUnavailable = (OMX_S32) 0x8000101E, - /** When the macroblock error reporting is enabled the component returns new error + /** When the macroblock error reporting is enabled the component returns new error for every frame that has errors */ OMX_ErrorMbErrorsInFrame = (OMX_S32) 0x8000101F, /** A component reports this error when it cannot parse or determine the format of an input stream. */ - OMX_ErrorFormatNotDetected = (OMX_S32) 0x80001020, + OMX_ErrorFormatNotDetected = (OMX_S32) 0x80001020, /** The content open operation failed. */ OMX_ErrorContentPipeOpenFailed = (OMX_S32) 0x80001021, @@ -262,12 +259,12 @@ typedef enum OMX_ERRORTYPE /** Tunneling is unsupported by the component*/ OMX_ErrorTunnelingUnsupported = (OMX_S32) 0x80001024, - OMX_ErrorKhronosExtensions = (OMX_S32)0x8F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ErrorKhronosExtensions = (OMX_S32)0x8F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ErrorVendorStartUnused = (OMX_S32)0x90000000, /**< Reserved region for introducing Vendor Extensions */ /** Disk Full error */ OMX_ErrorDiskFull = (OMX_S32) 0x90000001, - + /** Max file size is reached */ OMX_ErrorMaxFileSize = (OMX_S32) 0x90000002, @@ -314,69 +311,66 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { OMX_U8 cRole[OMX_MAX_STRINGNAME_SIZE]; /**< name of standard component which defines component role */ } OMX_PARAM_COMPONENTROLETYPE; -/** End of Stream Buffer Flag: +/** End of Stream Buffer Flag: * - * A component sets EOS when it has no more data to emit on a particular - * output port. Thus an output port shall set EOS on the last buffer it - * emits. A component's determination of when an output port should + * A component sets EOS when it has no more data to emit on a particular + * output port. Thus an output port shall set EOS on the last buffer it + * emits. A component's determination of when an output port should * cease sending data is implemenation specific. * @ingroup buf */ -#define OMX_BUFFERFLAG_EOS 0x00000001 +#define OMX_BUFFERFLAG_EOS 0x00000001 -/** Start Time Buffer Flag: +/** Start Time Buffer Flag: * * The source of a stream (e.g. a demux component) sets the STARTTIME * flag on the buffer that contains the starting timestamp for the * stream. The starting timestamp corresponds to the first data that * should be displayed at startup or after a seek. * The first timestamp of the stream is not necessarily the start time. - * For instance, in the case of a seek to a particular video frame, - * the target frame may be an interframe. Thus the first buffer of + * For instance, in the case of a seek to a particular video frame, + * the target frame may be an interframe. Thus the first buffer of * the stream will be the intra-frame preceding the target frame and * the starttime will occur with the target frame (with any other * required frames required to reconstruct the target intervening). * - * The STARTTIME flag is directly associated with the buffer's - * timestamp ' thus its association to buffer data and its + * The STARTTIME flag is directly associated with the buffer's + * timestamp ' thus its association to buffer data and its * propagation is identical to the timestamp's. * - * When a Sync Component client receives a buffer with the - * STARTTIME flag it shall perform a SetConfig on its sync port + * When a Sync Component client receives a buffer with the + * STARTTIME flag it shall perform a SetConfig on its sync port * using OMX_ConfigTimeClientStartTime and passing the buffer's * timestamp. - * + * * @ingroup buf */ #define OMX_BUFFERFLAG_STARTTIME 0x00000002 - - -/** Decode Only Buffer Flag: +/** Decode Only Buffer Flag: * * The source of a stream (e.g. a demux component) sets the DECODEONLY * flag on any buffer that should shall be decoded but should not be - * displayed. This flag is used, for instance, when a source seeks to - * a target interframe that requires the decode of frames preceding the - * target to facilitate the target's reconstruction. In this case the - * source would emit the frames preceding the target downstream + * displayed. This flag is used, for instance, when a source seeks to + * a target interframe that requires the decode of frames preceding the + * target to facilitate the target's reconstruction. In this case the + * source would emit the frames preceding the target downstream * but mark them as decode only. * - * The DECODEONLY is associated with buffer data and propagated in a + * The DECODEONLY is associated with buffer data and propagated in a * manner identical to the buffer timestamp. * - * A component that renders data should ignore all buffers with + * A component that renders data should ignore all buffers with * the DECODEONLY flag set. - * + * * @ingroup buf */ #define OMX_BUFFERFLAG_DECODEONLY 0x00000004 - -/* Data Corrupt Flag: This flag is set when the IL client believes the data in the associated buffer is corrupt +/* Data Corrupt Flag: This flag is set when the IL client believes the data in the associated buffer is corrupt * @ingroup buf */ @@ -384,29 +378,29 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { /* End of Frame: The buffer contains exactly one end of frame and no data * occurs after the end of frame. This flag is an optional hint. The absence - * of this flag does not imply the absence of an end of frame within the buffer. + * of this flag does not imply the absence of an end of frame within the buffer. * @ingroup buf */ #define OMX_BUFFERFLAG_ENDOFFRAME 0x00000010 -/* Sync Frame Flag: This flag is set when the buffer content contains a coded sync frame ' - * a frame that has no dependency on any other frame information +/* Sync Frame Flag: This flag is set when the buffer content contains a coded sync frame ' + * a frame that has no dependency on any other frame information * @ingroup buf */ #define OMX_BUFFERFLAG_SYNCFRAME 0x00000020 /* Extra data present flag: there is extra data appended to the data stream - * residing in the buffer - * @ingroup buf + * residing in the buffer + * @ingroup buf */ #define OMX_BUFFERFLAG_EXTRADATA 0x00000040 -/** Codec Config Buffer Flag: +/** Codec Config Buffer Flag: * OMX_BUFFERFLAG_CODECCONFIG is an optional flag that is set by an * output port when all bytes in the buffer form part or all of a set of * codec specific configuration data. Examples include SPS/PPS nal units * for OMX_VIDEO_CodingAVC or AudioSpecificConfig data for -* OMX_AUDIO_CodingAAC. Any component that for a given stream sets +* OMX_AUDIO_CodingAAC. Any component that for a given stream sets * OMX_BUFFERFLAG_CODECCONFIG shall not mix codec configuration bytes * with frame data in the same buffer, and shall send all buffers * containing codec configuration bytes before any buffers containing @@ -419,57 +413,55 @@ typedef struct OMX_PARAM_COMPONENTROLETYPE { */ #define OMX_BUFFERFLAG_CODECCONFIG 0x00000080 - - /** @ingroup buf */ typedef struct OMX_BUFFERHEADERTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U8* pBuffer; /**< Pointer to actual block of memory + OMX_U8* pBuffer; /**< Pointer to actual block of memory that is acting as the buffer */ OMX_U32 nAllocLen; /**< size of the buffer allocated, in bytes */ - OMX_U32 nFilledLen; /**< number of bytes currently in the + OMX_U32 nFilledLen; /**< number of bytes currently in the buffer */ OMX_U32 nOffset; /**< start offset of valid data in bytes from the start of the buffer */ OMX_PTR pAppPrivate; /**< pointer to any data the application wants to associate with this buffer */ OMX_PTR pPlatformPrivate; /**< pointer to any data the platform - wants to associate with this buffer */ + wants to associate with this buffer */ OMX_PTR pInputPortPrivate; /**< pointer to any data the input port wants to associate with this buffer */ OMX_PTR pOutputPortPrivate; /**< pointer to any data the output port wants to associate with this buffer */ - OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will generate a + OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will generate a mark event upon processing this buffer. */ - OMX_PTR pMarkData; /**< Application specific data associated with - the mark sent on a mark event to disambiguate + OMX_PTR pMarkData; /**< Application specific data associated with + the mark sent on a mark event to disambiguate this mark from others. */ OMX_U32 nTickCount; /**< Optional entry that the component and application can update with a tick count when they access the component. This value should be in microseconds. Since this is a value relative to an arbitrary - starting point, this value cannot be used + starting point, this value cannot be used to determine absolute time. This is an optional entry and not all components will update it.*/ - OMX_TICKS nTimeStamp; /**< Timestamp corresponding to the sample - starting at the first logical sample - boundary in the buffer. Timestamps of + OMX_TICKS nTimeStamp; /**< Timestamp corresponding to the sample + starting at the first logical sample + boundary in the buffer. Timestamps of successive samples within the buffer may - be inferred by adding the duration of the + be inferred by adding the duration of the of the preceding buffer to the timestamp of the preceding buffer.*/ OMX_U32 nFlags; /**< buffer specific flags */ - OMX_U32 nOutputPortIndex; /**< The index of the output port (if any) using + OMX_U32 nOutputPortIndex; /**< The index of the output port (if any) using this buffer */ OMX_U32 nInputPortIndex; /**< The index of the input port (if any) using this buffer */ } OMX_BUFFERHEADERTYPE; -/** The OMX_EXTRADATATYPE enumeration is used to define the +/** The OMX_EXTRADATATYPE enumeration is used to define the * possible extra data payload types. * NB: this enum is binary backwards compatible with the previous * OMX_EXTRADATA_QUANT define. This should be replaced with @@ -477,12 +469,12 @@ typedef struct OMX_BUFFERHEADERTYPE */ typedef enum OMX_EXTRADATATYPE { - OMX_ExtraDataNone = 0, /**< Indicates that no more extra data sections follow */ + OMX_ExtraDataNone = 0, /**< Indicates that no more extra data sections follow */ OMX_ExtraDataQuantization, /**< The data payload contains quantization data */ - OMX_ExtraDataKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ExtraDataKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ExtraDataVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_ExtraDataSequenceGap, /**< Indicates a gap in sequence numbers, data is uint32_t + OMX_ExtraDataSequenceGap, /**< Indicates a gap in sequence numbers, data is uint32_t saying how many frames were lost */ OMX_ExtraDataDecodeOnlyUntil, /**< Indicates a timestamp until which all data should be decoded only, and the first packets after should generate @@ -492,10 +484,9 @@ typedef enum OMX_EXTRADATATYPE OMX_ExtraDataMax = 0x7FFFFFFF } OMX_EXTRADATATYPE; - typedef struct OMX_OTHER_EXTRADATATYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_EXTRADATATYPE eType; /* Extra Data type */ OMX_U32 nDataSize; /* Size of the supporting data to follow */ @@ -508,7 +499,7 @@ typedef struct OMX_PORT_PARAM_TYPE { OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPorts; /**< The number of ports for this component */ OMX_U32 nStartPortNumber; /** first port number for this type of port */ -} OMX_PORT_PARAM_TYPE; +} OMX_PORT_PARAM_TYPE; /** @ingroup comp */ typedef enum OMX_EVENTTYPE @@ -517,14 +508,14 @@ typedef enum OMX_EVENTTYPE OMX_EventError, /**< component has detected an error condition */ OMX_EventMark, /**< component has detected a buffer mark */ OMX_EventPortSettingsChanged, /**< component is reported a port settings change */ - OMX_EventBufferFlag, /**< component has detected an EOS */ + OMX_EventBufferFlag, /**< component has detected an EOS */ OMX_EventResourcesAcquired, /**< component has been granted resources and is automatically starting the state change from OMX_StateWaitForResources to OMX_StateIdle. */ OMX_EventComponentResumed, /**< Component resumed due to reacquisition of resources */ OMX_EventDynamicResourcesAvailable, /**< Component has acquired previously unavailable dynamic resources */ OMX_EventPortFormatDetected, /**< Component has detected a supported format. */ - OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_EventKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_EventVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_EventParamOrConfigChanged, /* Should be added to the main spec as part of IL416c */ OMX_EventMax = 0x7FFFFFFF @@ -536,7 +527,7 @@ typedef struct OMX_CALLBACKTYPE event of interest occurs. Events are defined in the OMX_EVENTTYPE enumeration. Please see that enumeration for details of what will be returned for each type of event. Callbacks should not return - an error to the component, so if an error occurs, the application + an error to the component, so if an error occurs, the application shall handle it internally. This is a blocking call. The application should return from this call within 5 msec to avoid @@ -546,14 +537,14 @@ typedef struct OMX_CALLBACKTYPE handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param eEvent Event that the component wants to notify the application about. @param nData1 - nData will be the OMX_ERRORTYPE for an error event and will be + nData will be the OMX_ERRORTYPE for an error event and will be an OMX_COMMANDTYPE for a command complete event and OMX_INDEXTYPE for a OMX_PortSettingsChanged event. @param nData2 nData2 will hold further information related to the event. Can be OMX_STATETYPE for @@ -572,21 +563,21 @@ typedef struct OMX_CALLBACKTYPE OMX_IN OMX_PTR pEventData); /** The EmptyBufferDone method is used to return emptied buffers from an - input port back to the application for reuse. This is a blocking call + input port back to the application for reuse. This is a blocking call so the application should not attempt to refill the buffers during this call, but should queue them and refill them in another thread. There is no error return, so the application shall handle any errors generated - internally. - + internally. + The application should return from this call within 5 msec. - + @param hComponent handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param pBuffer pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer @@ -599,23 +590,23 @@ typedef struct OMX_CALLBACKTYPE OMX_IN OMX_BUFFERHEADERTYPE* pBuffer); /** The FillBufferDone method is used to return filled buffers from an - output port back to the application for emptying and then reuse. - This is a blocking call so the application should not attempt to - empty the buffers during this call, but should queue the buffers - and empty them in another thread. There is no error return, so - the application shall handle any errors generated internally. The + output port back to the application for emptying and then reuse. + This is a blocking call so the application should not attempt to + empty the buffers during this call, but should queue the buffers + and empty them in another thread. There is no error return, so + the application shall handle any errors generated internally. The application shall also update the buffer header to indicate the - number of bytes placed into the buffer. + number of bytes placed into the buffer. The application should return from this call within 5 msec. - + @param hComponent handle of the component to access. This is the component handle returned by the call to the GetHandle function. @param pAppData - pointer to an application defined value that was provided in the + pointer to an application defined value that was provided in the pAppData parameter to the OMX_GetHandle method for the component. - This application defined value is provided so that the application + This application defined value is provided so that the application can have a component specific context when receiving the callback. @param pBuffer pointer to an OMX_BUFFERHEADERTYPE structure allocated with UseBuffer @@ -639,13 +630,12 @@ typedef enum OMX_BUFFERSUPPLIERTYPE or don't care */ OMX_BufferSupplyInput, /**< input port supplies the buffers */ OMX_BufferSupplyOutput, /**< output port supplies the buffers */ - OMX_BufferSupplyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_BufferSupplyKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_BufferSupplyVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_BufferSupplyMax = 0x7FFFFFFF } OMX_BUFFERSUPPLIERTYPE; - -/** buffer supplier parameter +/** buffer supplier parameter * @ingroup tun */ typedef struct OMX_PARAM_BUFFERSUPPLIERTYPE { @@ -655,62 +645,60 @@ typedef struct OMX_PARAM_BUFFERSUPPLIERTYPE { OMX_BUFFERSUPPLIERTYPE eBufferSupplier; /**< buffer supplier */ } OMX_PARAM_BUFFERSUPPLIERTYPE; - -/**< indicates that buffers received by an input port of a tunnel - may not modify the data in the buffers +/**< indicates that buffers received by an input port of a tunnel + may not modify the data in the buffers @ingroup tun */ -#define OMX_PORTTUNNELFLAG_READONLY 0x00000001 - +#define OMX_PORTTUNNELFLAG_READONLY 0x00000001 /** The OMX_TUNNELSETUPTYPE structure is used to pass data from an output port to an input port as part the two ComponentTunnelRequest calls - resulting from a OMX_SetupTunnel call from the IL Client. + resulting from a OMX_SetupTunnel call from the IL Client. @ingroup tun - */ + */ typedef struct OMX_TUNNELSETUPTYPE { OMX_U32 nTunnelFlags; /**< bit flags for tunneling */ OMX_BUFFERSUPPLIERTYPE eSupplier; /**< supplier preference */ -} OMX_TUNNELSETUPTYPE; +} OMX_TUNNELSETUPTYPE; /* OMX Component headers is included to enable the core to use - macros for functions into the component for OMX release 1.0. + macros for functions into the component for OMX release 1.0. Developers should not access any structures or data from within the component header directly */ /* TO BE REMOVED - #include */ -/** GetComponentVersion will return information about the component. +/** GetComponentVersion will return information about the component. This is a blocking call. This macro will go directly from the application to the component (via a core macro). The component will return from this call within 5 msec. @param [in] hComponent handle of component to execute the command @param [out] pComponentName - pointer to an empty string of length 128 bytes. The component - will write its name into this string. The name will be - terminated by a single zero byte. The name of a component will - be 127 bytes or less to leave room for the trailing zero byte. + pointer to an empty string of length 128 bytes. The component + will write its name into this string. The name will be + terminated by a single zero byte. The name of a component will + be 127 bytes or less to leave room for the trailing zero byte. An example of a valid component name is "OMX.ABC.ChannelMixer\0". @param [out] pComponentVersion - pointer to an OMX Version structure that the component will fill - in. The component will fill in a value that indicates the - component version. NOTE: the component version is NOT the same - as the OMX Specification version (found in all structures). The - component version is defined by the vendor of the component and + pointer to an OMX Version structure that the component will fill + in. The component will fill in a value that indicates the + component version. NOTE: the component version is NOT the same + as the OMX Specification version (found in all structures). The + component version is defined by the vendor of the component and its value is entirely up to the component vendor. @param [out] pSpecVersion - pointer to an OMX Version structure that the component will fill - in. The SpecVersion is the version of the specification that the - component was built against. Please note that this value may or - may not match the structure's version. For example, if the - component was built against the 2.0 specification, but the - application (which creates the structure is built against the + pointer to an OMX Version structure that the component will fill + in. The SpecVersion is the version of the specification that the + component was built against. Please note that this value may or + may not match the structure's version. For example, if the + component was built against the 2.0 specification, but the + application (which creates the structure is built against the 1.0 specification the versions would be different. @param [out] pComponentUUID - pointer to the UUID of the component which will be filled in by - the component. The UUID is a unique identifier that is set at - RUN time for the component and is unique to each instantion of + pointer to the UUID of the component which will be filled in by + the component. The UUID is a unique identifier that is set at + RUN time for the component and is unique to each instantion of the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -730,49 +718,48 @@ typedef struct OMX_TUNNELSETUPTYPE pSpecVersion, \ pComponentUUID) /* Macro End */ - /** Send a command to the component. This call is a non-blocking call. The component should check the parameters and then queue the command - to the component thread to be executed. The component thread shall - send the EventHandler() callback at the conclusion of the command. + to the component thread to be executed. The component thread shall + send the EventHandler() callback at the conclusion of the command. This macro will go directly from the application to the component (via a core macro). The component will return from this call within 5 msec. - + When the command is "OMX_CommandStateSet" the component will queue a state transition to the new state idenfied in nParam. - + When the command is "OMX_CommandFlush", to flush a port's buffer queues, - the command will force the component to return all buffers NOT CURRENTLY - BEING PROCESSED to the application, in the order in which the buffers + the command will force the component to return all buffers NOT CURRENTLY + BEING PROCESSED to the application, in the order in which the buffers were received. - - When the command is "OMX_CommandPortDisable" or + + When the command is "OMX_CommandPortDisable" or "OMX_CommandPortEnable", the component's port (given by the value of - nParam) will be stopped or restarted. - + nParam) will be stopped or restarted. + When the command "OMX_CommandMarkBuffer" is used to mark a buffer, the pCmdData will point to a OMX_MARKTYPE structure containing the component handle of the component to examine the buffer chain for the mark. nParam1 contains the index of the port on which the buffer mark is applied. - Specification text for more details. - + Specification text for more details. + @param [in] hComponent handle of component to execute the command @param [in] Cmd Command for the component to execute @param [in] nParam - Parameter for the command to be executed. When Cmd has the value - OMX_CommandStateSet, value is a member of OMX_STATETYPE. When Cmd has - the value OMX_CommandFlush, value of nParam indicates which port(s) - to flush. -1 is used to flush all ports a single port index will + Parameter for the command to be executed. When Cmd has the value + OMX_CommandStateSet, value is a member of OMX_STATETYPE. When Cmd has + the value OMX_CommandFlush, value of nParam indicates which port(s) + to flush. -1 is used to flush all ports a single port index will only flush that port. When Cmd has the value "OMX_CommandPortDisable" - or "OMX_CommandPortEnable", the component's port is given by + or "OMX_CommandPortEnable", the component's port is given by the value of nParam. When Cmd has the value "OMX_CommandMarkBuffer" the components pot is given by the value of nParam. @param [in] pCmdData Parameter pointing to the OMX_MARKTYPE structure when Cmd has the value - "OMX_CommandMarkBuffer". + "OMX_CommandMarkBuffer". @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -789,22 +776,21 @@ typedef struct OMX_TUNNELSETUPTYPE nParam, \ pCmdData) /* Macro End */ - -/** The OMX_GetParameter macro will get one of the current parameter - settings from the component. This macro cannot only be invoked when +/** The OMX_GetParameter macro will get one of the current parameter + settings from the component. This macro cannot only be invoked when the component is in the OMX_StateInvalid state. The nParamIndex parameter is used to indicate which structure is being requested from - the component. The application shall allocate the correct structure - and shall fill in the structure size and version information before + the component. The application shall allocate the correct structure + and shall fill in the structure size and version information before invoking this macro. When the parameter applies to a port, the caller shall fill in the appropriate nPortIndex value indicating the - port on which the parameter applies. If the component has not had - any settings changed, then the component should return a set of - valid DEFAULT parameters for the component. This is a blocking - call. - + port on which the parameter applies. If the component has not had + any settings changed, then the component should return a set of + valid DEFAULT parameters for the component. This is a blocking + call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -812,7 +798,7 @@ typedef struct OMX_TUNNELSETUPTYPE Index of the structure to be filled. This value is from the OMX_INDEXTYPE enumeration. @param [in,out] pComponentParameterStructure - Pointer to application allocated structure to be filled by the + Pointer to application allocated structure to be filled by the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -828,22 +814,21 @@ typedef struct OMX_TUNNELSETUPTYPE nParamIndex, \ pComponentParameterStructure) /* Macro End */ - /** The OMX_SetParameter macro will send an initialization parameter structure to a component. Each structure shall be sent one at a time, in a separate invocation of the macro. This macro can only be invoked when the component is in the OMX_StateLoaded state, or the - port is disabled (when the parameter applies to a port). The + port is disabled (when the parameter applies to a port). The nParamIndex parameter is used to indicate which structure is being - passed to the component. The application shall allocate the - correct structure and shall fill in the structure size and version + passed to the component. The application shall allocate the + correct structure and shall fill in the structure size and version information (as well as the actual data) before invoking this macro. The application is free to dispose of this structure after the call - as the component is required to copy any data it shall retain. This - is a blocking call. - + as the component is required to copy any data it shall retain. This + is a blocking call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -867,19 +852,18 @@ typedef struct OMX_TUNNELSETUPTYPE nParamIndex, \ pComponentParameterStructure) /* Macro End */ +/** The OMX_GetConfig macro will get one of the configuration structures + from a component. This macro can be invoked anytime after the + component has been loaded. The nParamIndex call parameter is used to + indicate which structure is being requested from the component. The + application shall allocate the correct structure and shall fill in the + structure size and version information before invoking this macro. + If the component has not had this configuration parameter sent before, + then the component should return a set of valid DEFAULT values for the + component. This is a blocking call. -/** The OMX_GetConfig macro will get one of the configuration structures - from a component. This macro can be invoked anytime after the - component has been loaded. The nParamIndex call parameter is used to - indicate which structure is being requested from the component. The - application shall allocate the correct structure and shall fill in the - structure size and version information before invoking this macro. - If the component has not had this configuration parameter sent before, - then the component should return a set of valid DEFAULT values for the - component. This is a blocking call. - The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -887,13 +871,13 @@ typedef struct OMX_TUNNELSETUPTYPE Index of the structure to be filled. This value is from the OMX_INDEXTYPE enumeration. @param [in,out] pComponentConfigStructure - pointer to application allocated structure to be filled by the + pointer to application allocated structure to be filled by the component. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup comp -*/ +*/ #define OMX_GetConfig( \ hComponent, \ nConfigIndex, \ @@ -903,19 +887,18 @@ typedef struct OMX_TUNNELSETUPTYPE nConfigIndex, \ pComponentConfigStructure) /* Macro End */ - -/** The OMX_SetConfig macro will send one of the configuration +/** The OMX_SetConfig macro will send one of the configuration structures to a component. Each structure shall be sent one at a time, - each in a separate invocation of the macro. This macro can be invoked - anytime after the component has been loaded. The application shall - allocate the correct structure and shall fill in the structure size - and version information (as well as the actual data) before invoking - this macro. The application is free to dispose of this structure after - the call as the component is required to copy any data it shall retain. - This is a blocking call. - + each in a separate invocation of the macro. This macro can be invoked + anytime after the component has been loaded. The application shall + allocate the correct structure and shall fill in the structure size + and version information (as well as the actual data) before invoking + this macro. The application is free to dispose of this structure after + the call as the component is required to copy any data it shall retain. + This is a blocking call. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -939,23 +922,22 @@ typedef struct OMX_TUNNELSETUPTYPE nConfigIndex, \ pComponentConfigStructure) /* Macro End */ - -/** The OMX_GetExtensionIndex macro will invoke a component to translate - a vendor specific configuration or parameter string into an OMX - structure index. There is no requirement for the vendor to support - this command for the indexes already found in the OMX_INDEXTYPE - enumeration (this is done to save space in small components). The +/** The OMX_GetExtensionIndex macro will invoke a component to translate + a vendor specific configuration or parameter string into an OMX + structure index. There is no requirement for the vendor to support + this command for the indexes already found in the OMX_INDEXTYPE + enumeration (this is done to save space in small components). The component shall support all vendor supplied extension indexes not found - in the master OMX_INDEXTYPE enumeration. This is a blocking call. - + in the master OMX_INDEXTYPE enumeration. This is a blocking call. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the GetHandle function. @param [in] cParameterName OMX_STRING that shall be less than 128 characters long including - the trailing null byte. This is the string that will get + the trailing null byte. This is the string that will get translated by the component into a configuration index. @param [out] pIndexType a pointer to a OMX_INDEXTYPE to receive the index value. @@ -973,19 +955,18 @@ typedef struct OMX_TUNNELSETUPTYPE cParameterName, \ pIndexType) /* Macro End */ - -/** The OMX_GetState macro will invoke the component to get the current +/** The OMX_GetState macro will invoke the component to get the current state of the component and place the state value into the location - pointed to by pState. - + pointed to by pState. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] pState pointer to the location to receive the state. The value returned - is one of the OMX_STATETYPE members + is one of the OMX_STATETYPE members @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -998,19 +979,18 @@ typedef struct OMX_TUNNELSETUPTYPE hComponent, \ pState) /* Macro End */ - /** The OMX_UseBuffer macro will request that the component use - a buffer (and allocate its own buffer header) already allocated - by another component, or by the IL Client. This is a blocking + a buffer (and allocate its own buffer header) already allocated + by another component, or by the IL Client. This is a blocking call. - + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive the + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header @return OMX_ERRORTYPE If the command successfully executes, the return code will be @@ -1033,26 +1013,25 @@ typedef struct OMX_TUNNELSETUPTYPE nSizeBytes, \ pBuffer) - -/** The OMX_AllocateBuffer macro will request that the component allocate - a new buffer and buffer header. The component will allocate the - buffer and the buffer header and return a pointer to the buffer +/** The OMX_AllocateBuffer macro will request that the component allocate + a new buffer and buffer header. The component will allocate the + buffer and the buffer header and return a pointer to the buffer header. This is a blocking call. - + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header @param [in] nPortIndex nPortIndex is used to select the port on the component the buffer will be used with. The port can be found by using the nPortIndex value as an index into the Port Definition array of the component. @param [in] pAppPrivate - pAppPrivate is used to initialize the pAppPrivate member of the + pAppPrivate is used to initialize the pAppPrivate member of the buffer header structure. @param [in] nSizeBytes size of the buffer to allocate. Used when bAllocateNew is true. @@ -1060,7 +1039,7 @@ typedef struct OMX_TUNNELSETUPTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup comp buf - */ + */ #define OMX_AllocateBuffer( \ hComponent, \ ppBuffer, \ @@ -1074,15 +1053,14 @@ typedef struct OMX_TUNNELSETUPTYPE pAppPrivate, \ nSizeBytes) /* Macro End */ - /** The OMX_FreeBuffer macro will release a buffer header from the component - which was allocated using either OMX_AllocateBuffer or OMX_UseBuffer. If - the component allocated the buffer (see the OMX_UseBuffer macro) then - the component shall free the buffer and buffer header. This is a - blocking call. - + which was allocated using either OMX_AllocateBuffer or OMX_UseBuffer. If + the component allocated the buffer (see the OMX_UseBuffer macro) then + the component shall free the buffer and buffer header. This is a + blocking call. + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1106,18 +1084,17 @@ typedef struct OMX_TUNNELSETUPTYPE nPortIndex, \ pBuffer) /* Macro End */ - -/** The OMX_EmptyThisBuffer macro will send a buffer full of data to an +/** The OMX_EmptyThisBuffer macro will send a buffer full of data to an input port of a component. The buffer will be emptied by the component and returned to the application via the EmptyBufferDone call back. This is a non-blocking call in that the component will record the buffer - and return immediately and then empty the buffer, later, at the proper - time. As expected, this macro may be invoked only while the component + and return immediately and then empty the buffer, later, at the proper + time. As expected, this macro may be invoked only while the component is in the OMX_StateExecuting. If nPortIndex does not specify an input - port, the component shall return an error. - + port, the component shall return an error. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1136,18 +1113,17 @@ typedef struct OMX_TUNNELSETUPTYPE hComponent, \ pBuffer) /* Macro End */ - -/** The OMX_FillThisBuffer macro will send an empty buffer to an +/** The OMX_FillThisBuffer macro will send an empty buffer to an output port of a component. The buffer will be filled by the component and returned to the application via the FillBufferDone call back. This is a non-blocking call in that the component will record the buffer - and return immediately and then fill the buffer, later, at the proper - time. As expected, this macro may be invoked only while the component + and return immediately and then fill the buffer, later, at the proper + time. As expected, this macro may be invoked only while the component is in the OMX_ExecutingState. If nPortIndex does not specify an output - port, the component shall return an error. - + port, the component shall return an error. + The component should return from this call within 5 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @@ -1166,19 +1142,17 @@ typedef struct OMX_TUNNELSETUPTYPE hComponent, \ pBuffer) /* Macro End */ - - /** The OMX_UseEGLImage macro will request that the component use a EGLImage provided by EGL (and allocate its own buffer header) This is a blocking call. - + The component should return from this call within 20 msec. - + @param [in] hComponent Handle of the component to be accessed. This is the component handle returned by the call to the OMX_GetHandle function. @param [out] ppBuffer - pointer to an OMX_BUFFERHEADERTYPE structure used to receive the + pointer to an OMX_BUFFERHEADERTYPE structure used to receive the pointer to the buffer header. Note that the memory location used for this buffer is NOT visible to the IL Client. @param [in] nPortIndex @@ -1186,13 +1160,13 @@ typedef struct OMX_TUNNELSETUPTYPE be used with. The port can be found by using the nPortIndex value as an index into the Port Definition array of the component. @param [in] pAppPrivate - pAppPrivate is used to initialize the pAppPrivate member of the + pAppPrivate is used to initialize the pAppPrivate member of the buffer header structure. @param [in] eglImage eglImage contains the handle of the EGLImage to use as a buffer on the - specified port. The component is expected to validate properties of + specified port. The component is expected to validate properties of the EGLImage against the configuration of the port to ensure the component - can use the EGLImage as a buffer. + can use the EGLImage as a buffer. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -1213,8 +1187,8 @@ typedef struct OMX_TUNNELSETUPTYPE /** The OMX_Init method is used to initialize the OMX core. It shall be the first call made into OMX and it should only be executed one time without - an interviening OMX_Deinit call. - + an interviening OMX_Deinit call. + The core should return from this call within 20 msec. @return OMX_ERRORTYPE @@ -1224,14 +1198,13 @@ typedef struct OMX_TUNNELSETUPTYPE */ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void); - -/** The OMX_Deinit method is used to deinitialize the OMX core. It shall be - the last call made into OMX. In the event that the core determines that - thare are components loaded when this call is made, the core may return +/** The OMX_Deinit method is used to deinitialize the OMX core. It shall be + the last call made into OMX. In the event that the core determines that + thare are components loaded when this call is made, the core may return with an error rather than try to unload the components. - + The core should return from this call within 20 msec. - + @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @@ -1239,7 +1212,6 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Init(void); */ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void); - /** The OMX_ComponentNameEnum method will enumerate through all the names of recognised valid components in the system. This function is provided as a means to detect all the components in the system run-time. There is @@ -1248,23 +1220,23 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void); installation of new components, it is only requried to detect newly installed components when the first call to enumerate component names is made (i.e. when nIndex is 0x0). - + The core should return from this call in 20 msec. - + @param [out] cComponentName pointer to a null terminated string with the component name. The names of the components are strings less than 127 bytes in length - plus the trailing null for a maximum size of 128 bytes. An example - of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are - assigned by the vendor, but shall start with "OMX." and then have + plus the trailing null for a maximum size of 128 bytes. An example + of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are + assigned by the vendor, but shall start with "OMX." and then have the Vendor designation next. @param [in] nNameLength - number of characters in the cComponentName string. With all - component name strings restricted to less than 128 characters + number of characters in the cComponentName string. With all + component name strings restricted to less than 128 characters (including the trailing null) it is recomended that the caller provide a input string for the cComponentName of 128 characters. @param [in] nIndex - number containing the enumeration index for the component. + number containing the enumeration index for the component. Multiple calls to OMX_ComponentNameEnum with increasing values of nIndex will enumerate through the component names in the system until OMX_ErrorNoMore is returned. The value of nIndex @@ -1272,7 +1244,7 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_Deinit(void); in the system. @return OMX_ERRORTYPE If the command successfully executes, the return code will be - OMX_ErrorNone. When the value of nIndex exceeds the number of + OMX_ErrorNone. When the value of nIndex exceeds the number of components in the system minus 1, OMX_ErrorNoMore will be returned. Otherwise the appropriate OMX error will be returned. @ingroup core @@ -1282,21 +1254,20 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( OMX_IN OMX_U32 nNameLength, OMX_IN OMX_U32 nIndex); - /** The OMX_GetHandle method will locate the component specified by the component name given, load that component into memory and then invoke - the component's methods to create an instance of the component. - + the component's methods to create an instance of the component. + The core should return from this call within 20 msec. - + @param [out] pHandle pointer to an OMX_HANDLETYPE pointer to be filled in by this method. @param [in] cComponentName pointer to a null terminated string with the component name. The names of the components are strings less than 127 bytes in length - plus the trailing null for a maximum size of 128 bytes. An example - of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are - assigned by the vendor, but shall start with "OMX." and then have + plus the trailing null for a maximum size of 128 bytes. An example + of a valid component name is "OMX.TI.AUDIO.DSP.MIXER\0". Names are + assigned by the vendor, but shall start with "OMX." and then have the Vendor designation next. @param [in] pAppData pointer to an application defined value that will be returned @@ -1304,24 +1275,23 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_ComponentNameEnum( of the callback. @param [in] pCallBacks pointer to a OMX_CALLBACKTYPE structure that will be passed to the - component to initialize it with. + component to initialize it with. @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. @ingroup core */ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( - OMX_OUT OMX_HANDLETYPE* pHandle, + OMX_OUT OMX_HANDLETYPE* pHandle, OMX_IN OMX_STRING cComponentName, OMX_IN OMX_PTR pAppData, OMX_IN OMX_CALLBACKTYPE* pCallBacks); - -/** The OMX_FreeHandle method will free a handle allocated by the OMX_GetHandle +/** The OMX_FreeHandle method will free a handle allocated by the OMX_GetHandle method. If the component reference count goes to zero, the component will - be unloaded from memory. - - The core should return from this call within 20 msec when the component is + be unloaded from memory. + + The core should return from this call within 20 msec when the component is in the OMX_StateLoaded state. @param [in] hComponent @@ -1335,39 +1305,37 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_GetHandle( OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_FreeHandle( OMX_IN OMX_HANDLETYPE hComponent); - - /** The OMX_SetupTunnel method will handle the necessary calls to the components to setup the specified tunnel the two components. NOTE: This is an actual method (not a #define macro). This method will make calls into - the component ComponentTunnelRequest method to do the actual tunnel - connection. + the component ComponentTunnelRequest method to do the actual tunnel + connection. - The ComponentTunnelRequest method on both components will be called. - This method shall not be called unless the component is in the + The ComponentTunnelRequest method on both components will be called. + This method shall not be called unless the component is in the OMX_StateLoaded state except when the ports used for the tunnel are disabled. In this case, the component may be in the OMX_StateExecuting, - OMX_StatePause, or OMX_StateIdle states. + OMX_StatePause, or OMX_StateIdle states. The core should return from this call within 20 msec. - + @param [in] hOutput Handle of the component to be accessed. Also this is the handle of the component whose port, specified in the nPortOutput parameter will be used the source for the tunnel. This is the component handle - returned by the call to the OMX_GetHandle function. There is a + returned by the call to the OMX_GetHandle function. There is a requirement that hOutput be the source for the data when tunelling (i.e. nPortOutput is an output port). If 0x0, the component specified in hInput will have it's port specified in nPortInput setup for communication with the application / IL client. @param [in] nPortOutput nPortOutput is used to select the source port on component to be - used in the tunnel. + used in the tunnel. @param [in] hInput This is the component to setup the tunnel with. This is the handle of the component whose port, specified in the nPortInput parameter will be used the destination for the tunnel. This is the component handle - returned by the call to the OMX_GetHandle function. There is a + returned by the call to the OMX_GetHandle function. There is a requirement that hInput be the destination for the data when tunelling (i.e. nPortInut is an input port). If 0x0, the component specified in hOutput will have it's port specified in nPortPOutput @@ -1378,9 +1346,9 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_FreeHandle( @return OMX_ERRORTYPE If the command successfully executes, the return code will be OMX_ErrorNone. Otherwise the appropriate OMX error will be returned. - When OMX_ErrorNotImplemented is returned, one or both components is + When OMX_ErrorNotImplemented is returned, one or both components is a non-interop component and does not support tunneling. - + On failure, the ports of both components are setup for communication with the application / IL Client. @ingroup core tun @@ -1390,50 +1358,50 @@ OMX_API OMX_ERRORTYPE OMX_APIENTRY OMX_SetupTunnel( OMX_IN OMX_U32 nPortOutput, OMX_IN OMX_HANDLETYPE hInput, OMX_IN OMX_U32 nPortInput); - + /** @ingroup cp */ OMX_API OMX_ERRORTYPE OMX_GetContentPipe( OMX_OUT OMX_HANDLETYPE *hPipe, OMX_IN OMX_STRING szURI); /** The OMX_GetComponentsOfRole method will return the number of components that support the given - role and (if the compNames field is non-NULL) the names of those components. The call will fail if + role and (if the compNames field is non-NULL) the names of those components. The call will fail if an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the client should: * first call this function with the compNames field NULL to determine the number of component names - * second call this function with the compNames field pointing to an array of names allocated + * second call this function with the compNames field pointing to an array of names allocated according to the number returned by the first call. The core should return from this call within 5 msec. - + @param [in] role - This is generic standard component name consisting only of component class + This is generic standard component name consisting only of component class name and the type within that class (e.g. 'audio_decoder.aac'). @param [inout] pNumComps - This is used both as input and output. - + This is used both as input and output. + If compNames is NULL, the input is ignored and the output specifies how many components support the given role. - - If compNames is not NULL, on input it bounds the size of the input structure and + + If compNames is not NULL, on input it bounds the size of the input structure and on output, it specifies the number of components string names listed within the compNames parameter. @param [inout] compNames - If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings which accepts - a list of the names of all physical components that implement the specified standard component name. + If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings which accepts + a list of the names of all physical components that implement the specified standard component name. Each name is NULL terminated. numComps indicates the number of names. @ingroup core */ -OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( +OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( OMX_IN OMX_STRING role, OMX_INOUT OMX_U32 *pNumComps, OMX_INOUT OMX_U8 **compNames); /** The OMX_GetRolesOfComponent method will return the number of roles supported by the given - component and (if the roles field is non-NULL) the names of those roles. The call will fail if + component and (if the roles field is non-NULL) the names of those roles. The call will fail if an insufficiently sized array of names is supplied. To ensure the array is sufficiently sized the client should: * first call this function with the roles field NULL to determine the number of role names - * second call this function with the roles field pointing to an array of names allocated + * second call this function with the roles field pointing to an array of names allocated according to the number returned by the first call. The core should return from this call within 5 msec. @@ -1441,20 +1409,20 @@ OMX_API OMX_ERRORTYPE OMX_GetComponentsOfRole ( @param [in] compName This is the name of the component being queried about. @param [inout] pNumRoles - This is used both as input and output. - + This is used both as input and output. + If roles is NULL, the input is ignored and the output specifies how many roles the component supports. - - If compNames is not NULL, on input it bounds the size of the input structure and + + If compNames is not NULL, on input it bounds the size of the input structure and on output, it specifies the number of roles string names listed within the roles parameter. @param [out] roles - If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings - which accepts a list of the names of all standard components roles implemented on the + If NULL this field is ignored. If non-NULL this points to an array of 128-byte strings + which accepts a list of the names of all standard components roles implemented on the specified component name. numComps indicates the number of names. @ingroup core */ -OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( - OMX_IN OMX_STRING compName, +OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( + OMX_IN OMX_STRING compName, OMX_INOUT OMX_U32 *pNumRoles, OMX_OUT OMX_U8 **roles); @@ -1464,4 +1432,3 @@ OMX_API OMX_ERRORTYPE OMX_GetRolesOfComponent ( #endif /* File EOF */ - diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_IVCommon.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_IVCommon.h index 2140d28c8c..2afd96c66d 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_IVCommon.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_IVCommon.h @@ -1,27 +1,27 @@ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/** +/** * @file OMX_IVCommon.h - OpenMax IL version 1.1.2 * The structures needed by Video and Image components to exchange * parameters and configuration data with the components. @@ -36,7 +36,7 @@ extern "C" { /** * Each OMX header must include all required header files to allow the header * to compile without errors. The includes below are required for this header - * file to compile successfully + * file to compile successfully */ #include "OMX_Core.h" @@ -46,9 +46,8 @@ extern "C" { * @{ */ - -/** - * Enumeration defining possible uncompressed image/video formats. +/** + * Enumeration defining possible uncompressed image/video formats. * * ENUMS: * Unused : Placeholder value when format is N/A @@ -98,7 +97,7 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_Format16bitBGR565, OMX_COLOR_Format18bitRGB666, OMX_COLOR_Format18bitARGB1665, - OMX_COLOR_Format19bitARGB1666, + OMX_COLOR_Format19bitARGB1666, OMX_COLOR_Format24bitRGB888, OMX_COLOR_Format24bitBGR888, OMX_COLOR_Format24bitARGB1887, @@ -121,18 +120,18 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_FormatRawBayer8bit, OMX_COLOR_FormatRawBayer10bit, OMX_COLOR_FormatRawBayer8bitcompressed, - OMX_COLOR_FormatL2, - OMX_COLOR_FormatL4, - OMX_COLOR_FormatL8, - OMX_COLOR_FormatL16, - OMX_COLOR_FormatL24, + OMX_COLOR_FormatL2, + OMX_COLOR_FormatL4, + OMX_COLOR_FormatL8, + OMX_COLOR_FormatL16, + OMX_COLOR_FormatL24, OMX_COLOR_FormatL32, OMX_COLOR_FormatYUV420PackedSemiPlanar, OMX_COLOR_FormatYUV422PackedSemiPlanar, OMX_COLOR_Format18BitBGR666, OMX_COLOR_Format24BitARGB6666, OMX_COLOR_Format24BitABGR6666, - OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_COLOR_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_COLOR_Format32bitABGR8888, OMX_COLOR_Format8bitPalette, @@ -151,37 +150,34 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_FormatMax = 0x7FFFFFFF } OMX_COLOR_FORMATTYPE; - -/** +/** * Defines the matrix for conversion from RGB to YUV or vice versa. - * iColorMatrix should be initialized with the fixed point values + * iColorMatrix should be initialized with the fixed point values * used in converting between formats. */ typedef struct OMX_CONFIG_COLORCONVERSIONTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ OMX_U32 nPortIndex; /**< Port that this struct applies to */ OMX_S32 xColorMatrix[3][3]; /**< Stored in signed Q16 format */ OMX_S32 xColorOffset[4]; /**< Stored in signed Q16 format */ }OMX_CONFIG_COLORCONVERSIONTYPE; - -/** - * Structure defining percent to scale each frame dimension. For example: +/** + * Structure defining percent to scale each frame dimension. For example: * To make the width 50% larger, use fWidth = 1.5 and to make the width * 1/2 the original size, use fWidth = 0.5 */ typedef struct OMX_CONFIG_SCALEFACTORTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version info */ OMX_U32 nPortIndex; /**< Port that this struct applies to */ OMX_S32 xWidth; /**< Fixed point value stored as Q16 */ OMX_S32 xHeight; /**< Fixed point value stored as Q16 */ }OMX_CONFIG_SCALEFACTORTYPE; - -/** - * Enumeration of possible image filter types +/** + * Enumeration of possible image filter types */ typedef enum OMX_IMAGEFILTERTYPE { OMX_ImageFilterNone, @@ -192,12 +188,12 @@ typedef enum OMX_IMAGEFILTERTYPE { OMX_ImageFilterOilPaint, OMX_ImageFilterHatch, OMX_ImageFilterGpen, - OMX_ImageFilterAntialias, - OMX_ImageFilterDeRing, + OMX_ImageFilterAntialias, + OMX_ImageFilterDeRing, OMX_ImageFilterSolarize, - OMX_ImageFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ImageFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ImageFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - + /* Broadcom specific image filters */ OMX_ImageFilterWatercolor, OMX_ImageFilterPastel, @@ -208,7 +204,7 @@ typedef enum OMX_IMAGEFILTERTYPE { OMX_ImageFilterDeInterlaceLineDouble, OMX_ImageFilterDeInterlaceAdvanced, - + OMX_ImageFilterColourSwap, OMX_ImageFilterWashedOut, OMX_ImageFilterColourPoint, @@ -233,14 +229,14 @@ typedef enum OMX_IMAGEFILTERANAGLYPHTYPE { OMX_ImageFilterAnaglyphTABtoMagentaGreen, } OMX_IMAGEFILTERANAGLYPHTYPE; -/** - * Image filter configuration +/** + * Image filter configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eImageFilter : Image filter type enumeration + * nPortIndex : Port that this structure applies to + * eImageFilter : Image filter type enumeration */ typedef struct OMX_CONFIG_IMAGEFILTERTYPE { OMX_U32 nSize; @@ -249,36 +245,34 @@ typedef struct OMX_CONFIG_IMAGEFILTERTYPE { OMX_IMAGEFILTERTYPE eImageFilter; } OMX_CONFIG_IMAGEFILTERTYPE; - -/** - * Customized U and V for color enhancement +/** + * Customized U and V for color enhancement * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * bColorEnhancement : Enable/disable color enhancement - * nCustomizedU : Practical values: 16-240, range: 0-255, value set for + * nCustomizedU : Practical values: 16-240, range: 0-255, value set for * U component - * nCustomizedV : Practical values: 16-240, range: 0-255, value set for + * nCustomizedV : Practical values: 16-240, range: 0-255, value set for * V component */ typedef struct OMX_CONFIG_COLORENHANCEMENTTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_BOOL bColorEnhancement; OMX_U8 nCustomizedU; OMX_U8 nCustomizedV; } OMX_CONFIG_COLORENHANCEMENTTYPE; - -/** - * Define color key and color key mask +/** + * Define color key and color key mask * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nARGBColor : 32bit Alpha, Red, Green, Blue Color * nARGBMask : 32bit Mask for Alpha, Red, Green, Blue channels @@ -291,13 +285,12 @@ typedef struct OMX_CONFIG_COLORKEYTYPE { OMX_U32 nARGBMask; } OMX_CONFIG_COLORKEYTYPE; - -/** - * List of color blend types for pre/post processing +/** + * List of color blend types for pre/post processing * * ENUMS: * None : No color blending present - * AlphaConstant : Function is (alpha_constant * src) + + * AlphaConstant : Function is (alpha_constant * src) + * (1 - alpha_constant) * dst) * AlphaPerPixel : Function is (alpha * src) + (1 - alpha) * dst) * Alternate : Function is alternating pixels from src and dst @@ -313,21 +306,20 @@ typedef enum OMX_COLORBLENDTYPE { OMX_ColorBlendAnd, OMX_ColorBlendOr, OMX_ColorBlendInvert, - OMX_ColorBlendKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ColorBlendKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ColorBlendVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ColorBlendMax = 0x7FFFFFFF } OMX_COLORBLENDTYPE; - -/** - * Color blend configuration +/** + * Color blend configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nRGBAlphaConstant : Constant global alpha values when global alpha is used - * eColorBlend : Color blend type enumeration + * eColorBlend : Color blend type enumeration */ typedef struct OMX_CONFIG_COLORBLENDTYPE { OMX_U32 nSize; @@ -337,16 +329,15 @@ typedef struct OMX_CONFIG_COLORBLENDTYPE { OMX_COLORBLENDTYPE eColorBlend; } OMX_CONFIG_COLORBLENDTYPE; - -/** +/** * Hold frame dimension * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nWidth : Frame width in pixels - * nHeight : Frame height in pixels + * nPortIndex : Port that this structure applies to + * nWidth : Frame width in pixels + * nHeight : Frame height in pixels */ typedef struct OMX_FRAMESIZETYPE { OMX_U32 nSize; @@ -356,71 +347,67 @@ typedef struct OMX_FRAMESIZETYPE { OMX_U32 nHeight; } OMX_FRAMESIZETYPE; - /** - * Rotation configuration + * Rotation configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nRotation : +/- integer rotation value + * nRotation : +/- integer rotation value */ typedef struct OMX_CONFIG_ROTATIONTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; - OMX_S32 nRotation; + OMX_S32 nRotation; } OMX_CONFIG_ROTATIONTYPE; - -/** - * Possible mirroring directions for pre/post processing +/** + * Possible mirroring directions for pre/post processing * * ENUMS: - * None : No mirroring - * Vertical : Vertical mirroring, flip on X axis - * Horizontal : Horizontal mirroring, flip on Y axis + * None : No mirroring + * Vertical : Vertical mirroring, flip on X axis + * Horizontal : Horizontal mirroring, flip on Y axis * Both : Both vertical and horizontal mirroring */ typedef enum OMX_MIRRORTYPE { OMX_MirrorNone = 0, OMX_MirrorVertical, OMX_MirrorHorizontal, - OMX_MirrorBoth, - OMX_MirrorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_MirrorBoth, + OMX_MirrorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MirrorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_MirrorMax = 0x7FFFFFFF + OMX_MirrorMax = 0x7FFFFFFF } OMX_MIRRORTYPE; - -/** - * Mirroring configuration +/** + * Mirroring configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eMirror : Mirror type enumeration + * nPortIndex : Port that this structure applies to + * eMirror : Mirror type enumeration */ typedef struct OMX_CONFIG_MIRRORTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; + OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_MIRRORTYPE eMirror; } OMX_CONFIG_MIRRORTYPE; - -/** - * Position information only +/** + * Position information only * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nX : X coordinate for the point - * nY : Y coordinate for the point - */ + * nX : X coordinate for the point + * nY : Y coordinate for the point + */ typedef struct OMX_CONFIG_POINTTYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; @@ -429,38 +416,36 @@ typedef struct OMX_CONFIG_POINTTYPE { OMX_S32 nY; } OMX_CONFIG_POINTTYPE; - -/** - * Frame size plus position +/** + * Frame size plus position * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nLeft : X Coordinate of the top left corner of the rectangle * nTop : Y Coordinate of the top left corner of the rectangle - * nWidth : Width of the rectangle - * nHeight : Height of the rectangle + * nWidth : Width of the rectangle + * nHeight : Height of the rectangle */ typedef struct OMX_CONFIG_RECTTYPE { OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_S32 nLeft; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_S32 nLeft; OMX_S32 nTop; OMX_U32 nWidth; OMX_U32 nHeight; } OMX_CONFIG_RECTTYPE; - -/** - * Deblocking state; it is required to be set up before starting the codec +/** + * Deblocking state; it is required to be set up before starting the codec * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * bDeblocking : Enable/disable deblocking mode + * bDeblocking : Enable/disable deblocking mode */ typedef struct OMX_PARAM_DEBLOCKINGTYPE { OMX_U32 nSize; @@ -469,14 +454,13 @@ typedef struct OMX_PARAM_DEBLOCKINGTYPE { OMX_BOOL bDeblocking; } OMX_PARAM_DEBLOCKINGTYPE; - -/** - * Stabilization state +/** + * Stabilization state * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * bStab : Enable/disable frame stabilization state */ typedef struct OMX_CONFIG_FRAMESTABTYPE { @@ -486,9 +470,8 @@ typedef struct OMX_CONFIG_FRAMESTABTYPE { OMX_BOOL bStab; } OMX_CONFIG_FRAMESTABTYPE; - -/** - * White Balance control type +/** + * White Balance control type * * STRUCT MEMBERS: * SunLight : Referenced in JSR-234 @@ -505,20 +488,19 @@ typedef enum OMX_WHITEBALCONTROLTYPE { OMX_WhiteBalControlIncandescent, OMX_WhiteBalControlFlash, OMX_WhiteBalControlHorizon, - OMX_WhiteBalControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_WhiteBalControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_WhiteBalControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_WhiteBalControlMax = 0x7FFFFFFF } OMX_WHITEBALCONTROLTYPE; - -/** - * White Balance control configuration +/** + * White Balance control configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eWhiteBalControl : White balance enumeration + * nPortIndex : Port that this structure applies to + * eWhiteBalControl : White balance enumeration */ typedef struct OMX_CONFIG_WHITEBALCONTROLTYPE { OMX_U32 nSize; @@ -527,9 +509,8 @@ typedef struct OMX_CONFIG_WHITEBALCONTROLTYPE { OMX_WHITEBALCONTROLTYPE eWhiteBalControl; } OMX_CONFIG_WHITEBALCONTROLTYPE; - -/** - * Exposure control type +/** + * Exposure control type */ typedef enum OMX_EXPOSURECONTROLTYPE { OMX_ExposureControlOff = 0, @@ -542,7 +523,7 @@ typedef enum OMX_EXPOSURECONTROLTYPE { OMX_ExposureControlBeach, OMX_ExposureControlLargeAperture, OMX_ExposureControlSmallAperture, - OMX_ExposureControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_ExposureControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_ExposureControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_ExposureControlVeryLong, OMX_ExposureControlFixedFps, @@ -552,15 +533,14 @@ typedef enum OMX_EXPOSURECONTROLTYPE { OMX_ExposureControlMax = 0x7FFFFFFF } OMX_EXPOSURECONTROLTYPE; - -/** - * White Balance control configuration +/** + * White Balance control configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * eExposureControl : Exposure control enumeration + * nPortIndex : Port that this structure applies to + * eExposureControl : Exposure control enumeration */ typedef struct OMX_CONFIG_EXPOSURECONTROLTYPE { OMX_U32 nSize; @@ -569,17 +549,16 @@ typedef struct OMX_CONFIG_EXPOSURECONTROLTYPE { OMX_EXPOSURECONTROLTYPE eExposureControl; } OMX_CONFIG_EXPOSURECONTROLTYPE; - -/** - * Defines sensor supported mode. +/** + * Defines sensor supported mode. * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nFrameRate : Single shot mode is indicated by a 0 + * nPortIndex : Port that this structure applies to + * nFrameRate : Single shot mode is indicated by a 0 * bOneShot : Enable for single shot, disable for streaming - * sFrameSize : Framesize + * sFrameSize : Framesize */ typedef struct OMX_PARAM_SENSORMODETYPE { OMX_U32 nSize; @@ -590,14 +569,13 @@ typedef struct OMX_PARAM_SENSORMODETYPE { OMX_FRAMESIZETYPE sFrameSize; } OMX_PARAM_SENSORMODETYPE; - -/** - * Defines contrast level +/** + * Defines contrast level * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * nContrast : Values allowed for contrast -100 to 100, zero means no change */ typedef struct OMX_CONFIG_CONTRASTTYPE { @@ -607,15 +585,14 @@ typedef struct OMX_CONFIG_CONTRASTTYPE { OMX_S32 nContrast; } OMX_CONFIG_CONTRASTTYPE; - -/** - * Defines brightness level +/** + * Defines brightness level * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nBrightness : 0-100% + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nBrightness : 0-100% */ typedef struct OMX_CONFIG_BRIGHTNESSTYPE { OMX_U32 nSize; @@ -624,17 +601,16 @@ typedef struct OMX_CONFIG_BRIGHTNESSTYPE { OMX_U32 nBrightness; } OMX_CONFIG_BRIGHTNESSTYPE; - -/** - * Defines backlight level configuration for a video sink, e.g. LCD panel +/** + * Defines backlight level configuration for a video sink, e.g. LCD panel * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nBacklight : Values allowed for backlight 0-100% - * nTimeout : Number of milliseconds before backlight automatically turns - * off. A value of 0x0 disables backight timeout + * nTimeout : Number of milliseconds before backlight automatically turns + * off. A value of 0x0 disables backight timeout */ typedef struct OMX_CONFIG_BACKLIGHTTYPE { OMX_U32 nSize; @@ -644,13 +620,12 @@ typedef struct OMX_CONFIG_BACKLIGHTTYPE { OMX_U32 nTimeout; } OMX_CONFIG_BACKLIGHTTYPE; - -/** - * Defines setting for Gamma +/** + * Defines setting for Gamma * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nGamma : Values allowed for gamma -100 to 100, zero means no change */ @@ -661,15 +636,14 @@ typedef struct OMX_CONFIG_GAMMATYPE { OMX_S32 nGamma; } OMX_CONFIG_GAMMATYPE; - -/** - * Define for setting saturation - * +/** + * Define for setting saturation + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSaturation : Values allowed for saturation -100 to 100, zero means + * nSaturation : Values allowed for saturation -100 to 100, zero means * no change */ typedef struct OMX_CONFIG_SATURATIONTYPE { @@ -679,15 +653,14 @@ typedef struct OMX_CONFIG_SATURATIONTYPE { OMX_S32 nSaturation; } OMX_CONFIG_SATURATIONTYPE; - -/** - * Define for setting Lightness +/** + * Define for setting Lightness * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nLightness : Values allowed for lightness -100 to 100, zero means no + * nLightness : Values allowed for lightness -100 to 100, zero means no * change */ typedef struct OMX_CONFIG_LIGHTNESSTYPE { @@ -697,18 +670,17 @@ typedef struct OMX_CONFIG_LIGHTNESSTYPE { OMX_S32 nLightness; } OMX_CONFIG_LIGHTNESSTYPE; - -/** - * Plane blend configuration +/** + * Plane blend configuration * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes + * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Index of input port associated with the plane. - * nDepth : Depth of the plane in relation to the screen. Higher - * numbered depths are "behind" lower number depths. + * nDepth : Depth of the plane in relation to the screen. Higher + * numbered depths are "behind" lower number depths. * This number defaults to the Port Index number. - * nAlpha : Transparency blending component for the entire plane. + * nAlpha : Transparency blending component for the entire plane. * See blending modes for more detail. */ typedef struct OMX_CONFIG_PLANEBLENDTYPE { @@ -719,18 +691,17 @@ typedef struct OMX_CONFIG_PLANEBLENDTYPE { OMX_U32 nAlpha; } OMX_CONFIG_PLANEBLENDTYPE; - -/** +/** * Define interlace type * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * bEnable : Enable control variable for this functionality + * bEnable : Enable control variable for this functionality * (see below) - * nInterleavePortIndex : Index of input or output port associated with - * the interleaved plane. + * nInterleavePortIndex : Index of input or output port associated with + * the interleaved plane. * pPlanarPortIndexes[4] : Index of input or output planar ports. */ typedef struct OMX_PARAM_INTERLEAVETYPE { @@ -741,9 +712,8 @@ typedef struct OMX_PARAM_INTERLEAVETYPE { OMX_U32 nInterleavePortIndex; } OMX_PARAM_INTERLEAVETYPE; - -/** - * Defines the picture effect used for an input picture +/** + * Defines the picture effect used for an input picture */ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectNone, @@ -753,11 +723,11 @@ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectDissolve, OMX_EffectWipe, OMX_EffectUnspecifiedMixOfTwoScenes, - OMX_EffectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_EffectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_EffectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_EffectReverseUnspecifiedMixOfTwoScenes, - + #ifndef __VIDEOCORE4__ OMX_EffectDiagonalWipe, OMX_EffectDiagonalWipeRotate, @@ -772,7 +742,7 @@ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectMunchingSquares, OMX_EffectStripeWipe, OMX_EffectStripeWipeRotate, - + OMX_EffectRotozoomUnmatched, OMX_EffectRotozoomMatched, OMX_EffectRotozoomGentle, @@ -883,13 +853,12 @@ typedef enum OMX_TRANSITIONEFFECTTYPE { OMX_EffectMax = 0x7FFFFFFF } OMX_TRANSITIONEFFECTTYPE; - -/** - * Structure used to configure current transition effect +/** + * Structure used to configure current transition effect * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eEffect : Effect to enable */ @@ -900,70 +869,65 @@ typedef struct OMX_CONFIG_TRANSITIONEFFECTTYPE { OMX_TRANSITIONEFFECTTYPE eEffect; } OMX_CONFIG_TRANSITIONEFFECTTYPE; - -/** - * Defines possible data unit types for encoded video data. The data unit +/** + * Defines possible data unit types for encoded video data. The data unit * types are used both for encoded video input for playback as well as - * encoded video output from recording. + * encoded video output from recording. */ typedef enum OMX_DATAUNITTYPE { OMX_DataUnitCodedPicture, OMX_DataUnitVideoSegment, OMX_DataUnitSeveralSegments, OMX_DataUnitArbitraryStreamSection, - OMX_DataUnitKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DataUnitKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DataUnitVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DataUnitMax = 0x7FFFFFFF } OMX_DATAUNITTYPE; - -/** - * Defines possible encapsulation types for coded video data unit. The - * encapsulation information is used both for encoded video input for - * playback as well as encoded video output from recording. +/** + * Defines possible encapsulation types for coded video data unit. The + * encapsulation information is used both for encoded video input for + * playback as well as encoded video output from recording. */ typedef enum OMX_DATAUNITENCAPSULATIONTYPE { OMX_DataEncapsulationElementaryStream, OMX_DataEncapsulationGenericPayload, OMX_DataEncapsulationRtpPayload, - OMX_DataEncapsulationKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DataEncapsulationKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DataEncapsulationVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DataEncapsulationMax = 0x7FFFFFFF } OMX_DATAUNITENCAPSULATIONTYPE; - -/** - * Structure used to configure the type of being decoded/encoded +/** + * Structure used to configure the type of being decoded/encoded */ typedef struct OMX_PARAM_DATAUNITTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_DATAUNITTYPE eUnitType; OMX_DATAUNITENCAPSULATIONTYPE eEncapsulationType; } OMX_PARAM_DATAUNITTYPE; - /** - * Defines dither types + * Defines dither types */ typedef enum OMX_DITHERTYPE { OMX_DitherNone, OMX_DitherOrdered, OMX_DitherErrorDiffusion, OMX_DitherOther, - OMX_DitherKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_DitherKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_DitherVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_DitherMax = 0x7FFFFFFF } OMX_DITHERTYPE; - -/** - * Structure used to configure current type of dithering +/** + * Structure used to configure current type of dithering */ typedef struct OMX_CONFIG_DITHERTYPE { OMX_U32 nSize; /**< Size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ + OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< Port that this structure applies to */ OMX_DITHERTYPE eDither; /**< Type of dithering to use */ } OMX_CONFIG_DITHERTYPE; @@ -972,29 +936,29 @@ typedef struct OMX_CONFIG_CAPTUREMODETYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; /**< Port that this structure applies to */ - OMX_BOOL bContinuous; /**< If true then ignore frame rate and emit capture + OMX_BOOL bContinuous; /**< If true then ignore frame rate and emit capture * data as fast as possible (otherwise obey port's frame rate). */ - OMX_BOOL bFrameLimited; /**< If true then terminate capture after the port emits the - * specified number of frames (otherwise the port does not - * terminate the capture until instructed to do so by the client). - * Even if set, the client may manually terminate the capture prior + OMX_BOOL bFrameLimited; /**< If true then terminate capture after the port emits the + * specified number of frames (otherwise the port does not + * terminate the capture until instructed to do so by the client). + * Even if set, the client may manually terminate the capture prior * to reaching the limit. */ OMX_U32 nFrameLimit; /**< Limit on number of frames emitted during a capture (only * valid if bFrameLimited is set). */ } OMX_CONFIG_CAPTUREMODETYPE; typedef enum OMX_METERINGTYPE { - + OMX_MeteringModeAverage, /**< Center-weighted average metering. */ OMX_MeteringModeSpot, /**< Spot (partial) metering. */ OMX_MeteringModeMatrix, /**< Matrix or evaluative metering. */ - - OMX_MeteringKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + + OMX_MeteringKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_MeteringVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_MeteringModeBacklit, OMX_EVModeMax = 0x7fffffff } OMX_METERINGTYPE; - + typedef struct OMX_CONFIG_EXPOSUREVALUETYPE { OMX_U32 nSize; OMX_VERSIONTYPE nVersion; @@ -1003,14 +967,14 @@ typedef struct OMX_CONFIG_EXPOSUREVALUETYPE { OMX_S32 xEVCompensation; /**< Fixed point value stored as Q16 */ OMX_U32 nApertureFNumber; /**< e.g. nApertureFNumber = 2 implies "f/2" - Q16 format */ OMX_BOOL bAutoAperture; /**< Whether aperture number is defined automatically */ - OMX_U32 nShutterSpeedMsec; /**< Shutterspeed in milliseconds */ - OMX_BOOL bAutoShutterSpeed; /**< Whether shutter speed is defined automatically */ + OMX_U32 nShutterSpeedMsec; /**< Shutterspeed in milliseconds */ + OMX_BOOL bAutoShutterSpeed; /**< Whether shutter speed is defined automatically */ OMX_U32 nSensitivity; /**< e.g. nSensitivity = 100 implies "ISO 100" */ OMX_BOOL bAutoSensitivity; /**< Whether sensitivity is defined automatically */ } OMX_CONFIG_EXPOSUREVALUETYPE; -/** - * Focus region configuration +/** + * Focus region configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -1041,8 +1005,8 @@ typedef struct OMX_CONFIG_FOCUSREGIONTYPE { OMX_BOOL bBottomRight; } OMX_CONFIG_FOCUSREGIONTYPE; -/** - * Focus Status type +/** + * Focus Status type */ typedef enum OMX_FOCUSSTATUSTYPE { OMX_FocusStatusOff = 0, @@ -1050,15 +1014,15 @@ typedef enum OMX_FOCUSSTATUSTYPE { OMX_FocusStatusReached, OMX_FocusStatusUnableToReach, OMX_FocusStatusLost, - OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_FocusStatusKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_FocusStatusVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_FocusStatusCafWatching, OMX_FocusStatusCafSceneChanged, OMX_FocusStatusMax = 0x7FFFFFFF } OMX_FOCUSSTATUSTYPE; -/** - * Focus status configuration +/** + * Focus status configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Image.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Image.h index 4bf5b262a0..5224a2e7d1 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Image.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Image.h @@ -1,28 +1,28 @@ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/** +/** * @file OMX_Image.h - OpenMax IL version 1.1.2 - * The structures needed by Image components to exchange parameters and + * The structures needed by Image components to exchange parameters and * configuration data with the components. */ #ifndef OMX_Image_h @@ -32,11 +32,10 @@ extern "C" { #endif /* __cplusplus */ - /** - * Each OMX header must include all required header files to allow the - * header to compile without errors. The includes below are required - * for this header file to compile successfully + * Each OMX header must include all required header files to allow the + * header to compile without errors. The includes below are required + * for this header file to compile successfully */ #include "OMX_IVCommon.h" @@ -47,8 +46,8 @@ extern "C" { * @{ */ -/** - * Enumeration used to define the possible image compression coding. +/** + * Enumeration used to define the possible image compression coding. */ typedef enum OMX_IMAGE_CODINGTYPE { OMX_IMAGE_CodingUnused, /**< Value when format is N/A */ @@ -61,7 +60,7 @@ typedef enum OMX_IMAGE_CODINGTYPE { OMX_IMAGE_CodingPNG, /**< PNG image format */ OMX_IMAGE_CodingLZW, /**< LZW image format */ OMX_IMAGE_CodingBMP, /**< Windows Bitmap format */ - OMX_IMAGE_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_CodingTGA, @@ -70,54 +69,53 @@ typedef enum OMX_IMAGE_CODINGTYPE { OMX_IMAGE_CodingMax = 0x7FFFFFFF } OMX_IMAGE_CODINGTYPE; - /** - * Data structure used to define an image path. The number of image paths - * for input and output will vary by type of the image component. - * + * Data structure used to define an image path. The number of image paths + * for input and output will vary by type of the image component. + * * Input (aka Source) : Zero Inputs, one Output, * Splitter : One Input, 2 or more Outputs, * Processing Element : One Input, one output, * Mixer : 2 or more inputs, one output, * Output (aka Sink) : One Input, zero outputs. - * - * The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output - * image path. If additional vendor specific data is required, it should - * be transmitted to the component using the CustomCommand function. - * Compliant components will prepopulate this structure with optimal + * + * The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output + * image path. If additional vendor specific data is required, it should + * be transmitted to the component using the CustomCommand function. + * Compliant components will prepopulate this structure with optimal * values during the OMX_GetParameter() command. * * STRUCT MEMBERS: * cMIMEType : MIME type of data for the port - * pNativeRender : Platform specific reference for a display if a + * pNativeRender : Platform specific reference for a display if a * sync, otherwise this field is 0 - * nFrameWidth : Width of frame to be used on port if - * uncompressed format is used. Use 0 for + * nFrameWidth : Width of frame to be used on port if + * uncompressed format is used. Use 0 for * unknown, don't care or variable - * nFrameHeight : Height of frame to be used on port if - * uncompressed format is used. Use 0 for + * nFrameHeight : Height of frame to be used on port if + * uncompressed format is used. Use 0 for * unknown, don't care or variable - * nStride : Number of bytes per span of an image (i.e. + * nStride : Number of bytes per span of an image (i.e. * indicates the number of bytes to get from - * span N to span N+1, where negative stride + * span N to span N+1, where negative stride * indicates the image is bottom up * nSliceHeight : Height used when encoding in slices - * bFlagErrorConcealment : Turns on error concealment if it is supported by + * bFlagErrorConcealment : Turns on error concealment if it is supported by * the OMX component - * eCompressionFormat : Compression format used in this instance of - * the component. When OMX_IMAGE_CodingUnused is + * eCompressionFormat : Compression format used in this instance of + * the component. When OMX_IMAGE_CodingUnused is * specified, eColorFormat is valid * eColorFormat : Decompressed format used by this component - * pNativeWindow : Platform specific reference for a window object if a - * display sink , otherwise this field is 0x0. + * pNativeWindow : Platform specific reference for a window object if a + * display sink , otherwise this field is 0x0. */ typedef struct OMX_IMAGE_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; OMX_NATIVE_DEVICETYPE pNativeRender; - OMX_U32 nFrameWidth; + OMX_U32 nFrameWidth; OMX_U32 nFrameHeight; - OMX_S32 nStride; + OMX_S32 nStride; OMX_U32 nSliceHeight; OMX_BOOL bFlagErrorConcealment; OMX_IMAGE_CODINGTYPE eCompressionFormat; @@ -125,19 +123,18 @@ typedef struct OMX_IMAGE_PORTDEFINITIONTYPE { OMX_NATIVE_WINDOWTYPE pNativeWindow; } OMX_IMAGE_PORTDEFINITIONTYPE; - -/** - * Port format parameter. This structure is used to enumerate the various +/** + * Port format parameter. This structure is used to enumerate the various * data input/output format supported by the port. - * + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Indicates which port to set - * nIndex : Indicates the enumeration index for the format from + * nIndex : Indicates the enumeration index for the format from * 0x0 to N-1 - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_IMAGE_CodingUnused is specified, + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_IMAGE_CodingUnused is specified, * eColorFormat is valid * eColorFormat : Decompressed format used by this component */ @@ -150,9 +147,8 @@ typedef struct OMX_IMAGE_PARAM_PORTFORMATTYPE { OMX_COLOR_FORMATTYPE eColorFormat; } OMX_IMAGE_PARAM_PORTFORMATTYPE; - -/** - * Flash control type +/** + * Flash control type * * ENUMS * Torch : Flash forced constantly on @@ -164,14 +160,13 @@ typedef enum OMX_IMAGE_FLASHCONTROLTYPE { OMX_IMAGE_FlashControlRedEyeReduction, OMX_IMAGE_FlashControlFillin, OMX_IMAGE_FlashControlTorch, - OMX_IMAGE_FlashControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_FlashControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_FlashControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_FlashControlMax = 0x7FFFFFFF } OMX_IMAGE_FLASHCONTROLTYPE; - -/** - * Flash control configuration +/** + * Flash control configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -186,16 +181,15 @@ typedef struct OMX_IMAGE_PARAM_FLASHCONTROLTYPE { OMX_IMAGE_FLASHCONTROLTYPE eFlashControl; } OMX_IMAGE_PARAM_FLASHCONTROLTYPE; - -/** - * Focus control type +/** + * Focus control type */ typedef enum OMX_IMAGE_FOCUSCONTROLTYPE { OMX_IMAGE_FocusControlOn = 0, OMX_IMAGE_FocusControlOff, OMX_IMAGE_FocusControlAuto, OMX_IMAGE_FocusControlAutoLock, - OMX_IMAGE_FocusControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_FocusControlKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_FocusControlVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_FocusControlHyperfocal, /* Focus at the hyperfocal point of the lens. */ OMX_IMAGE_FocusControlAutoMacro, /* CF over a macro range (eg 0-50cm) */ @@ -215,16 +209,15 @@ typedef enum OMX_IMAGE_FOCUSCONTROLTYPE { OMX_IMAGE_FocusControlMax = 0x7FFFFFFF } OMX_IMAGE_FOCUSCONTROLTYPE; - -/** - * Focus control configuration +/** + * Focus control configuration * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eFocusControl : Focus control - * nFocusSteps : Focus can take on values from 0 mm to infinity. + * nFocusSteps : Focus can take on values from 0 mm to infinity. * Interest is only in number of steps over this range. * nFocusStepIndex : Current focus step index */ @@ -237,31 +230,30 @@ typedef struct OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE { OMX_U32 nFocusStepIndex; } OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE; - -/** +/** * Q Factor for JPEG compression, which controls the tradeoff between image * quality and size. Q Factor provides a more simple means of controlling * JPEG compression quality, without directly programming Quantization - * tables for chroma and luma + * tables for chroma and luma * * STRUCT MEMBERS: - * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to - * nQFactor : JPEG Q factor value in the range of 1-100. A factor of 1 - * produces the smallest, worst quality images, and a factor - * of 100 produces the largest, best quality images. A - * typical default is 75 for small good quality images + * nSize : Size of the structure in bytes + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to + * nQFactor : JPEG Q factor value in the range of 1-100. A factor of 1 + * produces the smallest, worst quality images, and a factor + * of 100 produces the largest, best quality images. A + * typical default is 75 for small good quality images */ typedef struct OMX_IMAGE_PARAM_QFACTORTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nQFactor; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nQFactor; } OMX_IMAGE_PARAM_QFACTORTYPE; -/** - * Quantization table type +/** + * Quantization table type */ typedef enum OMX_IMAGE_QUANTIZATIONTABLETYPE { @@ -269,27 +261,27 @@ typedef enum OMX_IMAGE_QUANTIZATIONTABLETYPE { OMX_IMAGE_QuantizationTableChroma, OMX_IMAGE_QuantizationTableChromaCb, OMX_IMAGE_QuantizationTableChromaCr, - OMX_IMAGE_QuantizationTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_QuantizationTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_QuantizationTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_QuantizationTableMax = 0x7FFFFFFF } OMX_IMAGE_QUANTIZATIONTABLETYPE; -/** +/** * JPEG quantization tables are used to determine DCT compression for - * YUV data, as an alternative to specifying Q factor, providing exact - * control of compression + * YUV data, as an alternative to specifying Q factor, providing exact + * control of compression * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eQuantizationTable : Quantization table type - * nQuantizationMatrix[64] : JPEG quantization table of coefficients stored - * in increasing columns then by rows of data (i.e. - * row 1, ... row 8). Quantization values are in + * nQuantizationMatrix[64] : JPEG quantization table of coefficients stored + * in increasing columns then by rows of data (i.e. + * row 1, ... row 8). Quantization values are in * the range 0-255 and stored in linear order - * (i.e. the component will zig-zag the - * quantization table data if required internally) + * (i.e. the component will zig-zag the + * quantization table data if required internally) */ typedef struct OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE { OMX_U32 nSize; @@ -299,10 +291,9 @@ typedef struct OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE { OMX_U8 nQuantizationMatrix[64]; } OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE; - -/** - * Huffman table type, the same Huffman table is applied for chroma and - * luma component +/** + * Huffman table type, the same Huffman table is applied for chroma and + * luma component */ typedef enum OMX_IMAGE_HUFFMANTABLETYPE { OMX_IMAGE_HuffmanTableAC = 0, @@ -311,23 +302,23 @@ typedef enum OMX_IMAGE_HUFFMANTABLETYPE { OMX_IMAGE_HuffmanTableACChroma, OMX_IMAGE_HuffmanTableDCLuma, OMX_IMAGE_HuffmanTableDCChroma, - OMX_IMAGE_HuffmanTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_IMAGE_HuffmanTableKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_IMAGE_HuffmanTableVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_IMAGE_HuffmanTableMax = 0x7FFFFFFF } OMX_IMAGE_HUFFMANTABLETYPE; -/** - * JPEG Huffman table +/** + * JPEG Huffman table * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eHuffmanTable : Huffman table type - * nNumberOfHuffmanCodeOfLength[16] : 0-16, number of Huffman codes of each + * nNumberOfHuffmanCodeOfLength[16] : 0-16, number of Huffman codes of each * possible length - * nHuffmanTable[256] : 0-255, the size used for AC and DC - * HuffmanTable are 16 and 162 + * nHuffmanTable[256] : 0-255, the size used for AC and DC + * HuffmanTable are 16 and 162 */ typedef struct OMX_IMAGE_PARAM_HUFFMANTTABLETYPE { OMX_U32 nSize; diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Index.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Index.h index 689171e9eb..520aacd5c0 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Index.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Index.h @@ -26,7 +26,6 @@ * and components . */ - #ifndef OMX_Index_h #define OMX_Index_h @@ -34,14 +33,12 @@ extern "C" { #endif /* __cplusplus */ - /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required * for this header file to compile successfully */ #include "OMX_Types.h" - /** The OMX_INDEXTYPE enumeration is used to select a structure when either * getting or setting parameters and/or configuration data. Each entry in * this enumeration maps to an OMX specified structure. When the @@ -222,7 +219,6 @@ typedef enum OMX_INDEXTYPE { OMX_IndexConfigOtherPower, /**< reference: OMX_OTHER_CONFIG_POWERTYPE */ OMX_IndexConfigOtherStats, /**< reference: OMX_OTHER_CONFIG_STATSTYPE */ - /* Reserved Time range */ OMX_IndexTimeStartUnused = 0x09000000, OMX_IndexConfigTimeScale, /**< reference: OMX_TIME_CONFIG_SCALETYPE */ @@ -237,7 +233,6 @@ typedef enum OMX_INDEXTYPE { OMX_IndexConfigTimePosition, /**< reference: OMX_TIME_CONFIG_TIMESTAMPTYPE */ OMX_IndexConfigTimeSeekMode, /**< reference: OMX_TIME_CONFIG_SEEKMODETYPE */ - OMX_IndexKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ /* Vendor specific area */ OMX_IndexVendorStartUnused = 0x7F000000, @@ -548,4 +543,3 @@ typedef enum OMX_INDEXTYPE { #endif /* File EOF */ - diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Other.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Other.h index e848dce3cb..f4e76427fe 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Other.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Other.h @@ -1,23 +1,23 @@ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ @@ -33,32 +33,30 @@ extern "C" { #endif /* __cplusplus */ - /* Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include "OMX_Core.h" - -/** +/** * Enumeration of possible data types which match to multiple domains or no * domain at all. For types which are vendor specific, a value above * OMX_OTHER_VENDORTSTART should be used. */ typedef enum OMX_OTHER_FORMATTYPE { - OMX_OTHER_FormatTime = 0, /**< Transmission of various timestamps, elapsed time, + OMX_OTHER_FormatTime = 0, /**< Transmission of various timestamps, elapsed time, time deltas, etc */ - OMX_OTHER_FormatPower, /**< Perhaps used for enabling/disabling power + OMX_OTHER_FormatPower, /**< Perhaps used for enabling/disabling power management, setting clocks? */ - OMX_OTHER_FormatStats, /**< Could be things such as frame rate, frames + OMX_OTHER_FormatStats, /**< Could be things such as frame rate, frames dropped, etc */ OMX_OTHER_FormatBinary, /**< Arbitrary binary data */ - OMX_OTHER_FormatVendorReserved = 1000, /**< Starting value for vendor specific + OMX_OTHER_FormatVendorReserved = 1000, /**< Starting value for vendor specific formats */ - OMX_OTHER_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_OTHER_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_OTHER_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_OTHER_FormatText, @@ -68,19 +66,19 @@ typedef enum OMX_OTHER_FORMATTYPE { OMX_OTHER_FormatMax = 0x7FFFFFFF } OMX_OTHER_FORMATTYPE; -/** +/** * Enumeration of seek modes. */ typedef enum OMX_TIME_SEEKMODETYPE { OMX_TIME_SeekModeFast = 0, /**< Prefer seeking to an approximation - * of the requested seek position over + * of the requested seek position over * the actual seek position if it * results in a faster seek. */ - OMX_TIME_SeekModeAccurate, /**< Prefer seeking to the actual seek + OMX_TIME_SeekModeAccurate, /**< Prefer seeking to the actual seek * position over an approximation * of the requested seek position even * if it results in a slower seek. */ - OMX_TIME_SeekModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_TIME_SeekModeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_TIME_SeekModeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_TIME_SeekModeDirectional, /**< Similar to Fast, but if seeking backwards will @@ -97,42 +95,42 @@ typedef struct OMX_TIME_CONFIG_SEEKMODETYPE { OMX_TIME_SEEKMODETYPE eType; /**< The seek mode */ } OMX_TIME_CONFIG_SEEKMODETYPE; -/** Structure representing a time stamp used with the following configs +/** Structure representing a time stamp used with the following configs * on the Clock Component (CC): - * - * OMX_IndexConfigTimeCurrentWallTime: query of the CCs current wall + * + * OMX_IndexConfigTimeCurrentWallTime: query of the CCs current wall * time * OMX_IndexConfigTimeCurrentMediaTime: query of the CCs current media * time - * OMX_IndexConfigTimeCurrentAudioReference and - * OMX_IndexConfigTimeCurrentVideoReference: audio/video reference + * OMX_IndexConfigTimeCurrentAudioReference and + * OMX_IndexConfigTimeCurrentVideoReference: audio/video reference * clock sending SC its reference time - * OMX_IndexConfigTimeClientStartTime: a Clock Component client sends - * this structure to the Clock Component via a SetConfig on its + * OMX_IndexConfigTimeClientStartTime: a Clock Component client sends + * this structure to the Clock Component via a SetConfig on its * client port when it receives a buffer with * OMX_BUFFERFLAG_STARTTIME set. It must use the timestamp - * specified by that buffer for nStartTimestamp. + * specified by that buffer for nStartTimestamp. * * Its also used with the following config on components in general: * - * OMX_IndexConfigTimePosition: IL client querying component position + * OMX_IndexConfigTimePosition: IL client querying component position * (GetConfig) or commanding a component to seek to the given location * (SetConfig) - */ + */ typedef struct OMX_TIME_CONFIG_TIMESTAMPTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version * information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_TICKS nTimestamp; /**< timestamp .*/ -} OMX_TIME_CONFIG_TIMESTAMPTYPE; + OMX_TICKS nTimestamp; /**< timestamp .*/ +} OMX_TIME_CONFIG_TIMESTAMPTYPE; /** Enumeration of possible reference clocks to the media time. */ typedef enum OMX_TIME_UPDATETYPE { OMX_TIME_UpdateRequestFulfillment, /**< Update is the fulfillment of a media time request. */ OMX_TIME_UpdateScaleChanged, /**< Update was generated because the scale chagned. */ OMX_TIME_UpdateClockStateChanged, /**< Update was generated because the clock state changed. */ - OMX_TIME_UpdateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_TIME_UpdateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_TIME_UpdateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_TIME_UpdateMax = 0x7FFFFFFF } OMX_TIME_UPDATETYPE; @@ -142,7 +140,7 @@ typedef enum OMX_TIME_REFCLOCKTYPE { OMX_TIME_RefClockNone, /**< Use no references. */ OMX_TIME_RefClockAudio, /**< Use references sent through OMX_IndexConfigTimeCurrentAudioReference */ OMX_TIME_RefClockVideo, /**< Use references sent through OMX_IndexConfigTimeCurrentVideoReference */ - OMX_TIME_RefClockKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_TIME_RefClockKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_TIME_RefClockVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_TIME_RefClockMax = 0x7FFFFFFF } OMX_TIME_REFCLOCKTYPE; @@ -150,11 +148,11 @@ typedef enum OMX_TIME_REFCLOCKTYPE { /** Enumeration of clock states. */ typedef enum OMX_TIME_CLOCKSTATE { OMX_TIME_ClockStateRunning, /**< Clock running. */ - OMX_TIME_ClockStateWaitingForStartTime, /**< Clock waiting until the + OMX_TIME_ClockStateWaitingForStartTime, /**< Clock waiting until the * prescribed clients emit their * start time. */ OMX_TIME_ClockStateStopped, /**< Clock stopped. */ - OMX_TIME_ClockStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_TIME_ClockStateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_TIME_ClockStateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_TIME_ClockStateMax = 0x7FFFFFFF } OMX_TIME_CLOCKSTATE; @@ -164,18 +162,18 @@ typedef enum OMX_TIME_CLOCKSTATE { * A client component sends this structure to the Clock Component via a SetConfig * on its client port to specify a media timestamp the Clock Component * should emit. The Clock Component should fulfill the request by sending a - * OMX_TIME_MEDIATIMETYPE when its media clock matches the requested + * OMX_TIME_MEDIATIMETYPE when its media clock matches the requested * timestamp. * * The client may require a media time request be fulfilled slightly - * earlier than the media time specified. In this case the client specifies - * an offset which is equal to the difference between wall time corresponding - * to the requested media time and the wall time when it will be - * fulfilled. + * earlier than the media time specified. In this case the client specifies + * an offset which is equal to the difference between wall time corresponding + * to the requested media time and the wall time when it will be + * fulfilled. * * A client component may uses these requests and the OMX_TIME_MEDIATIMETYPE to * time events according to timestamps. If a client must perform an operation O at - * a time T (e.g. deliver a video frame at its corresponding timestamp), it makes a + * a time T (e.g. deliver a video frame at its corresponding timestamp), it makes a * media time request at T (perhaps specifying an offset to ensure the request fulfillment * is a little early). When the clock component passes the resulting OMX_TIME_MEDIATIMETYPE * structure back to the client component, the client may perform operation O (perhaps having @@ -186,52 +184,52 @@ typedef struct OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_U32 nPortIndex; /**< port that this structure applies to */ - OMX_PTR pClientPrivate; /**< Client private data to disabiguate this media time - * from others (e.g. the number of the frame to deliver). - * Duplicated in the media time structure that fulfills - * this request. A value of zero is reserved for time scale + OMX_PTR pClientPrivate; /**< Client private data to disabiguate this media time + * from others (e.g. the number of the frame to deliver). + * Duplicated in the media time structure that fulfills + * this request. A value of zero is reserved for time scale * updates. */ - OMX_TICKS nMediaTimestamp; /**< Media timestamp requested.*/ + OMX_TICKS nMediaTimestamp; /**< Media timestamp requested.*/ OMX_TICKS nOffset; /**< Amount of wall clock time by which this * request should be fulfilled early */ } OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE; -/**< Structure sent from the clock component client either when fulfilling - * a media time request or when the time scale has changed. +/**< Structure sent from the clock component client either when fulfilling + * a media time request or when the time scale has changed. * - * In the former case the Clock Component fills this structure and times its emission - * to a client component (via the client port) according to the corresponding media + * In the former case the Clock Component fills this structure and times its emission + * to a client component (via the client port) according to the corresponding media * time request sent by the client. The Clock Component should time the emission to occur - * when the requested timestamp matches the Clock Component's media time but also the - * prescribed offset early. + * when the requested timestamp matches the Clock Component's media time but also the + * prescribed offset early. * * Upon scale changes the clock component clears the nClientPrivate data, sends the current - * media time and sets the nScale to the new scale via the client port. It emits a - * OMX_TIME_MEDIATIMETYPE to all clients independent of any requests. This allows clients to - * alter processing to accomodate scaling. For instance a video component might skip inter-frames - * in the case of extreme fastforward. Likewise an audio component might add or remove samples - * from an audio frame to scale audio data. + * media time and sets the nScale to the new scale via the client port. It emits a + * OMX_TIME_MEDIATIMETYPE to all clients independent of any requests. This allows clients to + * alter processing to accomodate scaling. For instance a video component might skip inter-frames + * in the case of extreme fastforward. Likewise an audio component might add or remove samples + * from an audio frame to scale audio data. * * It is expected that some clock components may not be able to fulfill requests - * at exactly the prescribed time. This is acceptable so long as the request is - * fulfilled at least as early as described and not later. This structure provides + * at exactly the prescribed time. This is acceptable so long as the request is + * fulfilled at least as early as described and not later. This structure provides * fields the client may use to wait for the remaining time. * - * The client may use either the nOffset or nWallTimeAtMedia fields to determine the + * The client may use either the nOffset or nWallTimeAtMedia fields to determine the * wall time until the nMediaTimestamp actually occurs. In the latter case the * client can get a more accurate value for offset by getting the current wall - * from the cloc component and subtracting it from nWallTimeAtMedia. + * from the cloc component and subtracting it from nWallTimeAtMedia. */ typedef struct OMX_TIME_MEDIATIMETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_U32 nClientPrivate; /**< Client private data to disabiguate this media time - * from others. Copied from the media time request. + OMX_U32 nClientPrivate; /**< Client private data to disabiguate this media time + * from others. Copied from the media time request. * A value of zero is reserved for time scale updates. */ OMX_TIME_UPDATETYPE eUpdateType; /**< Reason for the update */ - OMX_TICKS nMediaTimestamp; /**< Media time requested. If no media time was - * requested then this is the current media time. */ + OMX_TICKS nMediaTimestamp; /**< Media time requested. If no media time was + * requested then this is the current media time. */ OMX_TICKS nOffset; /**< Amount of wall clock time by which this * request was actually fulfilled early */ @@ -243,20 +241,20 @@ typedef struct OMX_TIME_MEDIATIMETYPE { OMX_S32 xScale; /**< Current media time scale in Q16 format. */ OMX_TIME_CLOCKSTATE eState; /* Seeking Change. Added 7/12.*/ /**< State of the media time. */ -} OMX_TIME_MEDIATIMETYPE; +} OMX_TIME_MEDIATIMETYPE; -/** Structure representing the current media time scale factor. Applicable only to clock +/** Structure representing the current media time scale factor. Applicable only to clock * component, other components see scale changes via OMX_TIME_MEDIATIMETYPE buffers sent via - * the clock component client ports. Upon recieving this config the clock component changes - * the rate by which the media time increases or decreases effectively implementing trick modes. - */ + * the clock component client ports. Upon recieving this config the clock component changes + * the rate by which the media time increases or decreases effectively implementing trick modes. + */ typedef struct OMX_TIME_CONFIG_SCALETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ OMX_S32 xScale; /**< This is a value in Q16 format which is used for * scaling the media time */ } OMX_TIME_CONFIG_SCALETYPE; - + /** Bits used to identify a clock port. Used in OMX_TIME_CONFIG_CLOCKSTATETYPEs nWaitMask field */ #define OMX_CLOCKPORT0 0x00000001 #define OMX_CLOCKPORT1 0x00000002 @@ -267,38 +265,38 @@ typedef struct OMX_TIME_CONFIG_SCALETYPE { #define OMX_CLOCKPORT6 0x00000040 #define OMX_CLOCKPORT7 0x00000080 -/** Structure representing the current mode of the media clock. - * IL Client uses this config to change or query the mode of the +/** Structure representing the current mode of the media clock. + * IL Client uses this config to change or query the mode of the * media clock of the clock component. Applicable only to clock - * component. - * + * component. + * * On a SetConfig if eState is OMX_TIME_ClockStateRunning media time * starts immediately at the prescribed start time. If * OMX_TIME_ClockStateWaitingForStartTime the Clock Component ignores - * the given nStartTime and waits for all clients specified in the - * nWaitMask to send starttimes (via - * OMX_IndexConfigTimeClientStartTime). The Clock Component then starts - * the media clock using the earliest start time supplied. */ + * the given nStartTime and waits for all clients specified in the + * nWaitMask to send starttimes (via + * OMX_IndexConfigTimeClientStartTime). The Clock Component then starts + * the media clock using the earliest start time supplied. */ typedef struct OMX_TIME_CONFIG_CLOCKSTATETYPE { OMX_U32 nSize; /**< size of the structure in bytes */ - OMX_VERSIONTYPE nVersion; /**< OMX specification version + OMX_VERSIONTYPE nVersion; /**< OMX specification version * information */ OMX_TIME_CLOCKSTATE eState; /**< State of the media time. */ OMX_TICKS nStartTime; /**< Start time of the media time. */ - OMX_TICKS nOffset; /**< Time to offset the media time by + OMX_TICKS nOffset; /**< Time to offset the media time by * (e.g. preroll). Media time will be - * reported to be nOffset ticks earlier. + * reported to be nOffset ticks earlier. */ OMX_U32 nWaitMask; /**< Mask of OMX_CLOCKPORT values. */ } OMX_TIME_CONFIG_CLOCKSTATETYPE; /** Structure representing the reference clock currently being used to - * compute media time. IL client uses this config to change or query the + * compute media time. IL client uses this config to change or query the * clock component's active reference clock */ typedef struct OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE { OMX_U32 nSize; /**< size of the structure in bytes */ OMX_VERSIONTYPE nVersion; /**< OMX specification version information */ - OMX_TIME_REFCLOCKTYPE eClock; /**< Reference clock used to compute media time */ + OMX_TIME_REFCLOCKTYPE eClock; /**< Reference clock used to compute media time */ } OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE; /** Descriptor for setting specifics of power type. @@ -309,7 +307,6 @@ typedef struct OMX_OTHER_CONFIG_POWERTYPE { OMX_BOOL bEnablePM; /**< Flag to enable Power Management */ } OMX_OTHER_CONFIG_POWERTYPE; - /** Descriptor for setting specifics of stats type. * Note: this structure is listed for backwards compatibility. */ typedef struct OMX_OTHER_CONFIG_STATSTYPE { @@ -318,10 +315,9 @@ typedef struct OMX_OTHER_CONFIG_STATSTYPE { /* what goes here */ } OMX_OTHER_CONFIG_STATSTYPE; - /** - * The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output other + * The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output other * path. */ typedef struct OMX_OTHER_PORTDEFINITIONTYPE { @@ -337,7 +333,7 @@ typedef struct OMX_OTHER_PARAM_PORTFORMATTYPE { OMX_U32 nPortIndex; /**< Indicates which port to set */ OMX_U32 nIndex; /**< Indicates the enumeration index for the format from 0x0 to N-1 */ OMX_OTHER_FORMATTYPE eFormat; /**< Type of data expected for this channel */ -} OMX_OTHER_PARAM_PORTFORMATTYPE; +} OMX_OTHER_PARAM_PORTFORMATTYPE; #ifdef __cplusplus } diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Types.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Types.h index f865eeaf03..b1d3a4f7f0 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Types.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Types.h @@ -1,30 +1,30 @@ /* - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ /** OMX_Types.h - OpenMax IL version 1.1.2 - * The OMX_Types header file contains the primitive type definitions used by + * The OMX_Types header file contains the primitive type definitions used by * the core, the application and the component. This file may need to be - * modified to be used on systems that do not have "char" set to 8 bits, + * modified to be used on systems that do not have "char" set to 8 bits, * "short" set to 16 bits and "long" set to 32 bits. */ @@ -38,12 +38,12 @@ extern "C" { /** The OMX_API and OMX_APIENTRY are platform specific definitions used * to declare OMX function prototypes. They are modified to meet the * requirements for a particular platform */ -#ifdef __SYMBIAN32__ +#ifdef __SYMBIAN32__ # ifdef __OMX_EXPORTS # define OMX_API __declspec(dllexport) # else # ifdef _WIN32 -# define OMX_API __declspec(dllexport) +# define OMX_API __declspec(dllexport) # else # define OMX_API __declspec(dllimport) # endif @@ -65,27 +65,26 @@ extern "C" { #endif #ifndef OMX_APIENTRY -#define OMX_APIENTRY -#endif +#define OMX_APIENTRY +#endif -/** OMX_IN is used to identify inputs to an OMX function. This designation - will also be used in the case of a pointer that points to a parameter +/** OMX_IN is used to identify inputs to an OMX function. This designation + will also be used in the case of a pointer that points to a parameter that is used as an output. */ #ifndef OMX_IN #define OMX_IN #endif -/** OMX_OUT is used to identify outputs from an OMX function. This - designation will also be used in the case of a pointer that points +/** OMX_OUT is used to identify outputs from an OMX function. This + designation will also be used in the case of a pointer that points to a parameter that is used as an input. */ #ifndef OMX_OUT #define OMX_OUT #endif - /** OMX_INOUT is used to identify parameters that may be either inputs or - outputs from an OMX function at the same time. This designation will - also be used in the case of a pointer that points to a parameter that + outputs from an OMX function at the same time. This designation will + also be used in the case of a pointer that points to a parameter that is used both as an input and an output. */ #ifndef OMX_INOUT #define OMX_INOUT @@ -103,31 +102,31 @@ extern "C" { /** @defgroup core OpenMAX IL core * Functions and structure related to the OMX IL core */ - + /** @defgroup comp OpenMAX IL component * Functions and structure related to the OMX IL component */ - -/** @defgroup rpm Resource and Policy Management + +/** @defgroup rpm Resource and Policy Management * Structures for resource and policy management of components */ /** @defgroup buf Buffer Management * Buffer handling functions and structures */ - + /** @defgroup tun Tunneling * @ingroup core comp * Structures and functions to manage tunnels among component ports */ - + /** @defgroup cp Content Pipes * @ingroup core */ - + /** @defgroup metadata Metadata handling - * - */ + * + */ #if defined(__GNUC__) #include @@ -160,9 +159,8 @@ typedef int32_t OMX_S32; typedef signed long OMX_S32; #endif - /* Users with compilers that cannot accept the "long long" designation should - define the OMX_SKIP64BIT macro. It should be noted that this may cause + define the OMX_SKIP64BIT macro. It should be noted that this may cause some components to fail to compile if the component was written to require 64 bit integral types. However, these components would NOT compile anyway since the compiler does not support the way the component was written. @@ -177,7 +175,7 @@ typedef signed long long OMX_S64; #elif defined(WIN32) -/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */ +/** OMX_U64 is a 64 bit unsigned quantity that is 64 bit word aligned */ typedef unsigned __int64 OMX_U64; /** OMX_S64 is a 64 bit signed quantity that is 64 bit word aligned */ @@ -194,8 +192,7 @@ typedef signed long long OMX_S64; #endif /* WIN32 */ #endif - -/** The OMX_BOOL type is intended to be used to represent a true or a false +/** The OMX_BOOL type is intended to be used to represent a true or a false value when passing parameters to and from the OMX core and components. The OMX_BOOL is a 32 bit quantity and is aligned on a 32 bit word boundary. */ @@ -203,8 +200,8 @@ typedef enum OMX_BOOL { OMX_FALSE = 0, OMX_TRUE = !OMX_FALSE, OMX_BOOL_MAX = 0x7FFFFFFF -} OMX_BOOL; - +} OMX_BOOL; + /** The OMX_PTR type is intended to be used to pass pointers between the OMX applications and the OMX Core and components. This is a 32 bit pointer and is aligned on a 32 bit boundary. @@ -212,14 +209,14 @@ typedef enum OMX_BOOL { typedef void* OMX_PTR; /** The OMX_STRING type is intended to be used to pass "C" type strings between - the application and the core and component. The OMX_STRING type is a 32 - bit pointer to a zero terminated string. The pointer is word aligned and - the string is byte aligned. + the application and the core and component. The OMX_STRING type is a 32 + bit pointer to a zero terminated string. The pointer is word aligned and + the string is byte aligned. */ typedef char* OMX_STRING; /** The OMX_BYTE type is intended to be used to pass arrays of bytes such as - buffers between the application and the component and core. The OMX_BYTE + buffers between the application and the component and core. The OMX_BYTE type is a 32 bit pointer to a zero terminated string. The pointer is word aligned and the string is byte aligned. */ @@ -232,7 +229,7 @@ typedef unsigned char* OMX_BYTE; typedef unsigned char OMX_UUIDTYPE[128]; /** The OMX_DIRTYPE enumeration is used to indicate if a port is an input or - an output port. This enumeration is common across all component types. + an output port. This enumeration is common across all component types. */ typedef enum OMX_DIRTYPE { @@ -241,8 +238,8 @@ typedef enum OMX_DIRTYPE OMX_DirMax = 0x7FFFFFFF } OMX_DIRTYPE; -/** The OMX_ENDIANTYPE enumeration is used to indicate the bit ordering - for numerical data (i.e. big endian, or little endian). +/** The OMX_ENDIANTYPE enumeration is used to indicate the bit ordering + for numerical data (i.e. big endian, or little endian). */ typedef enum OMX_ENDIANTYPE { @@ -251,8 +248,7 @@ typedef enum OMX_ENDIANTYPE OMX_EndianMax = 0x7FFFFFFF } OMX_ENDIANTYPE; - -/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data +/** The OMX_NUMERICALDATATYPE enumeration is used to indicate if data is signed or unsigned */ typedef enum OMX_NUMERICALDATATYPE @@ -262,7 +258,6 @@ typedef enum OMX_NUMERICALDATATYPE OMX_NumercialDataMax = 0x7FFFFFFF } OMX_NUMERICALDATATYPE; - /** Unsigned bounded value type */ typedef struct OMX_BU32 { OMX_U32 nValue; /**< actual value */ @@ -270,7 +265,6 @@ typedef struct OMX_BU32 { OMX_U32 nMax; /**< maximum for value (i.e. nValue <= nMax) */ } OMX_BU32; - /** Signed bounded value type */ typedef struct OMX_BS32 { OMX_S32 nValue; /**< actual value */ @@ -278,18 +272,17 @@ typedef struct OMX_BS32 { OMX_S32 nMax; /**< maximum for value (i.e. nValue <= nMax) */ } OMX_BS32; - /** Structure representing some time or duration in microseconds. This structure - * must be interpreted as a signed 64 bit value. The quantity is signed to accommodate - * negative deltas and preroll scenarios. The quantity is represented in microseconds + * must be interpreted as a signed 64 bit value. The quantity is signed to accommodate + * negative deltas and preroll scenarios. The quantity is represented in microseconds * to accomodate high resolution timestamps (e.g. DVD presentation timestamps based - * on a 90kHz clock) and to allow more accurate and synchronized delivery (e.g. - * individual audio samples delivered at 192 kHz). The quantity is 64 bit to + * on a 90kHz clock) and to allow more accurate and synchronized delivery (e.g. + * individual audio samples delivered at 192 kHz). The quantity is 64 bit to * accommodate a large dynamic range (signed 32 bit values would allow only for plus * or minus 35 minutes). * - * Implementations with limited precision may convert the signed 64 bit value to - * a signed 32 bit value internally but risk loss of precision. + * Implementations with limited precision may convert the signed 64 bit value to + * a signed 32 bit value internally but risk loss of precision. */ #ifndef OMX_SKIP64BIT typedef OMX_S64 OMX_TICKS; @@ -309,17 +302,16 @@ typedef void* OMX_HANDLETYPE; typedef struct OMX_MARKTYPE { - OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will - generate a mark event upon + OMX_HANDLETYPE hMarkTargetComponent; /**< The component that will + generate a mark event upon processing the mark. */ - OMX_PTR pMarkData; /**< Application specific data associated with - the mark sent on a mark event to disambiguate + OMX_PTR pMarkData; /**< Application specific data associated with + the mark sent on a mark event to disambiguate this mark from others. */ } OMX_MARKTYPE; - /** OMX_NATIVE_DEVICETYPE is used to map a OMX video port to the - * platform & operating specific object used to reference the display + * platform & operating specific object used to reference the display * or can be used by a audio port for native audio rendering */ typedef void* OMX_NATIVE_DEVICETYPE; @@ -327,7 +319,6 @@ typedef void* OMX_NATIVE_DEVICETYPE; * platform & operating specific object used to reference the window */ typedef void* OMX_NATIVE_WINDOWTYPE; - /** Define the OMX IL version that corresponds to this set of header files. * We also define a combined version that can be used to write or compare * values of the 32bit nVersion field, assuming a little endian architecture */ @@ -338,11 +329,10 @@ typedef void* OMX_NATIVE_WINDOWTYPE; #define OMX_VERSION ((OMX_VERSION_STEP<<24) | (OMX_VERSION_REVISION<<16) | (OMX_VERSION_MINOR<<8) | OMX_VERSION_MAJOR) - /** The OMX_VERSIONTYPE union is used to specify the version for a structure or component. For a component, the version is entirely specified by the component vendor. Components doing the same function - from different vendors may or may not have the same version. For + from different vendors may or may not have the same version. For structures, the version shall be set by the entity that allocates the structure. For structures specified in the OMX 1.1 specification, the value of the version shall be set to 1.1.0.0 in all cases. Access to the diff --git a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Video.h b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Video.h index cd941fc2ca..82789c7b2a 100644 --- a/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Video.h +++ b/gfx/include/userland/interface/vmcs_host/khronos/IL/OMX_Video.h @@ -1,29 +1,29 @@ /** - * Copyright (c) 2008 The Khronos Group Inc. - * + * Copyright (c) 2008 The Khronos Group Inc. + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including * without limitation the rights to use, copy, modify, merge, publish, * distribute, sublicense, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: + * to the following conditions: * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * + * in all copies or substantial portions of the Software. + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/** +/** * @file OMX_Video.h - OpenMax IL version 1.1.2 - * The structures is needed by Video components to exchange parameters + * The structures is needed by Video components to exchange parameters * and configuration data with OMX components. */ #ifndef OMX_Video_h @@ -39,23 +39,21 @@ extern "C" { #endif /* __cplusplus */ - /** * Each OMX header must include all required header files to allow the * header to compile without errors. The includes below are required - * for this header file to compile successfully + * for this header file to compile successfully */ #include "OMX_IVCommon.h" - /** - * Enumeration used to define the possible video compression codings. - * NOTE: This essentially refers to file extensions. If the coding is - * being used to specify the ENCODE type, then additional work - * must be done to configure the exact flavor of the compression - * to be used. For decode cases where the user application can - * not differentiate between MPEG-4 and H.264 bit streams, it is + * Enumeration used to define the possible video compression codings. + * NOTE: This essentially refers to file extensions. If the coding is + * being used to specify the ENCODE type, then additional work + * must be done to configure the exact flavor of the compression + * to be used. For decode cases where the user application can + * not differentiate between MPEG-4 and H.264 bit streams, it is * up to the codec to handle this. */ typedef enum OMX_VIDEO_CODINGTYPE { @@ -68,7 +66,7 @@ typedef enum OMX_VIDEO_CODINGTYPE { OMX_VIDEO_CodingRV, /**< all versions of Real Video */ OMX_VIDEO_CodingAVC, /**< H.264/AVC */ OMX_VIDEO_CodingMJPEG, /**< Motion JPEG */ - OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ #define OMX_AUDIO_CodingVP6_Supported 1 @@ -84,58 +82,57 @@ typedef enum OMX_VIDEO_CODINGTYPE { #define OMX_AUDIO_CodingTheora_Supported 1 OMX_VIDEO_CodingTheora, /**< Theora */ #define OMX_AUDIO_CodingMVC_Supported 1 - OMX_VIDEO_CodingMVC, /**< H.264/MVC */ - + OMX_VIDEO_CodingMVC, /**< H.264/MVC */ + OMX_VIDEO_CodingMax = 0x7FFFFFFF } OMX_VIDEO_CODINGTYPE; - /** - * Data structure used to define a video path. The number of Video paths for - * input and output will vary by type of the Video component. - * + * Data structure used to define a video path. The number of Video paths for + * input and output will vary by type of the Video component. + * * Input (aka Source) : zero Inputs, one Output, * Splitter : one Input, 2 or more Outputs, * Processing Element : one Input, one output, * Mixer : 2 or more inputs, one output, * Output (aka Sink) : one Input, zero outputs. - * - * The PortDefinition structure is used to define all of the parameters - * necessary for the compliant component to setup an input or an output video - * path. If additional vendor specific data is required, it should be - * transmitted to the component using the CustomCommand function. Compliant - * components will prepopulate this structure with optimal values during the + * + * The PortDefinition structure is used to define all of the parameters + * necessary for the compliant component to setup an input or an output video + * path. If additional vendor specific data is required, it should be + * transmitted to the component using the CustomCommand function. Compliant + * components will prepopulate this structure with optimal values during the * GetDefaultInitParams command. * * STRUCT MEMBERS: * cMIMEType : MIME type of data for the port - * pNativeRender : Platform specific reference for a display if a + * pNativeRender : Platform specific reference for a display if a * sync, otherwise this field is 0 - * nFrameWidth : Width of frame to be used on channel if + * nFrameWidth : Width of frame to be used on channel if * uncompressed format is used. Use 0 for unknown, * don't care or variable - * nFrameHeight : Height of frame to be used on channel if + * nFrameHeight : Height of frame to be used on channel if * uncompressed format is used. Use 0 for unknown, * don't care or variable - * nStride : Number of bytes per span of an image + * nStride : Number of bytes per span of an image * (i.e. indicates the number of bytes to get * from span N to span N+1, where negative stride * indicates the image is bottom up * nSliceHeight : Height used when encoding in slices - * nBitrate : Bit rate of frame to be used on channel if - * compressed format is used. Use 0 for unknown, + * nBitrate : Bit rate of frame to be used on channel if + * compressed format is used. Use 0 for unknown, * don't care or variable - * xFramerate : Frame rate to be used on channel if uncompressed - * format is used. Use 0 for unknown, don't care or + * xFramerate : Frame rate to be used on channel if uncompressed + * format is used. Use 0 for unknown, don't care or * variable. Units are Q16 frames per second. - * bFlagErrorConcealment : Turns on error concealment if it is supported by + * bFlagErrorConcealment : Turns on error concealment if it is supported by * the OMX component - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_VIDEO_CodingUnused is + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_VIDEO_CodingUnused is * specified, eColorFormat is used * eColorFormat : Decompressed format used by this component - * pNativeWindow : Platform specific reference for a window object if a - * display sink , otherwise this field is 0x0. + * pNativeWindow : Platform specific reference for a window object if a + * display sink , otherwise this field is 0x0. */ typedef struct OMX_VIDEO_PORTDEFINITIONTYPE { OMX_STRING cMIMEType; @@ -152,19 +149,19 @@ typedef struct OMX_VIDEO_PORTDEFINITIONTYPE { OMX_NATIVE_WINDOWTYPE pNativeWindow; } OMX_VIDEO_PORTDEFINITIONTYPE; -/** - * Port format parameter. This structure is used to enumerate the various +/** + * Port format parameter. This structure is used to enumerate the various * data input/output format supported by the port. - * + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Indicates which port to set - * nIndex : Indicates the enumeration index for the format from + * nIndex : Indicates the enumeration index for the format from * 0x0 to N-1 - * eCompressionFormat : Compression format used in this instance of the - * component. When OMX_VIDEO_CodingUnused is specified, - * eColorFormat is used + * eCompressionFormat : Compression format used in this instance of the + * component. When OMX_VIDEO_CodingUnused is specified, + * eColorFormat is used * eColorFormat : Decompressed format used by this component * xFrameRate : Indicates the video frame rate in Q16 format */ @@ -173,14 +170,13 @@ typedef struct OMX_VIDEO_PARAM_PORTFORMATTYPE { OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nIndex; - OMX_VIDEO_CODINGTYPE eCompressionFormat; + OMX_VIDEO_CODINGTYPE eCompressionFormat; OMX_COLOR_FORMATTYPE eColorFormat; OMX_U32 xFramerate; } OMX_VIDEO_PARAM_PORTFORMATTYPE; - /** - * This is a structure for configuring video compression quantization + * This is a structure for configuring video compression quantization * parameter values. Codecs may support different QP values for different * frame types. * @@ -190,10 +186,10 @@ typedef struct OMX_VIDEO_PARAM_PORTFORMATTYPE { * nPortIndex : Port that this structure applies to * nQpI : QP value to use for index frames * nQpP : QP value to use for P frames - * nQpB : QP values to use for bidirectional frames + * nQpB : QP values to use for bidirectional frames */ typedef struct OMX_VIDEO_PARAM_QUANTIZATIONTYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nQpI; @@ -201,33 +197,31 @@ typedef struct OMX_VIDEO_PARAM_QUANTIZATIONTYPE { OMX_U32 nQpB; } OMX_VIDEO_PARAM_QUANTIZATIONTYPE; - -/** - * Structure for configuration of video fast update parameters. - * +/** + * Structure for configuration of video fast update parameters. + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version info + * nVersion : OMX specification version info * nPortIndex : Port that this structure applies to * bEnableVFU : Enable/Disable video fast update * nFirstGOB : Specifies the number of the first macroblock row * nFirstMB : specifies the first MB relative to the specified first GOB - * nNumMBs : Specifies the number of MBs to be refreshed from nFirstGOB + * nNumMBs : Specifies the number of MBs to be refreshed from nFirstGOB * and nFirstMB */ typedef struct OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL bEnableVFU; - OMX_U32 nFirstGOB; - OMX_U32 nFirstMB; - OMX_U32 nNumMBs; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL bEnableVFU; + OMX_U32 nFirstGOB; + OMX_U32 nFirstMB; + OMX_U32 nNumMBs; } OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE; - -/** - * Enumeration of possible bitrate control types +/** + * Enumeration of possible bitrate control types */ typedef enum OMX_VIDEO_CONTROLRATETYPE { OMX_Video_ControlRateDisable, @@ -235,14 +229,13 @@ typedef enum OMX_VIDEO_CONTROLRATETYPE { OMX_Video_ControlRateConstant, OMX_Video_ControlRateVariableSkipFrames, OMX_Video_ControlRateConstantSkipFrames, - OMX_Video_ControlRateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_Video_ControlRateKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_Video_ControlRateVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_Video_ControlRateMax = 0x7FFFFFFF } OMX_VIDEO_CONTROLRATETYPE; - -/** - * Structure for configuring bitrate mode of a codec. +/** + * Structure for configuring bitrate mode of a codec. * * STRUCT MEMBERS: * nSize : Size of the struct in bytes @@ -252,32 +245,30 @@ typedef enum OMX_VIDEO_CONTROLRATETYPE { * nTargetBitrate : Target bitrate to encode with */ typedef struct OMX_VIDEO_PARAM_BITRATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_VIDEO_CONTROLRATETYPE eControlRate; - OMX_U32 nTargetBitrate; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_VIDEO_CONTROLRATETYPE eControlRate; + OMX_U32 nTargetBitrate; } OMX_VIDEO_PARAM_BITRATETYPE; - -/** - * Enumeration of possible motion vector (MV) types +/** + * Enumeration of possible motion vector (MV) types */ typedef enum OMX_VIDEO_MOTIONVECTORTYPE { OMX_Video_MotionVectorPixel, OMX_Video_MotionVectorHalfPel, OMX_Video_MotionVectorQuarterPel, OMX_Video_MotionVectorEighthPel, - OMX_Video_MotionVectorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_Video_MotionVectorKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_Video_MotionVectorVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_Video_MotionVectorMax = 0x7FFFFFFF } OMX_VIDEO_MOTIONVECTORTYPE; - /** * Structure for configuring the number of motion vectors used as well * as their accuracy. - * + * * STRUCT MEMBERS: * nSize : Size of the struct in bytes * nVersion : OMX spec version info @@ -299,35 +290,33 @@ typedef struct OMX_VIDEO_PARAM_MOTIONVECTORTYPE { OMX_S32 sYSearchRange; } OMX_VIDEO_PARAM_MOTIONVECTORTYPE; - -/** - * Enumeration of possible methods to use for Intra Refresh +/** + * Enumeration of possible methods to use for Intra Refresh */ typedef enum OMX_VIDEO_INTRAREFRESHTYPE { OMX_VIDEO_IntraRefreshCyclic, /**< Cyclic intra refresh, bit 0 is set*/ OMX_VIDEO_IntraRefreshAdaptive, /**< Adaptive intra refresh, bit 1 is set*/ OMX_VIDEO_IntraRefreshBoth, /**< Cyclic + Adaptive intra refresh (no mrows since bit 2 is off)*/ - OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_IntraRefreshKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_IntraRefreshVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_IntraRefreshCyclicMrows, /**< Cyclic intra refresh, multiple rows at a time bits 0 and 2 are set*/ OMX_VIDEO_IntraRefreshPseudoRand, /**< Pseudo random intra refresh, uses bit 3*/ OMX_VIDEO_IntraRefreshMax = 0x7FFFFFFF } OMX_VIDEO_INTRAREFRESHTYPE; - /** - * Structure for configuring intra refresh mode - * + * Structure for configuring intra refresh mode + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eRefreshMode : Cyclic, Adaptive, or Both - * nAirMBs : Number of intra macroblocks to refresh in a frame when + * nAirMBs : Number of intra macroblocks to refresh in a frame when * AIR is enabled - * nAirRef : Number of times a motion marked macroblock has to be + * nAirRef : Number of times a motion marked macroblock has to be * intra coded - * nCirMBs : Number of consecutive macroblocks to be coded as "intra" + * nCirMBs : Number of consecutive macroblocks to be coded as "intra" * when CIR is enabled */ typedef struct OMX_VIDEO_PARAM_INTRAREFRESHTYPE { @@ -341,21 +330,20 @@ typedef struct OMX_VIDEO_PARAM_INTRAREFRESHTYPE { OMX_U32 nPirMBs; } OMX_VIDEO_PARAM_INTRAREFRESHTYPE; - /** - * Structure for enabling various error correction methods for video + * Structure for enabling various error correction methods for video * compression. * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information - * nPortIndex : Port that this structure applies to + * nVersion : OMX specification version information + * nPortIndex : Port that this structure applies to * bEnableHEC : Enable/disable header extension codes (HEC) * bEnableResync : Enable/disable resynchronization markers - * nResynchMarkerSpacing : Resynch markers interval (in bits) to be - * applied in the stream - * bEnableDataPartitioning : Enable/disable data partitioning - * bEnableRVLC : Enable/disable reversible variable length + * nResynchMarkerSpacing : Resynch markers interval (in bits) to be + * applied in the stream + * bEnableDataPartitioning : Enable/disable data partitioning + * bEnableRVLC : Enable/disable reversible variable length * coding */ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { @@ -369,13 +357,12 @@ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { OMX_BOOL bEnableRVLC; } OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE; - -/** - * Configuration of variable block-size motion compensation (VBSMC) - * +/** + * Configuration of variable block-size motion compensation (VBSMC) + * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * b16x16 : Enable inter block search 16x16 * b16x8 : Enable inter block search 16x8 @@ -386,11 +373,11 @@ typedef struct OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE { * b4x4 : Enable inter block search 4x4 */ typedef struct OMX_VIDEO_PARAM_VBSMCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_BOOL b16x16; - OMX_BOOL b16x8; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_BOOL b16x16; + OMX_BOOL b16x8; OMX_BOOL b8x16; OMX_BOOL b8x8; OMX_BOOL b8x4; @@ -398,68 +385,65 @@ typedef struct OMX_VIDEO_PARAM_VBSMCTYPE { OMX_BOOL b4x4; } OMX_VIDEO_PARAM_VBSMCTYPE; - -/** - * H.263 profile types, each profile indicates support for various +/** + * H.263 profile types, each profile indicates support for various * performance bounds and different annexes. * * ENUMS: - * Baseline : Baseline Profile: H.263 (V1), no optional modes - * H320 Coding : H.320 Coding Efficiency Backward Compatibility + * Baseline : Baseline Profile: H.263 (V1), no optional modes + * H320 Coding : H.320 Coding Efficiency Backward Compatibility * Profile: H.263+ (V2), includes annexes I, J, L.4 * and T - * BackwardCompatible : Backward Compatibility Profile: H.263 (V1), - * includes annex F - * ISWV2 : Interactive Streaming Wireless Profile: H.263+ - * (V2), includes annexes I, J, K and T - * ISWV3 : Interactive Streaming Wireless Profile: H.263++ - * (V3), includes profile 3 and annexes V and W.6.3.8 - * HighCompression : Conversational High Compression Profile: H.263++ - * (V3), includes profiles 1 & 2 and annexes D and U - * Internet : Conversational Internet Profile: H.263++ (V3), - * includes profile 5 and annex K - * Interlace : Conversational Interlace Profile: H.263++ (V3), - * includes profile 5 and annex W.6.3.11 - * HighLatency : High Latency Profile: H.263++ (V3), includes - * profile 6 and annexes O.1 and P.5 + * BackwardCompatible : Backward Compatibility Profile: H.263 (V1), + * includes annex F + * ISWV2 : Interactive Streaming Wireless Profile: H.263+ + * (V2), includes annexes I, J, K and T + * ISWV3 : Interactive Streaming Wireless Profile: H.263++ + * (V3), includes profile 3 and annexes V and W.6.3.8 + * HighCompression : Conversational High Compression Profile: H.263++ + * (V3), includes profiles 1 & 2 and annexes D and U + * Internet : Conversational Internet Profile: H.263++ (V3), + * includes profile 5 and annex K + * Interlace : Conversational Interlace Profile: H.263++ (V3), + * includes profile 5 and annex W.6.3.11 + * HighLatency : High Latency Profile: H.263++ (V3), includes + * profile 6 and annexes O.1 and P.5 */ typedef enum OMX_VIDEO_H263PROFILETYPE { - OMX_VIDEO_H263ProfileBaseline = 0x01, - OMX_VIDEO_H263ProfileH320Coding = 0x02, - OMX_VIDEO_H263ProfileBackwardCompatible = 0x04, - OMX_VIDEO_H263ProfileISWV2 = 0x08, - OMX_VIDEO_H263ProfileISWV3 = 0x10, - OMX_VIDEO_H263ProfileHighCompression = 0x20, - OMX_VIDEO_H263ProfileInternet = 0x40, - OMX_VIDEO_H263ProfileInterlace = 0x80, - OMX_VIDEO_H263ProfileHighLatency = 0x100, - OMX_VIDEO_H263ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_H263ProfileBaseline = 0x01, + OMX_VIDEO_H263ProfileH320Coding = 0x02, + OMX_VIDEO_H263ProfileBackwardCompatible = 0x04, + OMX_VIDEO_H263ProfileISWV2 = 0x08, + OMX_VIDEO_H263ProfileISWV3 = 0x10, + OMX_VIDEO_H263ProfileHighCompression = 0x20, + OMX_VIDEO_H263ProfileInternet = 0x40, + OMX_VIDEO_H263ProfileInterlace = 0x80, + OMX_VIDEO_H263ProfileHighLatency = 0x100, + OMX_VIDEO_H263ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_H263ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_H263ProfileMax = 0x7FFFFFFF + OMX_VIDEO_H263ProfileMax = 0x7FFFFFFF } OMX_VIDEO_H263PROFILETYPE; - -/** - * H.263 level types, each level indicates support for various frame sizes, +/** + * H.263 level types, each level indicates support for various frame sizes, * bit rates, decoder frame rates. */ typedef enum OMX_VIDEO_H263LEVELTYPE { - OMX_VIDEO_H263Level10 = 0x01, - OMX_VIDEO_H263Level20 = 0x02, - OMX_VIDEO_H263Level30 = 0x04, - OMX_VIDEO_H263Level40 = 0x08, - OMX_VIDEO_H263Level45 = 0x10, - OMX_VIDEO_H263Level50 = 0x20, - OMX_VIDEO_H263Level60 = 0x40, - OMX_VIDEO_H263Level70 = 0x80, - OMX_VIDEO_H263LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_H263Level10 = 0x01, + OMX_VIDEO_H263Level20 = 0x02, + OMX_VIDEO_H263Level30 = 0x04, + OMX_VIDEO_H263Level40 = 0x08, + OMX_VIDEO_H263Level45 = 0x10, + OMX_VIDEO_H263Level50 = 0x20, + OMX_VIDEO_H263Level60 = 0x40, + OMX_VIDEO_H263Level70 = 0x80, + OMX_VIDEO_H263LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_H263LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_H263LevelMax = 0x7FFFFFFF + OMX_VIDEO_H263LevelMax = 0x7FFFFFFF } OMX_VIDEO_H263LEVELTYPE; - -/** - * Specifies the picture type. These values should be OR'd to signal all +/** + * Specifies the picture type. These values should be OR'd to signal all * pictures types which are allowed. * * ENUMS: @@ -477,36 +461,35 @@ typedef enum OMX_VIDEO_PICTURETYPE { OMX_VIDEO_PictureTypeEI = 0x11, OMX_VIDEO_PictureTypeEP = 0x12, OMX_VIDEO_PictureTypeS = 0x14, - OMX_VIDEO_PictureTypeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_PictureTypeKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_PictureTypeVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_PictureTypeMax = 0x7FFFFFFF } OMX_VIDEO_PICTURETYPE; - -/** - * H.263 Params +/** + * H.263 Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * nPFrames : Number of P frames between each I frame * nBFrames : Number of B frames between each I frame * eProfile : H.263 profile(s) to use * eLevel : H.263 level(s) to use - * bPLUSPTYPEAllowed : Indicating that it is allowed to use PLUSPTYPE - * (specified in the 1998 version of H.263) to - * indicate custom picture sizes or clock - * frequencies - * nAllowedPictureTypes : Specifies the picture types allowed in the + * bPLUSPTYPEAllowed : Indicating that it is allowed to use PLUSPTYPE + * (specified in the 1998 version of H.263) to + * indicate custom picture sizes or clock + * frequencies + * nAllowedPictureTypes : Specifies the picture types allowed in the * bitstream - * bForceRoundingTypeToZero : value of the RTYPE bit (bit 6 of MPPTYPE) is - * not constrained. It is recommended to change - * the value of the RTYPE bit for each reference + * bForceRoundingTypeToZero : value of the RTYPE bit (bit 6 of MPPTYPE) is + * not constrained. It is recommended to change + * the value of the RTYPE bit for each reference * picture in error-free communication - * nPictureHeaderRepetition : Specifies the frequency of picture header + * nPictureHeaderRepetition : Specifies the frequency of picture header * repetition - * nGOBHeaderInterval : Specifies the interval of non-empty GOB + * nGOBHeaderInterval : Specifies the interval of non-empty GOB * headers in units of GOBs */ typedef struct OMX_VIDEO_PARAM_H263TYPE { @@ -524,9 +507,8 @@ typedef struct OMX_VIDEO_PARAM_H263TYPE { OMX_U32 nGOBHeaderInterval; } OMX_VIDEO_PARAM_H263TYPE; - -/** - * MPEG-2 profile types, each profile indicates support for various +/** + * MPEG-2 profile types, each profile indicates support for various * performance bounds and different annexes. */ typedef enum OMX_VIDEO_MPEG2PROFILETYPE { @@ -536,29 +518,27 @@ typedef enum OMX_VIDEO_MPEG2PROFILETYPE { OMX_VIDEO_MPEG2ProfileSNR, /**< SNR Profile */ OMX_VIDEO_MPEG2ProfileSpatial, /**< Spatial Profile */ OMX_VIDEO_MPEG2ProfileHigh, /**< High Profile */ - OMX_VIDEO_MPEG2ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG2ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG2ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG2ProfileMax = 0x7FFFFFFF + OMX_VIDEO_MPEG2ProfileMax = 0x7FFFFFFF } OMX_VIDEO_MPEG2PROFILETYPE; - -/** - * MPEG-2 level types, each level indicates support for various frame - * sizes, bit rates, decoder frame rates. No need +/** + * MPEG-2 level types, each level indicates support for various frame + * sizes, bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_MPEG2LEVELTYPE { - OMX_VIDEO_MPEG2LevelLL = 0, /**< Low Level */ - OMX_VIDEO_MPEG2LevelML, /**< Main Level */ - OMX_VIDEO_MPEG2LevelH14, /**< High 1440 */ - OMX_VIDEO_MPEG2LevelHL, /**< High Level */ - OMX_VIDEO_MPEG2LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG2LevelLL = 0, /**< Low Level */ + OMX_VIDEO_MPEG2LevelML, /**< Main Level */ + OMX_VIDEO_MPEG2LevelH14, /**< High 1440 */ + OMX_VIDEO_MPEG2LevelHL, /**< High Level */ + OMX_VIDEO_MPEG2LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG2LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG2LevelMax = 0x7FFFFFFF + OMX_VIDEO_MPEG2LevelMax = 0x7FFFFFFF } OMX_VIDEO_MPEG2LEVELTYPE; - -/** - * MPEG-2 params +/** + * MPEG-2 params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -570,20 +550,19 @@ typedef enum OMX_VIDEO_MPEG2LEVELTYPE { * eLevel : MPEG-2 levels(s) to use */ typedef struct OMX_VIDEO_PARAM_MPEG2TYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nPFrames; - OMX_U32 nBFrames; + OMX_U32 nPortIndex; + OMX_U32 nPFrames; + OMX_U32 nBFrames; OMX_VIDEO_MPEG2PROFILETYPE eProfile; - OMX_VIDEO_MPEG2LEVELTYPE eLevel; + OMX_VIDEO_MPEG2LEVELTYPE eLevel; } OMX_VIDEO_PARAM_MPEG2TYPE; - -/** - * MPEG-4 profile types, each profile indicates support for various +/** + * MPEG-4 profile types, each profile indicates support for various * performance bounds and different annexes. - * + * * ENUMS: * - Simple Profile, Levels 1-3 * - Simple Scalable Profile, Levels 1-2 @@ -602,49 +581,47 @@ typedef struct OMX_VIDEO_PARAM_MPEG2TYPE { * - Advanced Scalable Texture, Levels 2-3 */ typedef enum OMX_VIDEO_MPEG4PROFILETYPE { - OMX_VIDEO_MPEG4ProfileSimple = 0x01, - OMX_VIDEO_MPEG4ProfileSimpleScalable = 0x02, - OMX_VIDEO_MPEG4ProfileCore = 0x04, - OMX_VIDEO_MPEG4ProfileMain = 0x08, - OMX_VIDEO_MPEG4ProfileNbit = 0x10, - OMX_VIDEO_MPEG4ProfileScalableTexture = 0x20, - OMX_VIDEO_MPEG4ProfileSimpleFace = 0x40, - OMX_VIDEO_MPEG4ProfileSimpleFBA = 0x80, - OMX_VIDEO_MPEG4ProfileBasicAnimated = 0x100, - OMX_VIDEO_MPEG4ProfileHybrid = 0x200, - OMX_VIDEO_MPEG4ProfileAdvancedRealTime = 0x400, - OMX_VIDEO_MPEG4ProfileCoreScalable = 0x800, - OMX_VIDEO_MPEG4ProfileAdvancedCoding = 0x1000, - OMX_VIDEO_MPEG4ProfileAdvancedCore = 0x2000, + OMX_VIDEO_MPEG4ProfileSimple = 0x01, + OMX_VIDEO_MPEG4ProfileSimpleScalable = 0x02, + OMX_VIDEO_MPEG4ProfileCore = 0x04, + OMX_VIDEO_MPEG4ProfileMain = 0x08, + OMX_VIDEO_MPEG4ProfileNbit = 0x10, + OMX_VIDEO_MPEG4ProfileScalableTexture = 0x20, + OMX_VIDEO_MPEG4ProfileSimpleFace = 0x40, + OMX_VIDEO_MPEG4ProfileSimpleFBA = 0x80, + OMX_VIDEO_MPEG4ProfileBasicAnimated = 0x100, + OMX_VIDEO_MPEG4ProfileHybrid = 0x200, + OMX_VIDEO_MPEG4ProfileAdvancedRealTime = 0x400, + OMX_VIDEO_MPEG4ProfileCoreScalable = 0x800, + OMX_VIDEO_MPEG4ProfileAdvancedCoding = 0x1000, + OMX_VIDEO_MPEG4ProfileAdvancedCore = 0x2000, OMX_VIDEO_MPEG4ProfileAdvancedScalable = 0x4000, OMX_VIDEO_MPEG4ProfileAdvancedSimple = 0x8000, - OMX_VIDEO_MPEG4ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG4ProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG4ProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG4ProfileMax = 0x7FFFFFFF + OMX_VIDEO_MPEG4ProfileMax = 0x7FFFFFFF } OMX_VIDEO_MPEG4PROFILETYPE; - -/** - * MPEG-4 level types, each level indicates support for various frame - * sizes, bit rates, decoder frame rates. No need +/** + * MPEG-4 level types, each level indicates support for various frame + * sizes, bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_MPEG4LEVELTYPE { - OMX_VIDEO_MPEG4Level0 = 0x01, /**< Level 0 */ - OMX_VIDEO_MPEG4Level0b = 0x02, /**< Level 0b */ - OMX_VIDEO_MPEG4Level1 = 0x04, /**< Level 1 */ - OMX_VIDEO_MPEG4Level2 = 0x08, /**< Level 2 */ - OMX_VIDEO_MPEG4Level3 = 0x10, /**< Level 3 */ - OMX_VIDEO_MPEG4Level4 = 0x20, /**< Level 4 */ - OMX_VIDEO_MPEG4Level4a = 0x40, /**< Level 4a */ - OMX_VIDEO_MPEG4Level5 = 0x80, /**< Level 5 */ - OMX_VIDEO_MPEG4Level6 = 0x100, /**< Level 5 */ - OMX_VIDEO_MPEG4LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_MPEG4Level0 = 0x01, /**< Level 0 */ + OMX_VIDEO_MPEG4Level0b = 0x02, /**< Level 0b */ + OMX_VIDEO_MPEG4Level1 = 0x04, /**< Level 1 */ + OMX_VIDEO_MPEG4Level2 = 0x08, /**< Level 2 */ + OMX_VIDEO_MPEG4Level3 = 0x10, /**< Level 3 */ + OMX_VIDEO_MPEG4Level4 = 0x20, /**< Level 4 */ + OMX_VIDEO_MPEG4Level4a = 0x40, /**< Level 4a */ + OMX_VIDEO_MPEG4Level5 = 0x80, /**< Level 5 */ + OMX_VIDEO_MPEG4Level6 = 0x100, /**< Level 5 */ + OMX_VIDEO_MPEG4LevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_MPEG4LevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_MPEG4LevelMax = 0x7FFFFFFF + OMX_VIDEO_MPEG4LevelMax = 0x7FFFFFFF } OMX_VIDEO_MPEG4LEVELTYPE; - -/** +/** * MPEG-4 configuration. This structure handles configuration options * which are specific to MPEG4 algorithms * @@ -652,24 +629,24 @@ typedef enum OMX_VIDEO_MPEG4LEVELTYPE { * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSliceHeaderSpacing : Number of macroblocks between slice header (H263+ + * nSliceHeaderSpacing : Number of macroblocks between slice header (H263+ * Annex K). Put zero if not used * bSVH : Enable Short Video Header mode * bGov : Flag to enable GOV - * nPFrames : Number of P frames between each I frame (also called + * nPFrames : Number of P frames between each I frame (also called * GOV period) * nBFrames : Number of B frames between each I frame * nIDCVLCThreshold : Value of intra DC VLC threshold * bACPred : Flag to use ac prediction * nMaxPacketSize : Maximum size of packet in bytes. - * nTimeIncRes : Used to pass VOP time increment resolution for MPEG4. + * nTimeIncRes : Used to pass VOP time increment resolution for MPEG4. * Interpreted as described in MPEG4 standard. * eProfile : MPEG-4 profile(s) to use. * eLevel : MPEG-4 level(s) to use. * nAllowedPictureTypes : Specifies the picture types allowed in the bitstream * nHeaderExtension : Specifies the number of consecutive video packet * headers within a VOP - * bReversibleVLC : Specifies whether reversible variable length coding + * bReversibleVLC : Specifies whether reversible variable length coding * is in use */ typedef struct OMX_VIDEO_PARAM_MPEG4TYPE { @@ -692,23 +669,21 @@ typedef struct OMX_VIDEO_PARAM_MPEG4TYPE { OMX_BOOL bReversibleVLC; } OMX_VIDEO_PARAM_MPEG4TYPE; - -/** - * WMV Versions +/** + * WMV Versions */ typedef enum OMX_VIDEO_WMVFORMATTYPE { OMX_VIDEO_WMVFormatUnused = 0x01, /**< Format unused or unknown */ OMX_VIDEO_WMVFormat7 = 0x02, /**< Windows Media Video format 7 */ OMX_VIDEO_WMVFormat8 = 0x04, /**< Windows Media Video format 8 */ OMX_VIDEO_WMVFormat9 = 0x08, /**< Windows Media Video format 9 */ - OMX_VIDEO_WMFFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_WMFFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_WMFFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_WMVFormatMax = 0x7FFFFFFF } OMX_VIDEO_WMVFORMATTYPE; - -/** - * WMV Params +/** + * WMV Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -717,33 +692,31 @@ typedef enum OMX_VIDEO_WMVFORMATTYPE { * eFormat : Version of WMV stream / data */ typedef struct OMX_VIDEO_PARAM_WMVTYPE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_VIDEO_WMVFORMATTYPE eFormat; } OMX_VIDEO_PARAM_WMVTYPE; - -/** - * Real Video Version +/** + * Real Video Version */ typedef enum OMX_VIDEO_RVFORMATTYPE { OMX_VIDEO_RVFormatUnused = 0, /**< Format unused or unknown */ OMX_VIDEO_RVFormat8, /**< Real Video format 8 */ OMX_VIDEO_RVFormat9, /**< Real Video format 9 */ OMX_VIDEO_RVFormatG2, /**< Real Video Format G2 */ - OMX_VIDEO_RVFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_RVFormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_RVFormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_RVFormatMax = 0x7FFFFFFF } OMX_VIDEO_RVFORMATTYPE; - -/** - * Real Video Params +/** + * Real Video Params * * STUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * eFormat : Version of RV stream / data * nBitsPerPixel : Bits per pixel coded in the frame @@ -755,11 +728,11 @@ typedef enum OMX_VIDEO_RVFORMATTYPE { * nMaxEncodeFrameSize: Max encoded frame size * bEnablePostFilter : Turn on/off post filter * bEnableTemporalInterpolation : Turn on/off temporal interpolation - * bEnableLatencyMode : When enabled, the decoder does not display a decoded - * frame until it has detected that no enhancement layer - * frames or dependent B frames will be coming. This - * detection usually occurs when a subsequent non-B - * frame is encountered + * bEnableLatencyMode : When enabled, the decoder does not display a decoded + * frame until it has detected that no enhancement layer + * frames or dependent B frames will be coming. This + * detection usually occurs when a subsequent non-B + * frame is encountered */ typedef struct OMX_VIDEO_PARAM_RVTYPE { OMX_U32 nSize; @@ -778,9 +751,8 @@ typedef struct OMX_VIDEO_PARAM_RVTYPE { OMX_BOOL bEnableLatencyMode; } OMX_VIDEO_PARAM_RVTYPE; - -/** - * AVC profile types, each profile indicates support for various +/** + * AVC profile types, each profile indicates support for various * performance bounds and different annexes. */ typedef enum OMX_VIDEO_AVCPROFILETYPE { @@ -792,15 +764,14 @@ typedef enum OMX_VIDEO_AVCPROFILETYPE { OMX_VIDEO_AVCProfileHigh422 = 0x20, /**< High 4:2:2 profile */ OMX_VIDEO_AVCProfileHigh444 = 0x40, /**< High 4:4:4 profile */ OMX_VIDEO_AVCProfileConstrainedBaseline = 0x80, /**< Constrained Baseline Profile */ - OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCProfileKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCProfileVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_AVCProfileMax = 0x7FFFFFFF + OMX_VIDEO_AVCProfileMax = 0x7FFFFFFF } OMX_VIDEO_AVCPROFILETYPE; - -/** - * AVC level types, each level indicates support for various frame sizes, - * bit rates, decoder frame rates. No need +/** + * AVC level types, each level indicates support for various frame sizes, + * bit rates, decoder frame rates. No need */ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel1 = 0x01, /**< Level 1 */ @@ -819,14 +790,13 @@ typedef enum OMX_VIDEO_AVCLEVELTYPE { OMX_VIDEO_AVCLevel42 = 0x2000, /**< Level 4.2 */ OMX_VIDEO_AVCLevel5 = 0x4000, /**< Level 5 */ OMX_VIDEO_AVCLevel51 = 0x8000, /**< Level 5.1 */ - OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCLevelKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLevelVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ - OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF + OMX_VIDEO_AVCLevelMax = 0x7FFFFFFF } OMX_VIDEO_AVCLEVELTYPE; - -/** - * AVC loop filter modes +/** + * AVC loop filter modes * * OMX_VIDEO_AVCLoopFilterEnable : Enable * OMX_VIDEO_AVCLoopFilterDisable : Disable @@ -836,20 +806,19 @@ typedef enum OMX_VIDEO_AVCLOOPFILTERTYPE { OMX_VIDEO_AVCLoopFilterEnable = 0, OMX_VIDEO_AVCLoopFilterDisable, OMX_VIDEO_AVCLoopFilterDisableSliceBoundary, - OMX_VIDEO_AVCLoopFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_AVCLoopFilterKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_AVCLoopFilterVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_AVCLoopFilterMax = 0x7FFFFFFF } OMX_VIDEO_AVCLOOPFILTERTYPE; - -/** - * AVC params +/** + * AVC params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to - * nSliceHeaderSpacing : Number of macroblocks between slice header, put + * nSliceHeaderSpacing : Number of macroblocks between slice header, put * zero if not used * nPFrames : Number of P frames between each I frame * nBFrames : Number of B frames between each I frame @@ -862,85 +831,85 @@ typedef enum OMX_VIDEO_AVCLOOPFILTERTYPE { * nRefIdxForward : Pic param set ref frame index (index into ref * frame buffer of forward frames list), B frame * support - * bEnableUEP : Enable/disable unequal error protection. This + * bEnableUEP : Enable/disable unequal error protection. This * is only valid of data partitioning is enabled. * bEnableFMO : Enable/disable flexible macroblock ordering * bEnableASO : Enable/disable arbitrary slice ordering * bEnableRS : Enable/disable sending of redundant slices * eProfile : AVC profile(s) to use * eLevel : AVC level(s) to use - * nAllowedPictureTypes : Specifies the picture types allowed in the + * nAllowedPictureTypes : Specifies the picture types allowed in the * bitstream - * bFrameMBsOnly : specifies that every coded picture of the - * coded video sequence is a coded frame + * bFrameMBsOnly : specifies that every coded picture of the + * coded video sequence is a coded frame * containing only frame macroblocks - * bMBAFF : Enable/disable switching between frame and + * bMBAFF : Enable/disable switching between frame and * field macroblocks within a picture - * bEntropyCodingCABAC : Entropy decoding method to be applied for the - * syntax elements for which two descriptors appear + * bEntropyCodingCABAC : Entropy decoding method to be applied for the + * syntax elements for which two descriptors appear * in the syntax tables - * bWeightedPPrediction : Enable/disable weighted prediction shall not + * bWeightedPPrediction : Enable/disable weighted prediction shall not * be applied to P and SP slices - * nWeightedBipredicitonMode : Default weighted prediction is applied to B - * slices + * nWeightedBipredicitonMode : Default weighted prediction is applied to B + * slices * bconstIpred : Enable/disable intra prediction - * bDirect8x8Inference : Specifies the method used in the derivation - * process for luma motion vectors for B_Skip, - * B_Direct_16x16 and B_Direct_8x8 as specified - * in subclause 8.4.1.2 of the AVC spec + * bDirect8x8Inference : Specifies the method used in the derivation + * process for luma motion vectors for B_Skip, + * B_Direct_16x16 and B_Direct_8x8 as specified + * in subclause 8.4.1.2 of the AVC spec * bDirectSpatialTemporal : Flag indicating spatial or temporal direct - * mode used in B slice coding (related to - * bDirect8x8Inference) . Spatial direct mode is + * mode used in B slice coding (related to + * bDirect8x8Inference) . Spatial direct mode is * more common and should be the default. * nCabacInitIdx : Index used to init CABAC contexts * eLoopFilterMode : Enable/disable loop filter */ typedef struct OMX_VIDEO_PARAM_AVCTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nSliceHeaderSpacing; - OMX_U32 nPFrames; - OMX_U32 nBFrames; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nSliceHeaderSpacing; + OMX_U32 nPFrames; + OMX_U32 nBFrames; OMX_BOOL bUseHadamard; - OMX_U32 nRefFrames; + OMX_U32 nRefFrames; OMX_U32 nRefIdx10ActiveMinus1; OMX_U32 nRefIdx11ActiveMinus1; - OMX_BOOL bEnableUEP; - OMX_BOOL bEnableFMO; - OMX_BOOL bEnableASO; - OMX_BOOL bEnableRS; + OMX_BOOL bEnableUEP; + OMX_BOOL bEnableFMO; + OMX_BOOL bEnableASO; + OMX_BOOL bEnableRS; OMX_VIDEO_AVCPROFILETYPE eProfile; - OMX_VIDEO_AVCLEVELTYPE eLevel; - OMX_U32 nAllowedPictureTypes; - OMX_BOOL bFrameMBsOnly; - OMX_BOOL bMBAFF; - OMX_BOOL bEntropyCodingCABAC; - OMX_BOOL bWeightedPPrediction; - OMX_U32 nWeightedBipredicitonMode; + OMX_VIDEO_AVCLEVELTYPE eLevel; + OMX_U32 nAllowedPictureTypes; + OMX_BOOL bFrameMBsOnly; + OMX_BOOL bMBAFF; + OMX_BOOL bEntropyCodingCABAC; + OMX_BOOL bWeightedPPrediction; + OMX_U32 nWeightedBipredicitonMode; OMX_BOOL bconstIpred ; - OMX_BOOL bDirect8x8Inference; + OMX_BOOL bDirect8x8Inference; OMX_BOOL bDirectSpatialTemporal; OMX_U32 nCabacInitIdc; OMX_VIDEO_AVCLOOPFILTERTYPE eLoopFilterMode; } OMX_VIDEO_PARAM_AVCTYPE; typedef struct OMX_VIDEO_PARAM_PROFILELEVELTYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 eProfile; /**< type is OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE, + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 eProfile; /**< type is OMX_VIDEO_AVCPROFILETYPE, OMX_VIDEO_H263PROFILETYPE, or OMX_VIDEO_MPEG4PROFILETYPE depending on context */ - OMX_U32 eLevel; /**< type is OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE, + OMX_U32 eLevel; /**< type is OMX_VIDEO_AVCLEVELTYPE, OMX_VIDEO_H263LEVELTYPE, or OMX_VIDEO_MPEG4PROFILETYPE depending on context */ OMX_U32 nProfileIndex; /**< Used to query for individual profile support information, - This parameter is valid only for + This parameter is valid only for OMX_IndexParamVideoProfileLevelQuerySupported index, For all other indices this parameter is to be ignored. */ } OMX_VIDEO_PARAM_PROFILELEVELTYPE; -/** - * Structure for dynamically configuring bitrate mode of a codec. +/** + * Structure for dynamically configuring bitrate mode of a codec. * * STRUCT MEMBERS: * nSize : Size of the struct in bytes @@ -949,18 +918,18 @@ typedef struct OMX_VIDEO_PARAM_PROFILELEVELTYPE { * nEncodeBitrate : Target average bitrate to be generated in bps */ typedef struct OMX_VIDEO_CONFIG_BITRATETYPE { - OMX_U32 nSize; - OMX_VERSIONTYPE nVersion; - OMX_U32 nPortIndex; - OMX_U32 nEncodeBitrate; + OMX_U32 nSize; + OMX_VERSIONTYPE nVersion; + OMX_U32 nPortIndex; + OMX_U32 nEncodeBitrate; } OMX_VIDEO_CONFIG_BITRATETYPE; -/** +/** * Defines Encoder Frame Rate setting * * STRUCT MEMBERS: * nSize : Size of the structure in bytes - * nVersion : OMX specification version information + * nVersion : OMX specification version information * nPortIndex : Port that this structure applies to * xEncodeFramerate : Encoding framerate represented in Q16 format */ @@ -1000,8 +969,8 @@ typedef struct OMX_PARAM_MACROBLOCKSTYPE { OMX_U32 nMacroblocks; } OMX_PARAM_MACROBLOCKSTYPE; -/** - * AVC Slice Mode modes +/** + * AVC Slice Mode modes * * OMX_VIDEO_SLICEMODE_AVCDefault : Normal frame encoding, one slice per frame * OMX_VIDEO_SLICEMODE_AVCMBSlice : NAL mode, number of MBs per frame @@ -1011,13 +980,13 @@ typedef enum OMX_VIDEO_AVCSLICEMODETYPE { OMX_VIDEO_SLICEMODE_AVCDefault = 0, OMX_VIDEO_SLICEMODE_AVCMBSlice, OMX_VIDEO_SLICEMODE_AVCByteSlice, - OMX_VIDEO_SLICEMODE_AVCKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ + OMX_VIDEO_SLICEMODE_AVCKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_VIDEO_SLICEMODE_AVCVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ OMX_VIDEO_SLICEMODE_AVCLevelMax = 0x7FFFFFFF } OMX_VIDEO_AVCSLICEMODETYPE; -/** - * AVC FMO Slice Mode Params +/** + * AVC FMO Slice Mode Params * * STRUCT MEMBERS: * nSize : Size of the structure in bytes @@ -1028,7 +997,7 @@ typedef enum OMX_VIDEO_AVCSLICEMODETYPE { * eSliceMode : Specifies the type of slice */ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U8 nNumSliceGroups; @@ -1036,7 +1005,7 @@ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { OMX_VIDEO_AVCSLICEMODETYPE eSliceMode; } OMX_VIDEO_PARAM_AVCSLICEFMO; -/** +/** * AVC IDR Period Configs * * STRUCT MEMBERS: @@ -1047,14 +1016,14 @@ typedef struct OMX_VIDEO_PARAM_AVCSLICEFMO { * nPFrames : Specifies internal of coding Intra frames */ typedef struct OMX_VIDEO_CONFIG_AVCINTRAPERIOD { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nIDRPeriod; OMX_U32 nPFrames; } OMX_VIDEO_CONFIG_AVCINTRAPERIOD; -/** +/** * AVC NAL Size Configs * * STRUCT MEMBERS: @@ -1064,13 +1033,12 @@ typedef struct OMX_VIDEO_CONFIG_AVCINTRAPERIOD { * nNaluBytes : Specifies the NAL unit size */ typedef struct OMX_VIDEO_CONFIG_NALSIZE { - OMX_U32 nSize; + OMX_U32 nSize; OMX_VERSIONTYPE nVersion; OMX_U32 nPortIndex; OMX_U32 nNaluBytes; } OMX_VIDEO_CONFIG_NALSIZE; - /** @} */ #ifdef __cplusplus @@ -1079,4 +1047,3 @@ typedef struct OMX_VIDEO_CONFIG_NALSIZE { #endif /* File EOF */ - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/CMakeLists.txt index c10e3b6a84..829b6ee397 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/CMakeLists.txt +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/CMakeLists.txt @@ -14,7 +14,7 @@ target_link_libraries(vcfiled vchiq_arm vcos) -install(TARGETS vcfiled +install(TARGETS vcfiled RUNTIME DESTINATION sbin) configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled) diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled.c b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled.c index c856285c49..469b105659 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled.c +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled.c @@ -205,7 +205,7 @@ int main(int argc, char *const *argv) vchi_mphi_message_driver_func_table()); vchi_connect(&global_connection, 1, global_initialise_instance); - + vc_vchi_filesys_init (global_initialise_instance, &global_connection, 1); for (;;) @@ -217,4 +217,3 @@ int main(int argc, char *const *argv) return 0; } - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.c b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.c index 35e089931f..d23851fe4a 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.c +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.c @@ -76,7 +76,7 @@ int vcfiled_lock(const char *lockfile, VCFILED_LOGMSG_T logmsg) } } } - // at this point, we have opened the file, and can use discretionary locking, + // at this point, we have opened the file, and can use discretionary locking, // which should work even over NFS struct flock flock; @@ -126,7 +126,7 @@ finish: int vcfiled_is_running(const char *filename) { int ret; - + int fd = open(filename, O_RDONLY); if (fd < 0) { @@ -155,7 +155,7 @@ int vcfiled_is_running(const char *filename) /* file is unlocked, so filed not running */ ret = 0; } - else + else { /* file is locked, so filed is running */ ret = 1; @@ -165,5 +165,3 @@ int vcfiled_is_running(const char *filename) return ret; } - - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.h b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.h index 360f50a901..d11d1c281b 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.h +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_check.h @@ -42,7 +42,5 @@ typedef void (*VCFILED_LOGMSG_T)(int level, const char *fmt, ...); int vcfiled_lock(const char *filename, VCFILED_LOGMSG_T logmsg); extern int vcfiled_is_running(const char *lockfile); - #endif - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_lock_test.c b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_lock_test.c index 28e83ca226..96c9a38352 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_lock_test.c +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfiled/vcfiled_lock_test.c @@ -79,4 +79,3 @@ int main(int argc, const char **argv) } return 0; } - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vcfilesys.c b/gfx/include/userland/interface/vmcs_host/linux/vcfilesys.c index 9f3ebf1598..9db14b52b9 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vcfilesys.c +++ b/gfx/include/userland/interface/vmcs_host/linux/vcfilesys.c @@ -139,7 +139,7 @@ RETURNS void vc_hostfs_init(void) { // This hostfs module is not thread safe - it allocaes a block - // of memory and uses it without any kind of locking. + // of memory and uses it without any kind of locking. // // It offers no advantage of stdio, and so most clients should // not use it. Arguably FILESYS should use it in order to get @@ -221,7 +221,6 @@ long vc_hostfs_lseek(int fildes, long offset, int whence) return (long) vc_hostfs_lseek64( fildes, (int64_t) offset, whence); } - /****************************************************************************** NAME vc_hostfs_lseek64 @@ -288,9 +287,6 @@ int64_t vc_hostfs_lseek64(int fildes, int64_t offset, int whence) } } - - - /****************************************************************************** NAME vc_hostfs_open @@ -572,10 +568,6 @@ int vc_hostfs_freespace(const char *inPath) return ret; } - - - - /****************************************************************************** NAME vc_hostfs_freespace @@ -617,7 +609,6 @@ int64_t vc_hostfs_freespace64(const char *inPath) return ret; } - /****************************************************************************** NAME vc_hostfs_get_attr @@ -639,7 +630,6 @@ int vc_hostfs_get_attr(const char *path, fattributes_t *attr) DEBUG_MINOR("vc_hostfs_get_attr: '%s'", path ); - *attr = 0; if ( stat( path, &sb ) == 0 ) @@ -976,7 +966,6 @@ int vc_hostfs_setend(int filedes) return -1; } - /****************************************************************************** NAME vc_hostfs_totalspace64 @@ -1023,7 +1012,6 @@ int64_t vc_hostfs_totalspace64(const char *inPath) return ret; } - /****************************************************************************** NAME vc_hostfs_totalspace @@ -1105,7 +1093,6 @@ void vc_hostfs_scandisk(const char *path) // not yet implemented } - /****************************************************************************** NAME vc_hostfs_chkdsk @@ -1128,4 +1115,3 @@ int vc_hostfs_chkdsk(const char *path, int fix_errors) (void)fix_errors; return 0; } - diff --git a/gfx/include/userland/interface/vmcs_host/linux/vchost_config.h b/gfx/include/userland/interface/vmcs_host/linux/vchost_config.h index 4207ec807c..163ac71ce3 100644 --- a/gfx/include/userland/interface/vmcs_host/linux/vchost_config.h +++ b/gfx/include/userland/interface/vmcs_host/linux/vchost_config.h @@ -55,7 +55,7 @@ extern void vc_os_close(void); #define VCHPOST_ #endif #ifndef VCCPRE_ -#define VCCPRE_ +#define VCCPRE_ #endif #endif diff --git a/gfx/include/userland/interface/vmcs_host/vc_cec.h b/gfx/include/userland/interface/vmcs_host/vc_cec.h index f7fe24e255..f117bcd58c 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_cec.h +++ b/gfx/include/userland/interface/vmcs_host/vc_cec.h @@ -368,7 +368,7 @@ typedef enum { * bit 11-8 index to upstream device * bit 15-12 number of downstream device * bit 31-16 index of first 4 downstream devices - * + * * To keep life simple we only show the first 4 connected downstream devices * */ @@ -405,11 +405,10 @@ typedef enum { VC_CEC_LOGICAL_ADDR_LOST = (1 << 15) /** and messages respectively) * returns the code from the most recent respectively. * The host application will need to find out the vendor ID of the initiator * separately in the case if / commands were received. * will not be longer than 6 bytes (including header) * - * VC_CEC_LOGICAL_ADDR returns 0xF in param1 whenever no logical address is in used. If physical address is 0xFFFF, - * this means CEC is being disabled. Otherwise physical address is the one read from EDID (and no suitable logical address + * VC_CEC_LOGICAL_ADDR returns 0xF in param1 whenever no logical address is in used. If physical address is 0xFFFF, + * this means CEC is being disabled. Otherwise physical address is the one read from EDID (and no suitable logical address * is avaiable to be allocated). Host application should only attempt to send message if both param1 is not 0xF AND param2 * is not 0xFFFF. * @@ -459,7 +458,7 @@ typedef enum { * own logical address. * * If CEC is running in passive mode, the host will get a VC_CEC_LOGICAL_ADDR_LOST callback if the logical address is - * lost (e.g. HDMI mode change). In this case the host should try a new logical address. The physical address returned may + * lost (e.g. HDMI mode change). In this case the host should try a new logical address. The physical address returned may * also change, so the host should check this. */ @@ -483,7 +482,7 @@ typedef enum { typedef void (*CEC_CALLBACK_T)(void *client_p, uint32_t reason, uint32_t param1, uint32_t param2, uint32_t param3, uint32_t param4); /** - * Some macros to get some fields from the callback parameters in CEC callback + * Some macros to get some fields from the callback parameters in CEC callback */ //Marcos operating on reason #define CEC_CB_REASON(x) ((x) & 0xFFFF) /** Get callback reason */ diff --git a/gfx/include/userland/interface/vmcs_host/vc_cecservice.h b/gfx/include/userland/interface/vmcs_host/vc_cecservice.h index 1b24221d3e..12ec1e0264 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_cecservice.h +++ b/gfx/include/userland/interface/vmcs_host/vc_cecservice.h @@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * CEC service host API, + * CEC service host API, * See vc_cec.h and vc_cecservice_defs.h for related constants */ @@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** * \file * This API defines the controls for CEC. HDMI must be powered on before - * CEC is available (subject to CEC support in TV). + * CEC is available (subject to CEC support in TV). * * In general, a zero return value indicates success; a negative return * value indicates error in VCHI layer; a positive return value indicates @@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * Callback function for host side notification + * Callback function for host side notification * This is the SAME as the callback function type defined in vc_cec.h * Host applications register a single callback for all CEC related notifications. * See vc_cec.h for meanings of all parameters @@ -62,13 +62,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * bits 31-24 is the return code (if any) * * @param param1 is the first parameter - * + * * @param param2 is the second parameter * * @param param3 is the third parameter * * @param param4 is the fourth parameter - * + * * @return void */ typedef void (*CECSERVICE_CALLBACK_T)(void *callback_data, uint32_t reason, uint32_t param1, uint32_t param2, uint32_t param3, uint32_t param4); @@ -94,11 +94,11 @@ VCHPRE_ void vc_vchi_cec_stop( void ); /** * Host applications use vc_cec_register_callaback to register - * callback to handle all CEC notifications. If more than one applications + * callback to handle all CEC notifications. If more than one applications * need to use CEC, there should be ONE central application which acts on * behalf of all clients and handles all communications with CEC services. * - * @param callback function + * @param callback function * @param context to be passed when function is called * @return void ***********************************************************/ @@ -107,16 +107,16 @@ VCHPRE_ void vc_cec_register_callback(CECSERVICE_CALLBACK_T callback, void *call //Service API /** * Use vc_cec_register_command to register an opcode to - * to forwarded to the host application. By default + * to forwarded to the host application. By default * is always forwarded. Once an opcode is registered, it is left to * the host application to reply to a CEC message (where appropriate). - * It is recommended NOT to register the following commands as they + * It is recommended NOT to register the following commands as they * are replied to automatically by CEC middleware: * , , , * , , , * and * In addition, the following opcodes cannot be registered: - * , , + * , , * , , * and . * is always forwarded if it is the reply @@ -131,7 +131,7 @@ VCHPRE_ int VCHPOST_ vc_cec_register_command(CEC_OPCODE_T opcode); /** * vc_cec_register_all registers all opcodes except * to be forwarded as CEC_RX notification. - * Button presses , etc. will still be forwarded + * Button presses , etc. will still be forwarded * separately as VC_CEC_BUTTON_PRESSED etc. notification. * * @param None @@ -144,7 +144,7 @@ VCHPRE_ int VCHPOST_ vc_cec_register_all( void ); * Use vc_cec_deregister_command to remove an opcode from * the filter for forwarding. By default is always forwarded. * The following opcode cannot be deregistered: - * , , + * , , * , , * and . * @@ -165,8 +165,8 @@ VCHPRE_ int VCHPOST_ vc_cec_deregister_command(CEC_OPCODE_T opcode); VCHPRE_ int VCHPOST_ vc_cec_deregister_all( void ); /** - * vc_cec_send_message allows a host application to - * send a CEC message to another device. There are several + * vc_cec_send_message allows a host application to + * send a CEC message to another device. There are several * built-in functions for sending command messages. The host * application MUST have a valid logical address (between 1 and * 14 inclusive) before it can send a message. @@ -190,7 +190,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_message(const uint32_t follower, uint32_t length, vcos_bool_t is_reply); /** - * vc_cec_get_logical_address gets the logical address, + * vc_cec_get_logical_address gets the logical address, * If one is being allocated 0xF (unregistered) will be set. * A address value of 0xF also means CEC system is not yet ready * to send or receive any messages. @@ -203,37 +203,37 @@ VCHPRE_ int VCHPOST_ vc_cec_send_message(const uint32_t follower, VCHPRE_ int VCHPOST_ vc_cec_get_logical_address(CEC_AllDevices_T *logical_address); /** - * vc_cec_alloc_logical_address starts the allocation + * vc_cec_alloc_logical_address starts the allocation * of a logical address. Logical address is automatically allocated * after HDMI power on is complete and AV mute is deassert. - * The host only needs to call this if the - * initial allocation failed (logical address being 0xF and + * The host only needs to call this if the + * initial allocation failed (logical address being 0xF and * physical address is NOT 0xFFFF from VC_CEC_LOGICAL_ADDR - * notification), or if the host explicitly released its logical + * notification), or if the host explicitly released its logical * address. * * @param none * * @return zero if the command is successful, non-zero otherwise * If successful, there will be a callback notification - * VC_CEC_LOGICAL_ADDR. - * The host should wait for this before calling this + * VC_CEC_LOGICAL_ADDR. + * The host should wait for this before calling this * function again. ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_alloc_logical_address( void ); /** - * Normally vc_cec_release_logical_address will not - * be called by the host application. It is used to release + * Normally vc_cec_release_logical_address will not + * be called by the host application. It is used to release * our logical address. This effectively disables CEC. * The host will need to allocate a new logical address before - * doing any CEC calls (send/receive message, get topology, etc.). + * doing any CEC calls (send/receive message, get topology, etc.). * * @param none * * @return zero if the command is successful, non-zero otherwise * The host should get a callback VC_CEC_LOGICAL_ADDR - * with 0xF being the logical address and 0xFFFF + * with 0xF being the logical address and 0xFFFF * being the physical address. ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_release_logical_address( void ); @@ -251,7 +251,7 @@ VCHPRE_ int VCHPOST_ vc_cec_release_logical_address( void ); VCHPRE_ int VCHPOST_ vc_cec_get_topology( VC_CEC_TOPOLOGY_T* topology); /** - * Use vc_cec_set_vendor_id to + * Use vc_cec_set_vendor_id to * set the response to * * @param 24-bit IEEE vendor id @@ -263,7 +263,7 @@ VCHPRE_ int VCHPOST_ vc_cec_set_vendor_id( const uint32_t id ); /** * Use vc_cec_set_osd_name to * set the response to - * + * * @param OSD name (14 byte char array) * * @return zero if the command is successful, non-zero otherwise @@ -314,14 +314,14 @@ VCHPRE_ CEC_DEVICE_TYPE_T VCHPOST_ vc_cec_device_type(const CEC_AllDevices_T log * then it can be sent as a normal message (not as a reply) * and the initiator field is ignored with vc_cec_send_message2 * and return zero for success - * + * * Applications can call vc_cec_param2message to turn the callback parameters - * into a VC_CEC_MESSAGE_T (not for LOGICAL_ADDR and TOPOLOGY callbacks). + * into a VC_CEC_MESSAGE_T (not for LOGICAL_ADDR and TOPOLOGY callbacks). * It also returns zero for success. */ VCHPRE_ int VCHPOST_ vc_cec_send_message2(const VC_CEC_MESSAGE_T *message); -VCHPRE_ int VCHPOST_ vc_cec_param2message( const uint32_t reason, const uint32_t param1, +VCHPRE_ int VCHPOST_ vc_cec_param2message( const uint32_t reason, const uint32_t param1, const uint32_t param2, const uint32_t param3, const uint32_t param4, VC_CEC_MESSAGE_T *message); @@ -360,14 +360,14 @@ VCHPRE_ int VCHPOST_ vc_cec_set_logical_address(const CEC_AllDevices_T logical_a const uint32_t vendor_id); /** - * vc_cec_add_device adds a new device to topology. + * vc_cec_add_device adds a new device to topology. * Only available when CEC is running in passive mode. Device will be * automatically removed from topology if a failed xmit is detected. * If last_device is true, it will trigger a topology computation * (and may trigger a topology callback). * * @param logical address - * + * * @param physical address * * @param device type @@ -387,19 +387,18 @@ VCHPRE_ int VCHPOST_ vc_cec_add_device(const CEC_AllDevices_T logical_address, * passive mode before calling any of the above passive API functions * * @param TRUE to enable passive mode, FALSE to disable - * + * * @return 0 if successful, non-zero otherwise */ VCHPRE_ int VCHPOST_ vc_cec_set_passive(vcos_bool_t enabled); - //API for some common CEC messages -/** - * Functions beginning with vc_cec_send_xxx make it easier for the +/** + * Functions beginning with vc_cec_send_xxx make it easier for the * host application to send CEC message xxx to other devices */ /** - * vc_cec_send_FeatureAbort sends + * vc_cec_send_FeatureAbort sends * for a received command. * * @param follower (cannot be 0xF) @@ -411,8 +410,8 @@ VCHPRE_ int VCHPOST_ vc_cec_set_passive(vcos_bool_t enabled); * @return zero if the command is successful, non-zero otherwise * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_FeatureAbort(uint32_t follower, - CEC_OPCODE_T opcode, +VCHPRE_ int VCHPOST_ vc_cec_send_FeatureAbort(uint32_t follower, + CEC_OPCODE_T opcode, CEC_ABORT_REASON_T reason); /** @@ -430,7 +429,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ActiveSource(uint16_t physical_address, vcos_bo /** * vc_cec_send_ImageViewOn sends - * + * * @param follower * * @param reply or not (normally not) @@ -443,9 +442,9 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ImageViewOn(uint32_t follower, vcos_bool_t is_r /** * vc_cec_send_SetOSDString sends * - * @param follower + * @param follower * - * @param string (char[13]) + * @param string (char[13]) * * @param display control CEC_DISPLAY_CONTROL_T * @@ -454,8 +453,8 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ImageViewOn(uint32_t follower, vcos_bool_t is_r * @return zero if the command is successful, non-zero otherwise * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, - CEC_DISPLAY_CONTROL_T disp_ctrl, +VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, + CEC_DISPLAY_CONTROL_T disp_ctrl, const char* string, vcos_bool_t is_reply); @@ -474,11 +473,11 @@ VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, VCHPRE_ int VCHPOST_ vc_cec_send_Standby(uint32_t follower, vcos_bool_t is_reply); /** - * vc_cec_send_MenuStatus sends + * vc_cec_send_MenuStatus sends * (response to ) * * @param follower - * + * * @param menu state CEC_MENU_STATE_T but NOT CEC_MENU_STATE_QUERY * * @param reply or not (should always be yes) @@ -486,17 +485,17 @@ VCHPRE_ int VCHPOST_ vc_cec_send_Standby(uint32_t follower, vcos_bool_t is_reply * @return zero if the command is successful, non-zero otherwise * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, - CEC_MENU_STATE_T menu_state, +VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, + CEC_MENU_STATE_T menu_state, vcos_bool_t is_reply); /** * vc_cec_send_ReportPhysicalAddress broadcasts * to all devices. Note although - * the passed in device type can be override the default one - * associated the allocated logical address, it is not + * the passed in device type can be override the default one + * associated the allocated logical address, it is not * recommended to do so. One can use vc_cec_device_type - * to get the default device type associated with the logical + * to get the default device type associated with the logical * address returned via VC_CEC_LOGICAL_ADDR callback. * * @param physical address (16-bit packed) @@ -508,7 +507,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, * @return zero if the command is successful, non-zero otherwise * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_ReportPhysicalAddress(uint16_t physical_address, +VCHPRE_ int VCHPOST_ vc_cec_send_ReportPhysicalAddress(uint16_t physical_address, CEC_DEVICE_TYPE_T device_type, vcos_bool_t is_reply); diff --git a/gfx/include/userland/interface/vmcs_host/vc_cecservice_defs.h b/gfx/include/userland/interface/vmcs_host/vc_cecservice_defs.h index 01045e328b..f499200cfc 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_cecservice_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_cecservice_defs.h @@ -40,7 +40,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - #ifndef _VC_CECSERVICE_DEFS_H_ #define _VC_CECSERVICE_DEFS_H_ #include "vcinclude/common.h" @@ -77,8 +76,8 @@ typedef enum { VC_CEC_GET_PHYSICAL_ADDR, VC_CEC_GET_VENDOR_ID, - //The following 3 commands are used when CEC middleware is - //running in passive mode (i.e. it does not allocate + //The following 3 commands are used when CEC middleware is + //running in passive mode (i.e. it does not allocate //logical address automatically) VC_CEC_POLL_ADDR, VC_CEC_SET_LOGICAL_ADDR, @@ -149,10 +148,10 @@ typedef struct { //Only available if CEC is compiled in passive mode and while the host //is testing the availability of a logical address //Parameter: logical address -//Reply: +//Reply: //SET_LOGICAL_ADDR [(only for passive mode) This will be changed when we support multiple logical addresses] -//Set the logical address used +//Set the logical address used //Only available if CEC is compiled in passive mode //Parameter: logical address, device type, vendor ID //Reply: (int32_t - zero means success, non-zero otherwise) @@ -162,7 +161,7 @@ typedef struct { uint32_t device_type; uint32_t vendor_id; } CEC_SET_LOGICAL_ADDR_PARAM_T; - + //ADD_DEVICE (only for passive mode) //Only available if CEC is compiled in passive mode //Parameter: logical address, physical address, device type, last device? diff --git a/gfx/include/userland/interface/vmcs_host/vc_dispmanx.h b/gfx/include/userland/interface/vmcs_host/vc_dispmanx.h index 37fdae122a..a8a2f7711f 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_dispmanx.h +++ b/gfx/include/userland/interface/vmcs_host/vc_dispmanx.h @@ -84,7 +84,7 @@ VCHPRE_ DISPMANX_UPDATE_HANDLE_T VCHPOST_ vc_dispmanx_update_start( int32_t prio // Add an elment to a display as part of an update VCHPRE_ DISPMANX_ELEMENT_HANDLE_T VCHPOST_ vc_dispmanx_element_add ( DISPMANX_UPDATE_HANDLE_T update, DISPMANX_DISPLAY_HANDLE_T display, int32_t layer, const VC_RECT_T *dest_rect, DISPMANX_RESOURCE_HANDLE_T src, - const VC_RECT_T *src_rect, DISPMANX_PROTECTION_T protection, + const VC_RECT_T *src_rect, DISPMANX_PROTECTION_T protection, VC_DISPMANX_ALPHA_T *alpha, DISPMANX_CLAMP_T *clamp, DISPMANX_TRANSFORM_T transform ); // Change the source image of a display element @@ -105,7 +105,7 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_update_submit_sync( DISPMANX_UPDATE_HANDLE_T up VCHPRE_ int VCHPOST_ vc_dispmanx_query_image_formats( uint32_t *supported_formats ); //New function added to VCHI to change attributes, set_opacity does not work there. -VCHPRE_ int VCHPOST_ vc_dispmanx_element_change_attributes( DISPMANX_UPDATE_HANDLE_T update, +VCHPRE_ int VCHPOST_ vc_dispmanx_element_change_attributes( DISPMANX_UPDATE_HANDLE_T update, DISPMANX_ELEMENT_HANDLE_T element, uint32_t change_flags, int32_t layer, @@ -124,12 +124,12 @@ VCHPRE_ void VCHPOST_ vc_vchi_dispmanx_init (VCHI_INSTANCE_T initialise_instance // Take a snapshot of a display in its current state. // This call may block for a time; when it completes, the snapshot is ready. // only transform=0 is supported -VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display, - DISPMANX_RESOURCE_HANDLE_T snapshot_resource, +VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display, + DISPMANX_RESOURCE_HANDLE_T snapshot_resource, DISPMANX_TRANSFORM_T transform ); // Set the resource palette (for VC_IMAGE_4BPP and VC_IMAGE_8BPP) -VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_T handle, +VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_T handle, void * src_address, int offset, int size); // Start triggering callbacks synced to vsync diff --git a/gfx/include/userland/interface/vmcs_host/vc_dispmanx_types.h b/gfx/include/userland/interface/vmcs_host/vc_dispmanx_types.h index 804f716d18..7766398e3b 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_dispmanx_types.h +++ b/gfx/include/userland/interface/vmcs_host/vc_dispmanx_types.h @@ -49,8 +49,6 @@ typedef uint32_t DISPMANX_PROTECTION_T; #define DISPMANX_PROTECTION_NONE 0 #define DISPMANX_PROTECTION_HDCP 11 // Derived from the WM DRM levels, 101-300 - - /* Default display IDs. Note: if you overwrite with your own dispmanx_platform_init function, you should use IDs you provided during dispmanx_display_attach. @@ -193,7 +191,7 @@ typedef struct tag_DISPMANX_DISPLAY_FUNCS_T { int32_t (*get_hvs_config)(void *instance, uint32_t *pchan, uint32_t *poptions, DISPLAY_INFO_T *info, uint32_t *bg_colour, uint32_t *test_mode); - + // Get optional HVS configuration for gamma tables, OLED matrix and dither controls. // Set these function pointers to NULL if the relevant features are not required. int32_t (*get_gamma_params)(void * instance, @@ -201,20 +199,20 @@ typedef struct tag_DISPMANX_DISPLAY_FUNCS_T { int32_t (*get_oled_params)(void * instance, uint32_t * poffsets, uint32_t coeffs[3]); int32_t (*get_dither)(void * instance, uint32_t * dither_depth, uint32_t * dither_type); - + // Get mode information, which may be returned to the applications as a courtesy. // Transform should be set to 0, and {width,height} should be final dimensions. int32_t (*get_info)(void * instance, DISPMANX_MODEINFO_T * info); - + // Inform driver that the application refcount has become nonzero / zero // These callbacks might perhaps be used for backlight and power management. int32_t (*open)(void * instance); int32_t (*close)(void * instance); - + // Display list updated callback. Primarily of use to a "one-shot" display. // For convenience of the driver, we pass the register address of the HVS FIFO. void (*dlist_updated)(void * instance, volatile uint32_t * fifo_reg); - + // End-of-field callback. This may occur in an interrupt context. void (*eof_callback)(void * instance); diff --git a/gfx/include/userland/interface/vmcs_host/vc_dispservice_defs.h b/gfx/include/userland/interface/vmcs_host/vc_dispservice_defs.h index 1240f0e590..9de413ffd4 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_dispservice_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_dispservice_defs.h @@ -50,7 +50,7 @@ typedef enum { VC_FORMAT_TF_RGB565 = 25, VC_FORMAT_BGR888 = 31, VC_FORMAT_BGR888_NP = 32, - + VC_FORMAT_ARGB8888 = 43, VC_FORMAT_XRGB8888 = 44, diff --git a/gfx/include/userland/interface/vmcs_host/vc_dispservice_x_defs.h b/gfx/include/userland/interface/vmcs_host/vc_dispservice_x_defs.h index 9291eef45f..3fab50e623 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_dispservice_x_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_dispservice_x_defs.h @@ -272,5 +272,4 @@ typedef struct { #define TRANSFORM_VFLIP (1<<1) #define TRANSFORM_TRANSPOSE (1<<2) - #endif //VC_DISPSERVICEX_DEFS_H diff --git a/gfx/include/userland/interface/vmcs_host/vc_fileservice_defs.h b/gfx/include/userland/interface/vmcs_host/vc_fileservice_defs.h index cfcb738ce4..9745104907 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_fileservice_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_fileservice_defs.h @@ -88,7 +88,7 @@ enum { VC_FILESYS_TOTALSPACE64= 95, VC_FILESYS_OPEN_DISK = 96, VC_FILESYS_CLOSE_DISK = 97, - + /* extra simple functions for mass storage testing */ VC_FILESYS_READ_SECTOR = 98, //1sect VC_FILESYS_STREAM_SECTOR_BEGIN = 99, diff --git a/gfx/include/userland/interface/vmcs_host/vc_hdmi.h b/gfx/include/userland/interface/vmcs_host/vc_hdmi.h index 9fd844a39c..9ebfe9d6c6 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_hdmi.h +++ b/gfx/include/userland/interface/vmcs_host/vc_hdmi.h @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef int VC_HDMI_BOOL_T; /** - * HDMI resolution groups. There are two main groups: + * HDMI resolution groups. There are two main groups: * CEA - the conventional HDMI ones like 720p * DMT - computer monitor resolutions like XGA */ @@ -298,16 +298,16 @@ typedef enum { HDMI_DMT_1440x900_85 = 0x31, HDMI_DMT_1440x900_120 = 0x32, /** reduced blanking */ HDMI_DMT_UXGA_60 = 0x33, /**<1600x1200 60Hz */ - HDMI_DMT_UXGA_65 = 0x34, - HDMI_DMT_UXGA_70 = 0x35, - HDMI_DMT_UXGA_75 = 0x36, - HDMI_DMT_UXGA_85 = 0x37, + HDMI_DMT_UXGA_65 = 0x34, + HDMI_DMT_UXGA_70 = 0x35, + HDMI_DMT_UXGA_75 = 0x36, + HDMI_DMT_UXGA_85 = 0x37, HDMI_DMT_UXGA_120 = 0x38, /** reduced blanking */ HDMI_DMT_SWXGAP_RB = 0x39, /**<1680x1050 reduced blanking */ HDMI_DMT_SWXGAP_60 = 0x3A, /**<1680x1050 60Hz */ - HDMI_DMT_SWXGAP_75 = 0x3B, - HDMI_DMT_SWXGAP_85 = 0x3C, - HDMI_DMT_SWXGAP_120 = 0x3D, /** reduced blanking */ + HDMI_DMT_SWXGAP_75 = 0x3B, + HDMI_DMT_SWXGAP_85 = 0x3C, + HDMI_DMT_SWXGAP_120 = 0x3D, /** reduced blanking */ HDMI_DMT_1792x1344_60 = 0x3E, /**<1792x1344 60Hz */ HDMI_DMT_1792x1344_75 = 0x3F, /**<1792x1344 75Hz */ HDMI_DMT_1792x1344_120 = 0x40, /** reduced blanking */ diff --git a/gfx/include/userland/interface/vmcs_host/vc_hdmi_property.h b/gfx/include/userland/interface/vmcs_host/vc_hdmi_property.h index 54c3fc43af..45afca7c9a 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_hdmi_property.h +++ b/gfx/include/userland/interface/vmcs_host/vc_hdmi_property.h @@ -29,7 +29,7 @@ modification, are permitted provided that the following conditions are met: * This file contains all the properties one can set in HDMI * Each property has up to two parameters corresponding to list of enums one can set via * the set/get property function from TV service (HOST) or HDMI middleware API (Videocore) - * Each property also has a default value for these parameters. Please refer to + * Each property also has a default value for these parameters. Please refer to * individual properties for details. */ diff --git a/gfx/include/userland/interface/vmcs_host/vc_ilcs_defs.h b/gfx/include/userland/interface/vmcs_host/vc_ilcs_defs.h index 1bfe866d25..67e2258584 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_ilcs_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_ilcs_defs.h @@ -74,7 +74,6 @@ typedef enum { IL_FUNCTION_MAX = 0x7fffffff } IL_FUNCTION_T; - // size of the largest structure passed by get/set // parameter/config // this should be calculated at compile time from IL headers @@ -200,7 +199,7 @@ typedef enum { } IL_BUFFER_METHOD_T; #define IL_BUFFER_BULK_UNALIGNED_MAX (32) // This value needs to be the same on voth VC and HOST. - // Here, we just manually set it to the max of VCHI_BULK_ALIGN on VC and HOST. + // Here, we just manually set it to the max of VCHI_BULK_ALIGN on VC and HOST. #if ( VCHI_BULK_ALIGN > IL_BUFFER_BULK_UNALIGNED_MAX ) #error "VCHI_BULK_ALIGN > IL_BUFFER_BULK_UNALIGNED_MAX. Just set max higher on both VC and HOST so there's space to put the unaligned bytes." #endif diff --git a/gfx/include/userland/interface/vmcs_host/vc_sdtv.h b/gfx/include/userland/interface/vmcs_host/vc_sdtv.h index 5a57528ea9..de8936e9ec 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_sdtv.h +++ b/gfx/include/userland/interface/vmcs_host/vc_sdtv.h @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* * SDTV common host header for TV service */ - + #ifndef _VC_SDTV_H_ #define _VC_SDTV_H_ @@ -49,7 +49,7 @@ typedef enum SDTV_MODE_T_ SDTV_MODE_PAL = 2, /**logical_address = (CEC_DEVICE_TYPE_T) param1; state->physical_address = (uint16_t) (param2 & 0xFFFF); } - + switch(CEC_CB_REASON(reason)) { case VC_CEC_NOTIFY_NONE: cb_reason_str_idx = 0; break; @@ -648,7 +648,6 @@ static void cecservice_logging_init() { } } - /*********************************************************** Actual CEC service API starts here ***********************************************************/ @@ -727,7 +726,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_message(const uint32_t follower, const uint8_t *payload, uint32_t length, vcos_bool_t is_reply) { - int success = -1; + int success = -1; CEC_SEND_MSG_PARAM_T param; if(!vcos_verify(length <= CEC_MAX_XMIT_LENGTH)) return -1; @@ -770,7 +769,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_message(const uint32_t follower, ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_get_logical_address(CEC_AllDevices_T *logical_address) { uint32_t response; - int32_t success = cecservice_send_command_reply( VC_CEC_GET_LOGICAL_ADDR, NULL, 0, + int32_t success = cecservice_send_command_reply( VC_CEC_GET_LOGICAL_ADDR, NULL, 0, &response, sizeof(response)); if(success == 0) { *logical_address = (CEC_AllDevices_T)(VC_VTOH32(response) & 0xF); @@ -791,7 +790,7 @@ VCHPRE_ int VCHPOST_ vc_cec_get_logical_address(CEC_AllDevices_T *logical_addres * (logical address being 0xF and physical address is NOT 0xFFFF * from VC_CEC_LOGICAL_ADDR notification), or if the host explicitly * released its logical address. - * + * * Returns: if the command is successful (zero) or not (non-zero) * If successful, there will be a callback notification * VC_CEC_LOGICAL_ADDR. The host should wait for this before @@ -810,7 +809,7 @@ VCHPRE_ int VCHPOST_ vc_cec_alloc_logical_address( void ) { * Description * Release our logical address. This effectively disables CEC. * The host will need to allocate a new logical address before - * doing any CEC calls (send/receive message, get topology, etc.). + * doing any CEC calls (send/receive message, get topology, etc.). * * Returns: if the command is successful (zero) or not (non-zero) * The host should get a callback VC_CEC_LOGICAL_ADDR with @@ -843,7 +842,7 @@ VCHPRE_ int VCOS_DEPRECATED("returns invalid result") VCHPOST_ vc_cec_get_topolo cecservice_client.topology->active_mask = VC_VTOH16(cecservice_client.topology->active_mask); cecservice_client.topology->num_devices = VC_VTOH16(cecservice_client.topology->num_devices); vc_cec_log_info("CEC topology: mask=0x%x; #device=%d", - cecservice_client.topology->active_mask, + cecservice_client.topology->active_mask, cecservice_client.topology->num_devices); for(i = 0; i < 15; i++) { cecservice_client.topology->device_attr[i] = VC_VTOH32(cecservice_client.topology->device_attr[i]); @@ -883,7 +882,7 @@ VCHPRE_ int VCHPOST_ vc_cec_set_vendor_id( uint32_t id ) { ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_set_osd_name( const char* name ) { vc_cec_log_info("CEC setting OSD name to %s", name); - return cecservice_send_command( VC_CEC_SET_OSD_NAME, name, OSD_NAME_LENGTH, 0); + return cecservice_send_command( VC_CEC_SET_OSD_NAME, name, OSD_NAME_LENGTH, 0); } /*********************************************************** @@ -901,7 +900,7 @@ VCHPRE_ int VCHPOST_ vc_cec_set_osd_name( const char* name ) { ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_get_physical_address(uint16_t *physical_address) { uint32_t response; - int32_t success = cecservice_send_command_reply( VC_CEC_GET_PHYSICAL_ADDR, NULL, 0, + int32_t success = cecservice_send_command_reply( VC_CEC_GET_PHYSICAL_ADDR, NULL, 0, &response, sizeof(response)); if(success == 0) { *physical_address = (uint16_t)(VC_VTOH32(response) & 0xFFFF); @@ -912,7 +911,6 @@ VCHPRE_ int VCHPOST_ vc_cec_get_physical_address(uint16_t *physical_address) { return success; } - /*********************************************************** * Name: vc_cec_get_vendor_id * @@ -927,12 +925,12 @@ VCHPRE_ int VCHPOST_ vc_cec_get_physical_address(uint16_t *physical_address) { * * Returns: if the command is successful (zero) or not (non-zero) * vendor ID is set to zero if unknown or 0xFFFFFF if - * device does not exist. + * device does not exist. ***********************************************************/ VCHPRE_ int VCHPOST_ vc_cec_get_vendor_id( const CEC_AllDevices_T logical_address, uint32_t *vendor_id) { uint32_t log_addr = VC_HTOV32(logical_address); uint32_t response; - int32_t success = cecservice_send_command_reply( VC_CEC_GET_VENDOR_ID, &log_addr, sizeof(log_addr), + int32_t success = cecservice_send_command_reply( VC_CEC_GET_VENDOR_ID, &log_addr, sizeof(log_addr), &response, sizeof(response)); if(success == 0) { vcos_assert(vendor_id); @@ -954,7 +952,7 @@ VCHPRE_ int VCHPOST_ vc_cec_get_vendor_id( const CEC_AllDevices_T logical_addres * Returns: For logical addresses 0-11 the default * device type of that address will be returned * logical address 12-14 will return "reserved" type. - * + * ***********************************************************/ VCHPRE_ CEC_DEVICE_TYPE_T VCHPOST_ vc_cec_device_type(const CEC_AllDevices_T logical_address) { CEC_DEVICE_TYPE_T device_type = CEC_DeviceType_Invalid; @@ -994,7 +992,7 @@ VCHPRE_ CEC_DEVICE_TYPE_T VCHPOST_ vc_cec_device_type(const CEC_AllDevices_T log } /*********************************************************** - * Name: vc_cec_send_message2 + * Name: vc_cec_send_message2 * * Arguments: * pointer to encapsulated message @@ -1011,7 +1009,7 @@ VCHPRE_ CEC_DEVICE_TYPE_T VCHPOST_ vc_cec_device_type(const CEC_AllDevices_T log VCHPRE_ int VCHPOST_ vc_cec_send_message2(const VC_CEC_MESSAGE_T *message) { if(vcos_verify(message)) { return vc_cec_send_message(message->follower, - (message->length)? + (message->length)? message->payload : NULL, message->length, VC_FALSE); @@ -1034,10 +1032,10 @@ VCHPRE_ int VCHPOST_ vc_cec_send_message2(const VC_CEC_MESSAGE_T *message) { * Returns: zero normally * non-zero if something has gone wrong ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_param2message( const uint32_t reason, const uint32_t param1, +VCHPRE_ int VCHPOST_ vc_cec_param2message( const uint32_t reason, const uint32_t param1, const uint32_t param2, const uint32_t param3, const uint32_t param4, VC_CEC_MESSAGE_T *message) { - if(vcos_verify(message && + if(vcos_verify(message && CEC_CB_REASON(reason) != VC_CEC_LOGICAL_ADDR && CEC_CB_REASON(reason) != VC_CEC_TOPOLOGY)) { message->length = CEC_CB_MSG_LENGTH(reason) - 1; //Length is without the header byte @@ -1068,8 +1066,8 @@ VCHPRE_ int VCHPOST_ vc_cec_param2message( const uint32_t reason, const uint32_t * * Description * Sets and polls a particular address to find out - * its availability in the CEC network. Only available - * when CEC is running in passive mode. The host can + * its availability in the CEC network. Only available + * when CEC is running in passive mode. The host can * only call this function during logical address allocation stage. * * Returns: 0 if poll is successful (address is occupied) @@ -1081,7 +1079,7 @@ VCHPRE_ int VCHPOST_ vc_cec_poll_address(const CEC_AllDevices_T logical_address) int32_t response = VC_CEC_ERROR_INVALID_ARGUMENT; int32_t success = -1; vc_cec_log_info("CEC polling address %d", logical_address); - success = cecservice_send_command_reply( VC_CEC_POLL_ADDR, &log_addr, sizeof(log_addr), + success = cecservice_send_command_reply( VC_CEC_POLL_ADDR, &log_addr, sizeof(log_addr), &response, sizeof(response)); return (success == 0)? response : success; } @@ -1093,8 +1091,8 @@ VCHPRE_ int VCHPOST_ vc_cec_poll_address(const CEC_AllDevices_T logical_address) * logical address, device type, vendor id * * Description - * sets the logical address, device type and vendor ID to be in use. - * Only available when CEC is running in passive mode. It is the + * sets the logical address, device type and vendor ID to be in use. + * Only available when CEC is running in passive mode. It is the * responsibility of the host to make sure the logical address * is actually free (see vc_cec_poll_address). Physical address used * will be what is read from EDID and cannot be set. @@ -1112,10 +1110,10 @@ VCHPRE_ int VCHPOST_ vc_cec_set_logical_address(const CEC_AllDevices_T logical_a if(vcos_verify(logical_address <= CEC_AllDevices_eUnRegistered && (device_type <= CEC_DeviceType_VidProc || device_type == CEC_DeviceType_Invalid))) { - vc_cec_log_info("CEC setting logical address to %d; device type %s; vendor 0x%X", + vc_cec_log_info("CEC setting logical address to %d; device type %s; vendor 0x%X", logical_address, cecservice_devicetype_strings[device_type], vendor_id ); - success = cecservice_send_command_reply( VC_CEC_SET_LOGICAL_ADDR, ¶m, sizeof(param), + success = cecservice_send_command_reply( VC_CEC_SET_LOGICAL_ADDR, ¶m, sizeof(param), &response, sizeof(response)); } else { vc_cec_log_error("CEC invalid arguments for set_logical_address"); @@ -1145,10 +1143,10 @@ VCHPRE_ int VCOS_DEPRECATED("has no effect") VCHPOST_ vc_cec_add_device(const C if(vcos_verify(logical_address <= CEC_AllDevices_eUnRegistered && (device_type <= CEC_DeviceType_VidProc || device_type == CEC_DeviceType_Invalid))) { - vc_cec_log_info("CEC adding device %d (0x%X); device type %s", + vc_cec_log_info("CEC adding device %d (0x%X); device type %s", logical_address, physical_address, cecservice_devicetype_strings[device_type]); - success = cecservice_send_command_reply( VC_CEC_ADD_DEVICE, ¶m, sizeof(param), + success = cecservice_send_command_reply( VC_CEC_ADD_DEVICE, ¶m, sizeof(param), &response, sizeof(response)); } else { vc_cec_log_error("CEC invalid arguments for add_device"); @@ -1170,13 +1168,13 @@ VCHPRE_ int VCOS_DEPRECATED("has no effect") VCHPOST_ vc_cec_add_device(const C VCHPRE_ int VCHPOST_ vc_cec_set_passive(vcos_bool_t enabled) { uint32_t param = VC_HTOV32(enabled); int32_t response; - int32_t success = cecservice_send_command_reply( VC_CEC_SET_PASSIVE, ¶m, sizeof(param), + int32_t success = cecservice_send_command_reply( VC_CEC_SET_PASSIVE, ¶m, sizeof(param), &response, sizeof(response)); return (success == 0)? response : success; } /*********************************************************** - API for some common CEC messages, uses the API above to + API for some common CEC messages, uses the API above to actually send the message ***********************************************************/ @@ -1192,9 +1190,9 @@ VCHPRE_ int VCHPOST_ vc_cec_set_passive(vcos_bool_t enabled) { * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_FeatureAbort(uint32_t follower, - CEC_OPCODE_T opcode, - CEC_ABORT_REASON_T reason) { +VCHPRE_ int VCHPOST_ vc_cec_send_FeatureAbort(uint32_t follower, + CEC_OPCODE_T opcode, + CEC_ABORT_REASON_T reason) { uint8_t tx_buf[3]; tx_buf[0] = CEC_Opcode_FeatureAbort; // tx_buf[1] = opcode; @@ -1212,12 +1210,12 @@ VCHPRE_ int VCHPOST_ vc_cec_send_FeatureAbort(uint32_t follower, * physical address, reply or not * * Description - * send + * send * * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_ActiveSource(uint16_t physical_address, +VCHPRE_ int VCHPOST_ vc_cec_send_ActiveSource(uint16_t physical_address, vcos_bool_t is_reply) { uint8_t tx_buf[3]; tx_buf[0] = CEC_Opcode_ActiveSource; // @@ -1235,12 +1233,12 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ActiveSource(uint16_t physical_address, * Arguments: * follower, reply or not * Description - * send + * send * * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_ImageViewOn(uint32_t follower, +VCHPRE_ int VCHPOST_ vc_cec_send_ImageViewOn(uint32_t follower, vcos_bool_t is_reply) { uint8_t tx_buf[1]; tx_buf[0] = CEC_Opcode_ImageViewOn; // no param required @@ -1257,13 +1255,13 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ImageViewOn(uint32_t follower, * follower, display control, string (char[13]), reply or not * * Description - * send + * send * * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, - CEC_DISPLAY_CONTROL_T disp_ctrl, +VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, + CEC_DISPLAY_CONTROL_T disp_ctrl, const char* string, vcos_bool_t is_reply) { uint8_t tx_buf[CEC_MAX_XMIT_LENGTH]; @@ -1284,7 +1282,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_SetOSDString(uint32_t follower, * follower, reply or not * * Description - * send . Turn other devices to standby + * send . Turn other devices to standby * * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful @@ -1311,8 +1309,8 @@ VCHPRE_ int VCHPOST_ vc_cec_send_Standby(uint32_t follower, vcos_bool_t is_reply * Returns: if the command is successful (zero) or not (non-zero) * Tx callback if successful ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, - CEC_MENU_STATE_T menu_state, +VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, + CEC_MENU_STATE_T menu_state, vcos_bool_t is_reply) { uint8_t tx_buf[2]; if(!vcos_verify(menu_state < CEC_MENU_STATE_QUERY)) @@ -1333,7 +1331,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, * physical address, device type, reply or not * * Description - * send (first command to be + * send (first command to be * sent after a successful logical address allocation * device type should be the appropriate one for * the allocated logical address @@ -1342,7 +1340,7 @@ VCHPRE_ int VCHPOST_ vc_cec_send_MenuStatus(uint32_t follower, * Tx callback if successful. We also get a failure * if we do not currently have a valid physical address ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_cec_send_ReportPhysicalAddress(uint16_t physical_address, +VCHPRE_ int VCHPOST_ vc_cec_send_ReportPhysicalAddress(uint16_t physical_address, CEC_DEVICE_TYPE_T device_type, vcos_bool_t is_reply) { uint8_t tx_buf[4]; @@ -1358,8 +1356,8 @@ VCHPRE_ int VCHPOST_ vc_cec_send_ReportPhysicalAddress(uint16_t physical_address is_reply); } else { //Current we do not allow sending a random physical address - vc_cec_log_error("CEC cannot send physical address 0x%X, does not match internal 0x%X", + vc_cec_log_error("CEC cannot send physical address 0x%X, does not match internal 0x%X", physical_address, cecservice_client.physical_address); - return VC_CEC_ERROR_NO_PA; + return VC_CEC_ERROR_NO_PA; } } diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.c b/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.c index 7a6cdcdd15..51748bb6e3 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.c +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.c @@ -129,7 +129,6 @@ static uint32_t dispmanx_get_handle( uint32_t command, void *buffer, uint32_t l static void *dispmanx_notify_func( void *arg ); - /****************************************************************************** NAME vc_vchi_gencmd_init @@ -250,7 +249,7 @@ VCHPRE_ void VCHPOST_ vc_dispmanx_stop( void ) { lock_release(); dispmanx_client.initialised = 0; - vcos_event_signal(&dispmanx_notify_available_event); + vcos_event_signal(&dispmanx_notify_available_event); vcos_thread_join(&dispmanx_notify_task, &dummy); vcos_mutex_delete(&dispmanx_client.lock); vcos_event_delete(&dispmanx_message_available_event); @@ -696,7 +695,6 @@ VCHPRE_ DISPMANX_UPDATE_HANDLE_T VCHPOST_ vc_dispmanx_update_start( int32_t prio return (DISPMANX_UPDATE_HANDLE_T) handle; } - /*********************************************************** * Name: vc_dispmanx_update_submit * @@ -751,7 +749,6 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_update_submit_sync( DISPMANX_UPDATE_HANDLE_T up return success; } - /*********************************************************** * Name: vc_dispmanx_element_add * @@ -976,13 +973,11 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_element_change_attributes( DISPMANX_UPDATE_HAND param_length += 4*sizeof(uint32_t); } - success = (int) dispmanx_send_command( EDispmanElementChangeAttributes | DISPMANX_NO_REPLY_MASK, element_param, param_length); return success; } - /*********************************************************** * Name: vc_dispmanx_snapshot * @@ -1026,7 +1021,7 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_snapshot( DISPMANX_DISPLAY_HANDLE_T display, * Returns: 0 or failure * ***********************************************************/ -VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_T handle, +VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_T handle, void * src_address, int offset, int size) { //Note that x coordinate of the rect is NOT used //Address of data in host @@ -1050,7 +1045,6 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_resource_set_palette( DISPMANX_RESOURCE_HANDLE_ return (int) success; } - /*********************************************************** * Name: vc_dispmanx_vsync_callback * @@ -1095,7 +1089,6 @@ VCHPRE_ int VCHPOST_ vc_dispmanx_vsync_callback( DISPMANX_DISPLAY_HANDLE_T displ return (int) success; } - /********************************************************************************* * * Static functions definitions @@ -1123,7 +1116,7 @@ static void dispmanx_client_callback( void *callback_param, if ( event == NULL ) return; - + vcos_event_signal(event); } diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.h b/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.h index b723b761db..7705ab7c5e 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.h +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_dispmanx.h @@ -47,7 +47,7 @@ typedef struct { uint32_t fieldrate_num; uint32_t fieldrate_denom; uint32_t fields_per_frame; - uint32_t transform; + uint32_t transform; } GET_MODES_DATA_T; typedef struct { diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_fileservice_defs.h b/gfx/include/userland/interface/vmcs_host/vc_vchi_fileservice_defs.h index 06770760db..26782a4a83 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_fileservice_defs.h +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_fileservice_defs.h @@ -67,9 +67,6 @@ typedef enum } FILESERV_RESP_CODE_T; - /* Protocol (not used by API) version 1.2 */ - - #endif diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.c b/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.c index 26a34b959c..b6d1c215de 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.c +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.c @@ -89,7 +89,6 @@ typedef struct { static FILESYS_SERVICE_T vc_filesys_client; - /****************************************************************************** Static functions. ******************************************************************************/ @@ -123,8 +122,6 @@ static void *filesys_task_func(void *arg); static void filesys_callback( void *callback_param, VCHI_CALLBACK_REASON_T reason, void *msg_handle ); - - #ifdef PRINTF #ifdef WIN32 #define printf tprintf @@ -241,7 +238,6 @@ static void *filesys_task_func(void *arg) return 0; } - /****************************************************************************** NAME filesys_callback @@ -344,7 +340,7 @@ static int vc_filesys_single_param(uint32_t param, uint32_t fn) vc_filesys_client.fileserv_msg.params[0] = param; if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, fn, 4) == FILESERV_RESP_OK) success = 0; - + lock_release(); } @@ -374,7 +370,7 @@ static int vc_filesys_single_string(uint32_t param, const char *str, uint32_t fn vc_filesys_client.fileserv_msg.params[0] = param; /* coverity[buffer_size_warning] - the length of str has already been checked */ strncpy((char*)vc_filesys_client.fileserv_msg.data, str, FILESERV_MAX_DATA); - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, fn, len+1+16) == FILESERV_RESP_OK) { if(return_param) @@ -410,7 +406,6 @@ int vc_filesys_close(int fildes) return vc_filesys_single_param((uint32_t) fildes, VC_FILESYS_CLOSE); } - /****************************************************************************** NAME vc_filesys_lseek @@ -435,10 +430,10 @@ long vc_filesys_lseek(int fildes, long offset, int whence) vc_filesys_client.fileserv_msg.params[0] = (uint32_t) fildes; vc_filesys_client.fileserv_msg.params[1] = (uint32_t) offset; vc_filesys_client.fileserv_msg.params[2] = (uint32_t) whence; - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_LSEEK, 12) == FILESERV_RESP_OK) set = (long) vc_filesys_client.fileserv_msg.params[0]; - + lock_release(); } @@ -470,13 +465,13 @@ int64_t vc_filesys_lseek64(int fildes, int64_t offset, int whence) vc_filesys_client.fileserv_msg.params[1] = (uint32_t) offset; // LSB vc_filesys_client.fileserv_msg.params[2] = (uint32_t)(offset >> 32); // MSB vc_filesys_client.fileserv_msg.params[3] = (uint32_t) whence; - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_LSEEK64, 16) == FILESERV_RESP_OK) { set = vc_filesys_client.fileserv_msg.params[0]; set += (int64_t)vc_filesys_client.fileserv_msg.params[1] << 32; } - + lock_release(); } @@ -516,7 +511,7 @@ int vc_filesys_mount(const char *device, const char *mountpoint, const char *opt str[a+b+c+2] = 0; len = a + b + c + 3 + (int)(((FILESERV_MSG_T *)0)->data); len = ((len + (VCHI_BULK_GRANULARITY-1)) & ~(VCHI_BULK_GRANULARITY-1)) + VCHI_BULK_GRANULARITY; - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_MOUNT, len) == FILESERV_RESP_OK) set = (int) vc_filesys_client.fileserv_msg.params[0]; @@ -566,7 +561,6 @@ int vc_filesys_open(const char *path, int vc_oflag) return vc_filesys_single_string((uint32_t) vc_oflag, path, VC_FILESYS_OPEN, 1); } - /****************************************************************************** NAME vc_filesys_read @@ -587,7 +581,6 @@ RETURNS FUNCTION - RETURNS Successful completion: the number of bytes received Otherwise negative error code @@ -684,7 +677,6 @@ static int vc_vchi_msg_bulk_read(FILESERV_MSG_T* msg, uint16_t cmd_id, uint32_t return (int) num_bytes_read; } - int vc_filesys_read(int fildes, void *buf, unsigned int nbyte) { int bulk_bytes = 0; @@ -700,13 +692,13 @@ int vc_filesys_read(int fildes, void *buf, unsigned int nbyte) { do { bulk_bytes = nbyte > FILESERV_MAX_BULK ? FILESERV_MAX_BULK : nbyte; - + //we overwrite the response here so fill in data again vc_filesys_client.fileserv_msg.params[0] = (uint32_t)fildes; vc_filesys_client.fileserv_msg.params[1] = 0xffffffffU; // offset: use -1 to indicate no offset - + actual_read = vc_vchi_msg_bulk_read(&vc_filesys_client.fileserv_msg , VC_FILESYS_READ, (uint32_t)bulk_bytes, (uint8_t*)ptr); - + if(bulk_bytes != actual_read) { if(actual_read < 0) total_byte = -1; @@ -747,7 +739,6 @@ RETURNS FUNCTION - RETURNS Successful completion: the number of bytes received Otherwise negative error code @@ -845,7 +836,6 @@ static int vc_vchi_msg_bulk_write(FILESERV_MSG_T* msg, uint16_t cmd_id, uint32_t return num_bytes_written; } - int vc_filesys_write(int fildes, const void *buf, unsigned int nbyte) { int num_wrt = 0; @@ -863,13 +853,13 @@ int vc_filesys_write(int fildes, const void *buf, unsigned int nbyte) //we will make this more dynamic later do { bulk_bytes = nbyte > FILESERV_MAX_BULK ? FILESERV_MAX_BULK : nbyte; - + //we overwrite the response here so fill in data again vc_filesys_client.fileserv_msg.params[0] = (uint32_t)fildes; vc_filesys_client.fileserv_msg.params[1] = 0xffffffffU; // offset: use -1 to indicate no offset - + actual_written = vc_vchi_msg_bulk_write(&vc_filesys_client.fileserv_msg , VC_FILESYS_WRITE, (uint32_t)bulk_bytes, (uint8_t*)ptr); - + if(bulk_bytes != actual_written) { if(actual_written < 0) num_wrt = -1; @@ -877,7 +867,7 @@ int vc_filesys_write(int fildes, const void *buf, unsigned int nbyte) num_wrt += actual_written; break; } - + ptr+=bulk_bytes; nbyte -= actual_written; num_wrt += actual_written; @@ -889,7 +879,6 @@ int vc_filesys_write(int fildes, const void *buf, unsigned int nbyte) return num_wrt; } - /* Directory management functions */ /****************************************************************************** @@ -912,7 +901,6 @@ int vc_filesys_closedir(void *dhandle) return vc_filesys_single_param((uint32_t)dhandle, VC_FILESYS_CLOSEDIR); } - /****************************************************************************** NAME vc_filesys_format @@ -933,7 +921,6 @@ int vc_filesys_format(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_FORMAT, 0); } - /****************************************************************************** NAME vc_filesys_freespace @@ -955,7 +942,6 @@ int vc_filesys_freespace(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_FREESPACE, 1); } - /****************************************************************************** NAME vc_filesys_freespace64 @@ -979,7 +965,7 @@ int64_t vc_filesys_freespace64(const char *path) if(lock_obtain() == 0) { strncpy((char *)vc_filesys_client.fileserv_msg.data, path, FS_MAX_PATH); - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_FREESPACE64, (int)(16+strlen((char *)vc_filesys_client.fileserv_msg.data)+1)) == FILESERV_RESP_OK) { @@ -993,7 +979,6 @@ int64_t vc_filesys_freespace64(const char *path) return freespace; } - /****************************************************************************** NAME vc_filesys_get_attr @@ -1016,7 +1001,7 @@ int vc_filesys_get_attr(const char *path, fattributes_t *attr) if(lock_obtain() == 0) { strncpy((char *)vc_filesys_client.fileserv_msg.data, path, FS_MAX_PATH); - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_GET_ATTR, (int)(16+strlen((char *)vc_filesys_client.fileserv_msg.data)+1)) == FILESERV_RESP_OK) { @@ -1030,7 +1015,6 @@ int vc_filesys_get_attr(const char *path, fattributes_t *attr) return success; } - /****************************************************************************** NAME vc_filesys_fstat @@ -1069,7 +1053,6 @@ int vc_filesys_fstat(int fildes, FSTAT_T *buf) return success; } - /****************************************************************************** NAME vc_filesys_mkdir @@ -1090,7 +1073,6 @@ int vc_filesys_mkdir(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_MKDIR, 0); } - /****************************************************************************** NAME vc_filesys_opendir @@ -1111,7 +1093,6 @@ void *vc_filesys_opendir(const char *dirname) return (void *) vc_filesys_single_string(0, dirname, VC_FILESYS_OPENDIR, 1); } - /****************************************************************************** NAME vc_filesys_dirsize @@ -1134,14 +1115,14 @@ int64_t vc_filesys_dirsize(const char *path, uint32_t *num_files, uint32_t *num_ if(lock_obtain() == 0) { strncpy((char *)vc_filesys_client.fileserv_msg.data, path, FS_MAX_PATH); - + // FIXME: Should probably use a non-blocking call here since it may take a // long time to do the operation... if ( vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_DIRSIZE, (int)(16+strlen((char *)vc_filesys_client.fileserv_msg.data)+1)) == FILESERV_RESP_OK ) { - ret = vc_filesys_client.fileserv_msg.params[0]; + ret = vc_filesys_client.fileserv_msg.params[0]; ret += (int64_t)vc_filesys_client.fileserv_msg.params[1] << 32; if (num_files) *num_files = vc_filesys_client.fileserv_msg.params[2]; @@ -1155,7 +1136,6 @@ int64_t vc_filesys_dirsize(const char *path, uint32_t *num_files, uint32_t *num_ return ret; } - /****************************************************************************** NAME vc_filesys_readdir_r @@ -1192,7 +1172,6 @@ struct dirent *vc_filesys_readdir_r(void *dhandle, struct dirent *result) return ret; } - /****************************************************************************** NAME vc_filesys_remove @@ -1214,7 +1193,6 @@ int vc_filesys_remove(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_REMOVE, 0); } - /****************************************************************************** NAME vc_filesys_rename @@ -1240,7 +1218,7 @@ int vc_filesys_rename(const char *oldfile, const char *newfile) { strncpy((char *)vc_filesys_client.fileserv_msg.data, oldfile, FS_MAX_PATH); strncpy((char *)&vc_filesys_client.fileserv_msg.data[a+1], newfile, FS_MAX_PATH); - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_RENAME, 16+a+1+b+1) == FILESERV_RESP_OK) success = 0; @@ -1250,7 +1228,6 @@ int vc_filesys_rename(const char *oldfile, const char *newfile) return success; } - /****************************************************************************** NAME vc_filesys_reset @@ -1271,7 +1248,6 @@ int vc_filesys_reset() return vc_filesys_single_param(0, VC_FILESYS_RESET); } - /****************************************************************************** NAME vc_filesys_set_attr @@ -1292,7 +1268,6 @@ int vc_filesys_set_attr(const char *path, fattributes_t attr) return vc_filesys_single_string((uint32_t) attr, path, VC_FILESYS_SET_ATTR, 0); } - /****************************************************************************** NAME vc_filesys_setend @@ -1313,8 +1288,6 @@ int vc_filesys_setend(int fildes) return vc_filesys_single_param((uint32_t) fildes, VC_FILESYS_SETEND); } - - /****************************************************************************** NAME vc_filesys_scandisk @@ -1403,7 +1376,6 @@ int vc_filesys_totalspace(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_TOTALSPACE, 1); } - /****************************************************************************** NAME vc_filesys_totalspace64 @@ -1427,7 +1399,7 @@ int64_t vc_filesys_totalspace64(const char *path) if(lock_obtain() == 0) { strncpy((char *)vc_filesys_client.fileserv_msg.data, path, FS_MAX_PATH); - + if (vchi_msg_stub(&vc_filesys_client.fileserv_msg, VC_FILESYS_TOTALSPACE64, (int)(16+strlen((char *)vc_filesys_client.fileserv_msg.data)+1)) == FILESERV_RESP_OK) { @@ -1441,7 +1413,6 @@ int64_t vc_filesys_totalspace64(const char *path) return totalspace; } - /****************************************************************************** NAME vc_filesys_diskwritable @@ -1522,7 +1493,6 @@ int vc_filesys_close_disk_raw(const char *path) return vc_filesys_single_string(0, path, VC_FILESYS_CLOSE_DISK_RAW, 1); } - /****************************************************************************** NAME vc_filesys_open_disk @@ -1618,7 +1588,7 @@ int vc_filesys_read_sectors(const char *path, uint32_t sector_num, char *sectors #endif //note for read we are currently doing memcpy on host to tell 2727 align is 0 vc_filesys_client.fileserv_msg.params[2] = 0; - + //we send read request if (vchi_msg_stub_noblock(&vc_filesys_client.fileserv_msg, VC_FILESYS_READ_SECTORS, 16+len+1) == 0) { @@ -1690,14 +1660,14 @@ int vc_filesys_write_sectors(const char *path, uint32_t sector_num, char *sector { vc_filesys_client.fileserv_msg.params[0] = sector_num; vc_filesys_client.fileserv_msg.params[1] = num_sectors; - + //required to make buffer aligned for bulk align_bytes = ((unsigned long)sectors & (VCHI_BULK_ALIGN-1)); vc_filesys_client.fileserv_msg.params[2] = align_bytes; - + //copy path at end of any alignbytes strncpy(((char *)vc_filesys_client.fileserv_msg.data), path, FS_MAX_PATH); - + //we send write request if (vchi_msg_stub_noblock(&vc_filesys_client.fileserv_msg, VC_FILESYS_WRITE_SECTORS, 16+len+1) == 0) { @@ -1705,7 +1675,7 @@ int vc_filesys_write_sectors(const char *path, uint32_t sector_num, char *sector //note we are cheating and going backward to make addr aligned and sending more data... bulk_addr -= align_bytes; } - + while(num_sectors) { uint32_t bulk_sectors = (num_sectors > FILESERV_MAX_BULK_SECTOR) ? (uint32_t)FILESERV_MAX_BULK_SECTOR : num_sectors; //we send some extra data at the start @@ -1713,12 +1683,12 @@ int vc_filesys_write_sectors(const char *path, uint32_t sector_num, char *sector VCHI_BULK_ROUND_UP((bulk_sectors*FILESERV_SECTOR_LENGTH)+align_bytes), VCHI_FLAGS_BLOCK_UNTIL_DATA_READ, NULL) != 0) break; - + //go to next ALIGNED address bulk_addr += FILESERV_MAX_BULK; num_sectors -= bulk_sectors; } - + // now wait to receive resp from original msg... if(vcos_event_wait(&vc_filesys_client.response_event) == VCOS_SUCCESS && vc_filesys_client.fileserv_msg.cmd_code == FILESERV_RESP_OK) { @@ -1758,7 +1728,6 @@ int vc_filesys_errno(void) return (int) vc_filesys_client.err_no; } - /* File Service Message FIFO functions */ /****************************************************************************** @@ -1781,7 +1750,7 @@ static int vchi_msg_stub(FILESERV_MSG_T* msg, uint16_t cmd_id, int msg_len ) { int ret = -1; vchi_msg_stub_noblock(msg, cmd_id, msg_len); - + // wait to receive response if(vcos_event_wait(&vc_filesys_client.response_event) == VCOS_SUCCESS) ret = (int) msg->cmd_code; @@ -1812,7 +1781,7 @@ static int vchi_msg_stub_noblock(FILESERV_MSG_T* msg, uint16_t cmd_id, int msg_l //we always have cmd_id, xid msg_len += 8; - + //return response code return (int) vchi_msg_queue( vc_filesys_client.open_handle, msg, (uint32_t)msg_len, VCHI_FLAGS_BLOCK_UNTIL_QUEUED, NULL ); } @@ -2059,7 +2028,6 @@ static int vc_fs_message_handler( FILESERV_MSG_T* msg, uint32_t nbytes ) } } - //put it all in one msg if(total_bytes <= FILESERV_MAX_DATA) { i = vc_hostfs_read( (int)fd, @@ -2308,11 +2276,9 @@ static int vc_fs_message_handler( FILESERV_MSG_T* msg, uint32_t nbytes ) //calculate bytes that wil lbe sent by bulk bulk_bytes = (uint32_t)((total_bytes)&(~(VCHI_BULK_ALIGN-1))); - + end_bytes = total_bytes-bulk_bytes; - - if(vchi_bulk_queue_receive(vc_filesys_client.open_handle, vc_filesys_client.bulk_buffer, bulk_bytes, @@ -2326,23 +2292,23 @@ static int vc_fs_message_handler( FILESERV_MSG_T* msg, uint32_t nbytes ) msg->params[0] = 0; break; } - + total_bytes_written += i; - + if(end_bytes) { i = vc_hostfs_write( (int)fd, msg->data+nalign_bytes, (unsigned int)end_bytes); - + total_bytes_written += i; } - + if(i < 0) { retval = FILESERV_RESP_ERROR; msg->params[0] = 0; break; } - + msg->params[0] = total_bytes_written; } @@ -2369,7 +2335,6 @@ static int vc_fs_message_handler( FILESERV_MSG_T* msg, uint32_t nbytes ) return rr; } - /****************************************************************************** NAME showmsg @@ -2403,7 +2368,6 @@ static void showmsg(VC_MSGFIFO_CMD_HEADER_T const * head, } #endif - /****************************************************************************** NAME fs_host_direntbytestream_create @@ -2453,7 +2417,6 @@ static int fs_host_direntbytestream_create(struct dirent *d, void *buffer) return (int)(buf-(char *)buffer); } - /****************************************************************************** NAME fs_host_direntbytestream_interp @@ -2501,8 +2464,6 @@ static void fs_host_direntbytestream_interp(struct dirent *d, void *buffer) return; } - - void vc_filesys_sendreset(void) { //TODO diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.h b/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.h index 393a3eb859..49d545f802 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.h +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_filesys.h @@ -37,12 +37,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef struct DIR_tag DIR; #endif // ifndef _DIRENT_H -typedef struct { - int64_t st_size; /* total size, in bytes (off_t)*/ - uint32_t st_modtime; /* time of last modification (time_t)*/ +typedef struct { + int64_t st_size; /* total size, in bytes (off_t)*/ + uint32_t st_modtime; /* time of last modification (time_t)*/ } FSTAT_T; - VCHPRE_ int VCHPOST_ vc_vchi_filesys_init (VCHI_INSTANCE_T initialise_instance, VCHI_CONNECTION_T **connections, uint32_t num_connections ); // Stop it to prevent the functions from trying to use it. @@ -67,7 +66,6 @@ VCHPRE_ int VCHPOST_ vc_filesys_write(int fildes, const void *buf, unsigned int VCHPRE_ int VCHPOST_ vc_filesys_mount(const char *device, const char *mountpoint, const char *options); VCHPRE_ int VCHPOST_ vc_filesys_umount(const char *mountpoint); - // Ends a directory listing iteration VCHPRE_ int VCHPOST_ vc_filesys_closedir(void *dhandle); @@ -181,4 +179,3 @@ VCHPRE_ int VCHPOST_ vc_filesys_write_sector(const char *buf); VCHPRE_ int VCHPOST_ vc_filesys_write_sectors_end(uint32_t *sectors_written); #endif //VCFILESYS_H_ - diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.c b/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.c index 2da81a46ee..74a268119d 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.c +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.c @@ -62,7 +62,6 @@ typedef struct { static GENCMD_SERVICE_T gencmd_client; - /****************************************************************************** Static function. ******************************************************************************/ @@ -101,7 +100,6 @@ int release_gencmd_service(void) { return ret; } - //call vc_vchi_gencmd_init to initialise int vc_gencmd_init() { assert(0); @@ -227,7 +225,7 @@ void vc_gencmd_stop () { gencmd_client.initialised = 0; lock_release(); - + vcos_mutex_delete(&gencmd_client.lock); vcos_event_delete(&gencmd_client.message_available_event); } @@ -254,7 +252,7 @@ int vc_gencmd_send_list ( const char *format, va_list a ) if(lock_obtain() == 0) { int length = vsnprintf( gencmd_client.command_buffer, GENCMD_MAX_LENGTH, format, a ); - + if (length >= 0 && length < GENCMD_MAX_LENGTH) { int i; @@ -329,7 +327,7 @@ int vc_gencmd_read_response (char *response, int maxlen) { } } } while(!gencmd_client.response_length && vcos_event_wait(&gencmd_client.message_available_event) == VCOS_SUCCESS); - + if(gencmd_client.response_length && sem_ok == 0) { gencmd_client.response_length -= sizeof(int); //first word is error code memcpy(response, gencmd_client.response_buffer+sizeof(int), (size_t) vcos_min((int)gencmd_client.response_length, (int)maxlen)); @@ -529,4 +527,3 @@ int vc_gencmd_until( char *cmd, return ret; } - diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.h b/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.h index da86b5d68a..6f1911fe36 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.h +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_gencmd.h @@ -38,7 +38,6 @@ VCHPRE_ int VCHPOST_ vc_gencmd_init(void); VCHPRE_ void VCHPOST_ vc_vchi_gencmd_init(VCHI_INSTANCE_T initialise_instance, VCHI_CONNECTION_T **connections, uint32_t num_connections ); - /* Stop the service from being used. */ VCHPRE_ void VCHPOST_ vc_gencmd_stop(void); @@ -84,5 +83,4 @@ VCHPRE_ int VCHPOST_ vc_gencmd_until( char *cmd, const char *error_string, int timeout); - #endif diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_gpuserv.c b/gfx/include/userland/interface/vmcs_host/vc_vchi_gpuserv.c index 695ed52566..896d6035b1 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_gpuserv.c +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_gpuserv.c @@ -61,7 +61,6 @@ typedef struct { static GPUSERV_SERVICE_T gpuserv_client; - /****************************************************************************** Static function. ******************************************************************************/ @@ -257,5 +256,5 @@ int32_t vc_gpuserv_execute_code(int num_jobs, struct gpu_job_s jobs[]) } return 0; error_exit: - return -1; + return -1; } diff --git a/gfx/include/userland/interface/vmcs_host/vc_vchi_tvservice.c b/gfx/include/userland/interface/vmcs_host/vc_vchi_tvservice.c index 69832ad5a1..874037c7dc 100644 --- a/gfx/include/userland/interface/vmcs_host/vc_vchi_tvservice.c +++ b/gfx/include/userland/interface/vmcs_host/vc_vchi_tvservice.c @@ -186,7 +186,6 @@ static int32_t tvservice_send_command_reply( uint32_t command, void *buffer, uin static void *tvservice_notify_func(void *arg); - /****************************************************************************** TV service API ******************************************************************************/ @@ -369,7 +368,6 @@ VCHPRE_ void VCHPOST_ vc_vchi_tv_stop( void ) { } } - /*********************************************************** * Name: vc_tv_register_callback * @@ -567,7 +565,7 @@ static int32_t tvservice_wait_for_bulk_receive(void *buffer, uint32_t max_length /*if(!vcos_verify(((uint32_t) buffer & 0xf) == 0)) //should be 16 byte aligned return -1;*/ vcos_log_trace("[%s]", VCOS_FUNCTION); - if(!vcos_verify(buffer)) { + if(!vcos_verify(buffer)) { vcos_log_error("TV service: NULL buffer passed to wait_for_bulk_receive"); return -1; } @@ -599,7 +597,7 @@ static int32_t tvservice_send_command( uint32_t command, void *buffer, uint32_t if(vcos_verify(command < VC_TV_END_OF_LIST)) { vcos_log_trace("[%s] command:%s param length %d %s", VCOS_FUNCTION, - tvservice_command_strings[command], length, + tvservice_command_strings[command], length, (has_reply)? "has reply" : " no reply"); } else { vcos_log_error("[%s] not sending invalid command %d", VCOS_FUNCTION, command); @@ -656,7 +654,7 @@ static int32_t tvservice_send_command_reply( uint32_t command, void *buffer, ui else vcos_log_error("TV service failed to send command %s param length %d, error code %d", tvservice_command_strings[command], length, success); - + tvservice_lock_release(); } @@ -860,7 +858,7 @@ static void *tvservice_notify_func(void *arg) { } } while(success == 0 && state->notify_length >= sizeof(uint32_t)*3); //read the next message if any } //while (1) - + if(state->to_exit) vcos_log_trace("TV service async thread exiting"); @@ -1061,7 +1059,6 @@ VCHPRE_ int VCHPOST_ vc_tv_sdtv_power_on(SDTV_MODE_T mode, SDTV_OPTIONS_T *optio return success; } - /*********************************************************** * Name: vc_tv_power_off * @@ -1636,4 +1633,3 @@ VCHPRE_ int VCHPOST_ vc_tv_hdmi_power_on_explicit(HDMI_MODE_T mode, HDMI_RES_GRO } return vc_tv_hdmi_power_on_explicit_new(mode, group, code); } - diff --git a/gfx/include/userland/interface/vmcs_host/vcfilesys.h b/gfx/include/userland/interface/vmcs_host/vcfilesys.h index c8617cfa97..7ae24bcfa5 100644 --- a/gfx/include/userland/interface/vmcs_host/vcfilesys.h +++ b/gfx/include/userland/interface/vmcs_host/vcfilesys.h @@ -62,7 +62,6 @@ VCHPRE_ int VCHPOST_ vc_filesys_write(int fildes, const void *buf, unsigned int VCHPRE_ int VCHPOST_ vc_filesys_mount(const char *device, const char *mountpoint, const char *options); VCHPRE_ int VCHPOST_ vc_filesys_umount(const char *mountpoint); - // Ends a directory listing iteration VCHPRE_ int VCHPOST_ vc_filesys_closedir(void *dhandle); @@ -163,4 +162,3 @@ VCHPRE_ int VCHPOST_ vc_filesys_write_sector(const char *buf); VCHPRE_ int VCHPOST_ vc_filesys_write_sectors_end(uint32_t *sectors_written); #endif //VCFILESYS_H_ - diff --git a/gfx/include/userland/interface/vmcs_host/vcgencmd.h b/gfx/include/userland/interface/vmcs_host/vcgencmd.h index 303f178ca7..5a5fc68f32 100644 --- a/gfx/include/userland/interface/vmcs_host/vcgencmd.h +++ b/gfx/include/userland/interface/vmcs_host/vcgencmd.h @@ -35,7 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VCHPRE_ void VCHPOST_ vc_vchi_gencmd_init(VCHI_INSTANCE_T initialise_instance, VCHI_CONNECTION_T **connections, uint32_t num_connections ); - /* Initialise general command service. Returns it's interface number. This initialises the host side of the interface, it does not send anything to VideoCore. */ diff --git a/gfx/include/userland/interface/vmcs_host/vchost.h b/gfx/include/userland/interface/vmcs_host/vchost.h index 23ffa63530..6c75493b43 100644 --- a/gfx/include/userland/interface/vmcs_host/vchost.h +++ b/gfx/include/userland/interface/vmcs_host/vchost.h @@ -106,7 +106,6 @@ VCHPRE_ void VCHPOST_ vc_host_interrupts(int on); VCHPRE_ void VCHPOST_ vc_error(void); - /*---------------------------------------------------------------------------*/ /* Event (interrupt) related functions */ /*---------------------------------------------------------------------------*/ diff --git a/gfx/include/userland/interface/vmcs_host/vcilcs.c b/gfx/include/userland/interface/vmcs_host/vcilcs.c index 980a21d070..dec1af007a 100644 --- a/gfx/include/userland/interface/vmcs_host/vcilcs.c +++ b/gfx/include/userland/interface/vmcs_host/vcilcs.c @@ -160,11 +160,11 @@ ILCS_SERVICE_T *ilcs_init(VCHIQ_STATE_T *state, void **connection, ILCS_CONFIG_T if(vcos_mutex_create(&st->wait_mtx, "ILCS") != VCOS_SUCCESS) goto fail_all; - // create smaphore for control+bulk protection + // create smaphore for control+bulk protection if(vcos_semaphore_create(&st->send_sem, "ILCS", 1) != VCOS_SUCCESS) goto fail_send_sem; - // create event group for signalling when a waiting slot becomes free + // create event group for signalling when a waiting slot becomes free if(vcos_event_create(&st->wait_event, "ILCS") != VCOS_SUCCESS) goto fail_wait_event; @@ -278,10 +278,10 @@ static void ilcs_send_quit(ILCS_SERVICE_T *st) header->size = 8; msg = header->data; msg[0] = IL_SERVICE_QUIT & 0xff; - msg[1] = (IL_SERVICE_QUIT >> 8) & 0xff; + msg[1] = (IL_SERVICE_QUIT >> 8) & 0xff; msg[2] = (IL_SERVICE_QUIT >> 16) & 0xff; msg[3] = IL_SERVICE_QUIT >> 24; - + vchiu_queue_push(&st->queue, header); // force all currently waiting clients to wake up @@ -477,7 +477,7 @@ static int ilcs_process_message(ILCS_SERVICE_T *st, int block) unsigned char *msg; VCHIQ_HEADER_T *header; uint32_t i, msg_len, cmd, xid; - + if(!block && vchiu_queue_is_empty(&st->queue)) return 0; // no more messages @@ -520,9 +520,9 @@ static int ilcs_process_message(ILCS_SERVICE_T *st, int block) i = 0; while(st->msg_inuse & (1<msg_inuse |= (1<msg[i], msg, msg_len); #ifdef USE_VCHIQ_ARM vchiq_release_message(st->service, header); @@ -530,7 +530,7 @@ static int ilcs_process_message(ILCS_SERVICE_T *st, int block) vchiq_release_message(st->vchiq, header); #endif ilcs_command(st, cmd, xid, st->msg[i], msg_len); - + // mark the message copy as free st->msg_inuse &= ~(1<ilcs_common, msg, len, rbuf, &rlen); - + // make sure rlen has been initialised by the function vcos_assert(rlen != -1); @@ -670,11 +670,11 @@ ilcs_command(ILCS_SERVICE_T *st, uint32_t cmd, uint32_t xid, unsigned char *msg, * @param bulk_mem_handle Mem handle sent using VCHI bulk transfer * @param bulk_offset Offset within memory handle * @param bulk_len Length of bulk transfer - * + * * -------------------------------------------------------------------- */ static int ilcs_execute_function_ex(ILCS_SERVICE_T *st, IL_FUNCTION_T func, - void *data, int len, + void *data, int len, void *data2, int len2, VCHI_MEM_HANDLE_T bulk_mem_handle, void *bulk_offset, int bulk_len, void *resp, int *rlen) @@ -712,13 +712,13 @@ static int ilcs_execute_function_ex(ILCS_SERVICE_T *st, IL_FUNCTION_T func, for (i=0; iwait[num].resp != NULL) num++; - + if(num < ILCS_MAX_WAITING || i == ILCS_WAIT_TIMEOUT-1) break; - + // the previous time round this loop, we woke up because the timer // expired, so restart it if (st->timer_expired) @@ -768,19 +768,19 @@ static int ilcs_execute_function_ex(ILCS_SERVICE_T *st, IL_FUNCTION_T func, } wait = &st->wait[num]; - + wait->resp = resp; wait->rlen = rlen; xid = wait->xid = st->next_xid++; } vcos_mutex_unlock(&st->wait_mtx); - + if(bulk_len != 0) vcos_semaphore_wait(&st->send_sem); ilcs_transmit(st, func, xid, data, len, data2, len2); - + if(bulk_len != 0) { #ifdef USE_VCHIQ_ARM @@ -838,7 +838,7 @@ int ilcs_execute_function(ILCS_SERVICE_T *st, IL_FUNCTION_T func, void *data, in * -------------------------------------------------------------------- */ OMX_ERRORTYPE ilcs_pass_buffer(ILCS_SERVICE_T *st, IL_FUNCTION_T func, void *reference, - OMX_BUFFERHEADERTYPE *pBuffer) + OMX_BUFFERHEADERTYPE *pBuffer) { IL_PASS_BUFFER_EXECUTE_T exe; IL_BUFFER_BULK_T fixup; @@ -922,7 +922,7 @@ OMX_ERRORTYPE ilcs_pass_buffer(ILCS_SERVICE_T *st, IL_FUNCTION_T func, void *ref } else { - // Pass the misaligned area at the start at end inline within the + // Pass the misaligned area at the start at end inline within the // message, and the bulk of the message using a separate bulk // transfer const uint8_t *start = ptr; @@ -952,7 +952,7 @@ OMX_ERRORTYPE ilcs_pass_buffer(ILCS_SERVICE_T *st, IL_FUNCTION_T func, void *ref len2 = sizeof(fixup); } } - else + else { exe.method = IL_BUFFER_NONE; } @@ -975,7 +975,6 @@ OMX_ERRORTYPE ilcs_pass_buffer(ILCS_SERVICE_T *st, IL_FUNCTION_T func, void *ref return ret ? resp.err : OMX_ErrorNone; } - /* ---------------------------------------------------------------------- * receive a buffer via the IL component service. * -------------------------------------------------------------------- */ @@ -1012,7 +1011,7 @@ OMX_BUFFERHEADERTYPE *ilcs_receive_buffer(ILCS_SERVICE_T *st, void *call, int cl VCHI_MEM_HANDLE_T mem_handle = VCHI_MEM_HANDLE_INVALID; void *bulk_offset; int32_t bulk_len = exe->bufferLen - fixup->headerlen - fixup->trailerlen; - + vcos_assert(clen == sizeof(IL_PASS_BUFFER_EXECUTE_T) + sizeof(IL_BUFFER_BULK_T)); if(st->use_memmgr) @@ -1043,7 +1042,7 @@ OMX_BUFFERHEADERTYPE *ilcs_receive_buffer(ILCS_SERVICE_T *st, void *call, int cl else if(fixup->headerlen || fixup->trailerlen) { uint8_t *end = dest + exe->bufferLen; - + if(fixup->headerlen) memcpy(dest, fixup->header, fixup->headerlen); if(fixup->trailerlen) diff --git a/gfx/include/userland/interface/vmcs_host/vcilcs.h b/gfx/include/userland/interface/vmcs_host/vcilcs.h index 3a11b84cff..a082fb1061 100644 --- a/gfx/include/userland/interface/vmcs_host/vcilcs.h +++ b/gfx/include/userland/interface/vmcs_host/vcilcs.h @@ -78,7 +78,6 @@ VCHPRE_ OMX_BUFFERHEADERTYPE * VCHPOST_ ilcs_receive_buffer(ILCS_SERVICE_T *ilcs #define ILCS_ROUND_DOWN(x) (((unsigned long)(x)) & ~(ILCS_ALIGN-1)) #define ILCS_ALIGNED(x) (((unsigned long)(x) & (ILCS_ALIGN-1)) == 0) - #ifdef _VIDEOCORE #include "vcfw/logging/logging.h" @@ -100,4 +99,3 @@ extern void dummy_logging_message(int level, const char *format, ...); #endif // _VIDEOCORE #endif // ILCS_H - diff --git a/gfx/include/userland/interface/vmcs_host/vcilcs_common.c b/gfx/include/userland/interface/vmcs_host/vcilcs_common.c index ada38da793..dfb812f85d 100644 --- a/gfx/include/userland/interface/vmcs_host/vcilcs_common.c +++ b/gfx/include/userland/interface/vmcs_host/vcilcs_common.c @@ -109,7 +109,6 @@ static void vcilcs_mem_unlock(OMX_BUFFERHEADERTYPE *buffer) { } - void vcilcs_config(ILCS_CONFIG_T *config) { config->fns = vcilcs_fns; @@ -119,4 +118,3 @@ void vcilcs_config(ILCS_CONFIG_T *config) config->ilcs_mem_lock = vcilcs_mem_lock; config->ilcs_mem_unlock = vcilcs_mem_unlock; } - diff --git a/gfx/include/userland/interface/vmcs_host/vcilcs_common.h b/gfx/include/userland/interface/vmcs_host/vcilcs_common.h index 0659466c54..93eb15238f 100644 --- a/gfx/include/userland/interface/vmcs_host/vcilcs_common.h +++ b/gfx/include/userland/interface/vmcs_host/vcilcs_common.h @@ -51,7 +51,7 @@ struct ILCS_COMMON_T { VC_PRIVATE_COMPONENT_T *component_list; ILCS_SERVICE_T *ilcs; }; - + VCHPRE_ void VCHPOST_ vcilcs_config(ILCS_CONFIG_T *config); // functions that implement incoming functions calls diff --git a/gfx/include/userland/interface/vmcs_host/vcilcs_out.c b/gfx/include/userland/interface/vmcs_host/vcilcs_out.c index 545ddc7f1a..98ff5caebd 100644 --- a/gfx/include/userland/interface/vmcs_host/vcilcs_out.c +++ b/gfx/include/userland/interface/vmcs_host/vcilcs_out.c @@ -426,7 +426,7 @@ static OMX_ERRORTYPE vcil_out_addBuffer(OMX_IN OMX_HANDLETYPE hComponent, { pHeader->pBuffer = (OMX_U8*)eglImage; port->bEGL = OMX_TRUE; - } + } else { pHeader->pBuffer = pBuffer; @@ -558,13 +558,13 @@ static OMX_ERRORTYPE vcil_out_EmptyThisBuffer(OMX_IN OMX_HANDLETYPE hComponent, OMX_COMPONENTTYPE *pComp = (OMX_COMPONENTTYPE *) hComponent; VC_PRIVATE_COMPONENT_T *comp; ILCS_COMMON_T *st; - + if (!(pComp && pBuffer)) return (OMX_ErrorBadParameter); st = pComp->pApplicationPrivate; comp = (VC_PRIVATE_COMPONENT_T *) pComp->pComponentPrivate; - + return ilcs_pass_buffer(st->ilcs, IL_EMPTY_THIS_BUFFER, comp->reference, pBuffer); } @@ -594,24 +594,24 @@ static OMX_ERRORTYPE vcil_out_FillThisBuffer(OMX_IN OMX_HANDLETYPE hComponent, return OMX_ErrorIncorrectStateOperation; vcos_assert(pComp != NULL && comp != NULL && port != NULL && st != NULL); - + // The lower layers will attempt to transfer the bytes specified if we don't // clear these - callers should ideally do this themselves, but it is not // mandated in the specification. pBuffer->nFilledLen = 0; pBuffer->nFlags = 0; - vc_assert(port->bEGL == OMX_TRUE || is_valid_hostside_buffer(pBuffer)); + vc_assert(port->bEGL == OMX_TRUE || is_valid_hostside_buffer(pBuffer)); err = ilcs_pass_buffer(st->ilcs, IL_FILL_THIS_BUFFER, comp->reference, pBuffer); - + if (err == OMX_ErrorNone && port->bEGL == OMX_TRUE) { - // If an output port is marked as an EGL port, we request EGL to notify the IL component + // If an output port is marked as an EGL port, we request EGL to notify the IL component // when it's allowed to render into the buffer/EGLImage. vc_assert(local_eglIntOpenMAXILDoneMarker != NULL); local_eglIntOpenMAXILDoneMarker(comp->reference, pBuffer->pBuffer); - } + } return err; } diff --git a/gfx/include/userland/makefiles/cmake/arm-linux.cmake b/gfx/include/userland/makefiles/cmake/arm-linux.cmake index 957846a446..19539556d6 100644 --- a/gfx/include/userland/makefiles/cmake/arm-linux.cmake +++ b/gfx/include/userland/makefiles/cmake/arm-linux.cmake @@ -26,7 +26,7 @@ if(ANDROID) set(ANDROID_LIBS $ENV{ANDROID_LIBS} CACHE INTERNAL "" FORCE) set(ANDROID_BIONIC $ENV{ANDROID_BIONIC} CACHE INTERNAL "" FORCE) set(ANDROID_LDSCRIPTS $ENV{ANDROID_LDSCRIPTS} CACHE INTERNAL "" FORCE) - + if("${ANDROID_NDK_ROOT}" STREQUAL "") find_program(ANDROID_COMPILER arm-eabi-gcc) get_filename_component(ANDROID_BIN ${ANDROID_COMPILER} PATH CACHE) @@ -63,9 +63,9 @@ if(ANDROID) if("${ANDROID_LDSCRIPTS}" STREQUAL "") message(FATAL_ERROR "Cannot find Android LD scripts directory") endif() - + set(CMAKE_SYSTEM_PREFIX_PATH "${ANDROID_NDK_ROOT}/android-ndk-r${ANDROID_NDK_RELEASE}/platforms/android-${ANDROID_NDK_PLATFORM}/arch-${CMAKE_SYSTEM_PROCESSOR}/usr") - + if("${ANDROID_LIBS}" STREQUAL "") set(ANDROID_LIBS "${CMAKE_SYSTEM_PREFIX_PATH}/lib" CACHE INTERNAL "" FORCE) @@ -83,7 +83,6 @@ if(ANDROID) include_directories("${ANDROID_BIONIC}/libm/include" BEFORE SYSTEM) include_directories("${ANDROID_BIONIC}/libm/include/arch/arm" BEFORE SYSTEM) include_directories("${ANDROID_BIONIC}/libstdc++/include" BEFORE SYSTEM) - # # Pull in Android link options manually @@ -93,25 +92,24 @@ if(ANDROID) set(CMAKE_SHARED_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -Wl,-Bdynamic -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x") link_directories(${ANDROID_LIBS}) - set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") + set(CMAKE_EXE_LINKER_FLAGS "-nostdlib ${ANDROID_CRTBEGIN} -nostdlib -Wl,-z,noexecstack") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-dynamic-linker,/system/bin/linker -Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-T${ANDROID_LDSCRIPTS}/armelf.x -Wl,--gc-sections") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,nocopyreloc -Wl,-z,noexecstack -Wl,--fix-cortex-a8 -Wl,--no-undefined") set(CMAKE_C_STANDARD_LIBRARIES "-llog -lc -lgcc ${ANDROID_CRTEND}" CACHE INTERNAL "" FORCE) - + set(SHARED "") else() set(SHARED "SHARED") endif() - # All linux systems have sbrk() add_definitions(-D_HAVE_SBRK) # pull in declarations of lseek64 and friends add_definitions(-D_LARGEFILE64_SOURCE) - + # test for glibc malloc debugging extensions try_compile(HAVE_MTRACE ${CMAKE_BINARY_DIR} @@ -127,4 +125,3 @@ configure_file ( "makefiles/cmake/cmake_config.h.in" "${PROJECT_BINARY_DIR}/cmake_config.h" ) - diff --git a/gfx/include/userland/makefiles/cmake/cmake_config.h.in b/gfx/include/userland/makefiles/cmake/cmake_config.h.in index 080b8e8af7..69e3d7a6d7 100644 --- a/gfx/include/userland/makefiles/cmake/cmake_config.h.in +++ b/gfx/include/userland/makefiles/cmake/cmake_config.h.in @@ -12,4 +12,3 @@ #cmakedefine HAVE_EXECINFO_H #endif - diff --git a/gfx/include/userland/makefiles/cmake/srcs/test-mtrace.c b/gfx/include/userland/makefiles/cmake/srcs/test-mtrace.c index d4cd615c5b..b3c8cc1a24 100644 --- a/gfx/include/userland/makefiles/cmake/srcs/test-mtrace.c +++ b/gfx/include/userland/makefiles/cmake/srcs/test-mtrace.c @@ -32,4 +32,3 @@ int main(int argc, const char **argv) mtrace(); muntrace(); } - diff --git a/gfx/include/userland/makefiles/cmake/vmcs.cmake b/gfx/include/userland/makefiles/cmake/vmcs.cmake index 7c974638b5..aa71e5b8a1 100644 --- a/gfx/include/userland/makefiles/cmake/vmcs.cmake +++ b/gfx/include/userland/makefiles/cmake/vmcs.cmake @@ -1,5 +1,4 @@ - SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "0") SET(CPACK_PACKAGE_VERSION_PATCH "pre-1") @@ -78,4 +77,3 @@ install(DIRECTORY ${vmcs_root}/interface/khronos/include DESTINATION ${VMC install(DIRECTORY ${vmcs_root}/interface/vmcs_host/khronos/IL DESTINATION ${VMCS_INSTALL_PREFIX}/include FILES_MATCHING PATTERN "*.h") install(DIRECTORY ${vmcs_root}/host_applications/linux/libs/bcm_host/include DESTINATION ${VMCS_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.h") - diff --git a/gfx/include/userland/middleware/dlloader/dlfcn.h b/gfx/include/userland/middleware/dlloader/dlfcn.h index 6ad2d6d0eb..f4ee91f18a 100644 --- a/gfx/include/userland/middleware/dlloader/dlfcn.h +++ b/gfx/include/userland/middleware/dlloader/dlfcn.h @@ -44,10 +44,10 @@ extern "C" { extern const char *dlerror(void); extern void dldone(void *handle); extern int dlcheck(const char *pathName); - extern void *dlshared_vll_load(const char *vll_name, - const char **symbols, - void *(*pmm_alloc)(void *, unsigned int, unsigned int, const char *, unsigned int), - void (*pmm_free)(void *, void *), + extern void *dlshared_vll_load(const char *vll_name, + const char **symbols, + void *(*pmm_alloc)(void *, unsigned int, unsigned int, const char *, unsigned int), + void (*pmm_free)(void *, void *), void *pmm_priv, int *vll_init_required); extern void dlshared_vll_init_done(void *vll); @@ -55,7 +55,6 @@ extern "C" { extern int dlshared_vll_closing(void *vll); extern int dlshared_vll_unload(void *vll); - /* * Valid values for mode argument to dlopen. */ diff --git a/gfx/include/userland/middleware/imageconv/imageconv.h b/gfx/include/userland/middleware/imageconv/imageconv.h index f7a9a0ebec..97a5f3c2d9 100644 --- a/gfx/include/userland/middleware/imageconv/imageconv.h +++ b/gfx/include/userland/middleware/imageconv/imageconv.h @@ -58,7 +58,6 @@ typedef struct uint32_t vpitch; } IMAGECONV_IMAGE_DATA_T; - typedef struct IMAGECONV_DRIVER_IMAGE_T IMAGECONV_DRIVER_IMAGE_T; /** Converter class */ @@ -279,7 +278,7 @@ int imageconv_create(const IMAGE_CONVERT_CLASS_T *converter, const IMAGECONV_IMA int imageconv_get_size(const IMAGE_CONVERT_CLASS_T *converter, MEM_HANDLE_T self, uint32_t *width, uint32_t *height, uint32_t *pitch, VC_IMAGE_TYPE_T *type); -/** Converts the image writing the result to the memory specified at +/** Converts the image writing the result to the memory specified at * dst, dst_offset. * * @return IMAGECONV_ERR_NOT_SUPPORTED if not implemented by the converter class @@ -322,7 +321,7 @@ int imageconv_get(const IMAGE_CONVERT_CLASS_T *converter, * @return IMAGECONV_ERR_GENERAL if image handle is invalid. */ int imageconv_get_converted_size(const IMAGE_CONVERT_CLASS_T *converter, - MEM_HANDLE_T src, VC_IMAGE_TYPE_T type, IMAGECONV_IMAGE_DATA_T *dest_info); + MEM_HANDLE_T src, VC_IMAGE_TYPE_T type, IMAGECONV_IMAGE_DATA_T *dest_info); /** Release an image that was previously taken with imageconv_get(). * @@ -348,7 +347,6 @@ void imageconv_unget(const IMAGE_CONVERT_CLASS_T *converter, int imageconv_acquire(const IMAGE_CONVERT_CLASS_T *converter, MEM_HANDLE_T src); - /** Acquire a lock on an image to prevent it being recycled into its * image pool. * @@ -445,4 +443,3 @@ void imageconv_cancel_notify(const IMAGE_CONVERT_CLASS_T *converter, IMAGECONV_DRIVER_IMAGE_T *image); #endif - diff --git a/gfx/include/userland/middleware/khronos/common/2708/khrn_interlock_filler_4.h b/gfx/include/userland/middleware/khronos/common/2708/khrn_interlock_filler_4.h index cd6f18b1e1..b35c790326 100644 --- a/gfx/include/userland/middleware/khronos/common/2708/khrn_interlock_filler_4.h +++ b/gfx/include/userland/middleware/khronos/common/2708/khrn_interlock_filler_4.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef enum { KHRN_INTERLOCK_USER_NONE = 0, KHRN_INTERLOCK_USER_INVALID = 1 << 29, /* <= 29 render states, so can use top 3 bits for temp/writing/inv */ - KHRN_INTERLOCK_USER_TEMP = 1 << 30, + KHRN_INTERLOCK_USER_TEMP = 1 << 30, KHRN_INTERLOCK_USER_WRITING = 1 << 31 } KHRN_INTERLOCK_USER_T; static INLINE KHRN_INTERLOCK_USER_T khrn_interlock_user(uint32_t i) { return (KHRN_INTERLOCK_USER_T)(1 << i); } diff --git a/gfx/include/userland/middleware/khronos/egl/egl_server.h b/gfx/include/userland/middleware/khronos/egl/egl_server.h index 011ec8f7d1..14c9129182 100644 --- a/gfx/include/userland/middleware/khronos/egl/egl_server.h +++ b/gfx/include/userland/middleware/khronos/egl/egl_server.h @@ -54,7 +54,7 @@ typedef struct VCOS_MUTEX_T eglimages_lock; KHRN_MAP_T wintoeglimage;//TODO window ids should be per process? VCOS_MUTEX_T wintoeglimage_mutex; - + #if EGL_KHR_sync KHRN_MAP_T syncs; #endif @@ -159,9 +159,8 @@ typedef struct uint32_t swap_interval; uint32_t semaphoreId; //Symbian needs a handle passed back in Khan, not just surface number - //for android, the mh_storage this points at needs updating to point to where rendering happened - uint32_t egl_render_image; + uint32_t egl_render_image; EGL_DISP_HANDLE_T disp_handle; } EGL_SERVER_SURFACE_T; diff --git a/gfx/include/userland/middleware/khronos/ext/egl_khr_image.h b/gfx/include/userland/middleware/khronos/ext/egl_khr_image.h index 5a073fe298..4c6d2d9ba4 100644 --- a/gfx/include/userland/middleware/khronos/ext/egl_khr_image.h +++ b/gfx/include/userland/middleware/khronos/ext/egl_khr_image.h @@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "middleware/imageconv/imageconv.h" #include "vcinclude/vc_image_types.h" - typedef struct EGL_IMAGE_T { uint64_t pid; diff --git a/gfx/include/userland/middleware/khronos/wf/wfc_server_stream.h b/gfx/include/userland/middleware/khronos/wf/wfc_server_stream.h index 727b575314..d49e9dbf89 100644 --- a/gfx/include/userland/middleware/khronos/wf/wfc_server_stream.h +++ b/gfx/include/userland/middleware/khronos/wf/wfc_server_stream.h @@ -92,4 +92,3 @@ void wfc_server_stream_update_rects(WFCNativeStreamType stream, bool wfc_server_stream_is_empty(void); #endif /* WFC_SERVER_STREAM_H_ */ - diff --git a/gfx/include/userland/middleware/openmaxil/CMakeLists.txt b/gfx/include/userland/middleware/openmaxil/CMakeLists.txt index 3e9c5f9d16..c09f21dcdb 100644 --- a/gfx/include/userland/middleware/openmaxil/CMakeLists.txt +++ b/gfx/include/userland/middleware/openmaxil/CMakeLists.txt @@ -36,7 +36,7 @@ else () add_definitions (-DVLL_PATH_PREFIX="${VMCS_PLUGIN_DIR}/") - add_library (openmaxil SHARED + add_library (openmaxil SHARED ../../host_applications/framework/common/ilcore.c # core/ilcore.c # core/ril_top.c diff --git a/gfx/include/userland/opensrc/helpers/libfdt/CMakeLists.txt b/gfx/include/userland/opensrc/helpers/libfdt/CMakeLists.txt index f57c61cbbf..844085f9f8 100644 --- a/gfx/include/userland/opensrc/helpers/libfdt/CMakeLists.txt +++ b/gfx/include/userland/opensrc/helpers/libfdt/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(.) add_library(fdt - fdt.c + fdt.c fdt_empty_tree.c fdt_ro.c fdt_rw.c @@ -10,4 +10,3 @@ add_library(fdt fdt_wip.c) INSTALL(FILES) - diff --git a/gfx/include/userland/opensrc/helpers/libfdt/fdt_empty_tree.c b/gfx/include/userland/opensrc/helpers/libfdt/fdt_empty_tree.c index f72d13b1d1..f2ae9b77c2 100644 --- a/gfx/include/userland/opensrc/helpers/libfdt/fdt_empty_tree.c +++ b/gfx/include/userland/opensrc/helpers/libfdt/fdt_empty_tree.c @@ -81,4 +81,3 @@ int fdt_create_empty_tree(void *buf, int bufsize) return fdt_open_into(buf, buf, bufsize); } - diff --git a/gfx/include/userland/opensrc/helpers/libfdt/libfdt.h b/gfx/include/userland/opensrc/helpers/libfdt/libfdt.h index 78adb1232e..2d96d815a7 100644 --- a/gfx/include/userland/opensrc/helpers/libfdt/libfdt.h +++ b/gfx/include/userland/opensrc/helpers/libfdt/libfdt.h @@ -989,7 +989,6 @@ int fdt_address_cells(const void *fdt, int nodeoffset); */ int fdt_size_cells(const void *fdt, int nodeoffset); - /**********************************************************************/ /* Write-in-place functions */ /**********************************************************************/ diff --git a/gfx/include/userland/pkgconfig/brcmegl.pc.in b/gfx/include/userland/pkgconfig/brcmegl.pc.in index 5dd3d5b915..f74c989de4 100644 --- a/gfx/include/userland/pkgconfig/brcmegl.pc.in +++ b/gfx/include/userland/pkgconfig/brcmegl.pc.in @@ -10,4 +10,3 @@ Requires: bcm_host Libs: -L${libdir} -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvchostif Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux \ -I${includedir}/interface/vcos/pthreads - diff --git a/gfx/include/userland/pkgconfig/brcmglesv2.pc.in b/gfx/include/userland/pkgconfig/brcmglesv2.pc.in index e0e36f5a30..62312ee030 100644 --- a/gfx/include/userland/pkgconfig/brcmglesv2.pc.in +++ b/gfx/include/userland/pkgconfig/brcmglesv2.pc.in @@ -9,4 +9,3 @@ Version: 10 Requires: bcm_host Libs: -L${libdir} -lbrcmGLESv2 Cflags: -I${includedir} - diff --git a/gfx/include/userland/pkgconfig/egl.pc.in b/gfx/include/userland/pkgconfig/egl.pc.in index 27a62364c4..d0f335311e 100644 --- a/gfx/include/userland/pkgconfig/egl.pc.in +++ b/gfx/include/userland/pkgconfig/egl.pc.in @@ -10,4 +10,3 @@ Requires: bcm_host Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux \ -I${includedir}/interface/vcos/pthreads - diff --git a/gfx/include/userland/pkgconfig/glesv2.pc.in b/gfx/include/userland/pkgconfig/glesv2.pc.in index 59002250ad..5f1802e3f1 100644 --- a/gfx/include/userland/pkgconfig/glesv2.pc.in +++ b/gfx/include/userland/pkgconfig/glesv2.pc.in @@ -9,4 +9,3 @@ Version: 10 Requires: bcm_host Libs: -L${libdir} -lGLESv2 Cflags: -I${includedir} - diff --git a/gfx/include/userland/vcfw/drivers/driver.h b/gfx/include/userland/vcfw/drivers/driver.h index 3e85e7ce20..acd3d71bf9 100644 --- a/gfx/include/userland/vcfw/drivers/driver.h +++ b/gfx/include/userland/vcfw/drivers/driver.h @@ -54,7 +54,6 @@ typedef enum } DRIVER_FLAGS_T; - /****************************************************************************** Function defines *****************************************************************************/ @@ -68,7 +67,6 @@ typedef int32_t (*DRIVER_INIT_T)( void ); //Routine to shutdown a driver typedef int32_t (*DRIVER_EXIT_T)( void ); - //Routine to return a drivers info (name, version etc..) typedef int32_t (*DRIVER_INFO_T)(const char **driver_name, uint32_t *version_major, @@ -82,7 +80,6 @@ typedef int32_t (*DRIVER_OPEN_T)(const void *params, //Routine to close a driver typedef int32_t (*DRIVER_CLOSE_T)( const DRIVER_HANDLE_T handle ); - //Test routine to open a test driver typedef int32_t (*DRIVER_TEST_INIT_T)( DRIVER_HANDLE_T *handle ); @@ -114,7 +111,6 @@ typedef int32_t (*DRIVER_TEST_EXIT_T)( const DRIVER_HANDLE_T handle ); /*Returns success code*/ \ DRIVER_CLOSE_T close; - typedef struct { //just include the basic driver api @@ -122,7 +118,6 @@ typedef struct } DRIVER_T; - /****************************************************************************** Test Driver struct definition *****************************************************************************/ @@ -138,7 +133,6 @@ typedef struct /*Returns success code (0 if its ok to change the power domains)*/ \ DRIVER_TEST_EXIT_T test_exit; - typedef struct { //just include the test driver api diff --git a/gfx/include/userland/vcfw/logging/logging.h b/gfx/include/userland/vcfw/logging/logging.h index ea092011fa..b9ca5e57d9 100644 --- a/gfx/include/userland/vcfw/logging/logging.h +++ b/gfx/include/userland/vcfw/logging/logging.h @@ -117,7 +117,6 @@ typedef struct { unsigned char *data; } logging_array_log_t; - // The header at the start of the log may be one of a number of different types, // but they all start with a common portion: @@ -207,7 +206,6 @@ void logging_assert_dump(void); void logging_message(int level, const char *format, ...); void vlogging_message (int level, const char *format, va_list args); - /* Log a simple string */ void logging_string(int level, const char *string); /* The log for recording the current tasks. */ @@ -218,7 +216,7 @@ void logging_set_notify_callback( logging_notify_callback_fn fn ); /* Dump log to sdcard, discarding any logging that happens during the file write */ int logging_dump_log(char* filename); -/* Dump log to sdcard. If a sufficiently large temporary buffer is not provided, +/* Dump log to sdcard. If a sufficiently large temporary buffer is not provided, logging messages will be discarded during the file write. */ int logging_dump_log_buffered(char* filename, void *buffer, int buffer_size); @@ -347,4 +345,3 @@ static __inline void logging_message (int level, const char *format, ...) { } #endif // LOGGING #endif // LOGGING_LOGGING_H - diff --git a/gfx/include/userland/vcfw/rtos/common/rtos_common_mem.h b/gfx/include/userland/vcfw/rtos/common/rtos_common_mem.h index ae7af66c62..a550f51dd2 100644 --- a/gfx/include/userland/vcfw/rtos/common/rtos_common_mem.h +++ b/gfx/include/userland/vcfw/rtos/common/rtos_common_mem.h @@ -159,7 +159,6 @@ typedef enum { /* enum to get stricter type checking on msvc */ MEM_INVALID_HANDLE = MEM_HANDLE_INVALID } MEM_HANDLE_T; - /* Flags are set once in mem_alloc -- they do not change over the lifetime of the MEM_HANDLE_T. @@ -290,7 +289,6 @@ typedef enum { typedef void (*MEM_TERM_T)(void *, uint32_t); - /* A common way of storing a MEM_HANDLE_T together with an offset into it. */ @@ -598,7 +596,6 @@ extern void mem_set_desc_printf( if term is not NULL, its postcondition must be at least as strong as the following: Frees any references to resources that are referred to by the object of type X - Postconditions: - @@ -895,7 +892,6 @@ extern void *mem_alloc_legacy_ex(MEM_FLAG_T flags); #define mem_alloc_legacy() mem_alloc_legacy_ex(MEM_FLAG_NORMAL) - /* Free a previously-allocated fixed-size block. @@ -910,7 +906,6 @@ extern void *mem_alloc_legacy_ex(MEM_FLAG_T flags); extern void mem_free_legacy(void *ptr); - /* If count_max is positive then it sets a maximum number of legacy blocks which can be allocated, otherwise the maximum possible (capped at 32) are allowed. @@ -931,7 +926,6 @@ extern void mem_free_legacy(void *ptr); extern int mem_init_legacy(uint32_t size, uint32_t align, int count_max); - /* Preconditions: @@ -944,7 +938,6 @@ extern int mem_init_legacy(uint32_t size, uint32_t align, int count_max); extern uint32_t mem_get_legacy_size(void); - /* Preconditions: @@ -957,7 +950,6 @@ extern uint32_t mem_get_legacy_size(void); extern uint32_t mem_get_legacy_align(void); - /****************************************************************************** Offline chunks API ******************************************************************************/ @@ -997,7 +989,6 @@ extern void *mem_offline(uint32_t size, MEM_FLAG_T flags, extern int mem_offline_chunks(uint32_t num_chunks, MEM_FLAG_T flags, mem_compact_mode_t mode); - /* Free a previously-allocated fixed-size block. Note that it is legal to take a large chunk offline and then bring a portion of it back @@ -1028,7 +1019,6 @@ extern void mem_get_chunk_stats(uint32_t *total, uint32_t *legacy_used, uint32_t *legacy_available, uint32_t *legacy_total, uint32_t *offline_used, uint32_t *offline_available, uint32_t *offline_total); - /****************************************************************************** Long-term lock owners' API ******************************************************************************/ @@ -1068,7 +1058,6 @@ extern void mem_set_low_mem_threshold(uint32_t threshold); extern void mem_unregister_callback(mem_callback_func_t func, uintptr_t context); - /****************************************************************************** Compaction notification API ******************************************************************************/ @@ -1311,7 +1300,6 @@ extern void mem_assign_null_multiple( MEM_HANDLE_OFFSET_T *handles, uint32_t n); - struct MEM_MANAGER_STATS_T; extern void mem_get_internal_stats(struct MEM_MANAGER_STATS_T *stats); @@ -1356,5 +1344,4 @@ void mem_set_accessctrl(MEM_ACCESSCTRL_BLOCK *blocks, uint32_t n); #define MEM_SET_ACCESSCTRL(BLOCKS, NUM) ((void)0) #endif //#ifdef MEM_ACCESS_CTRL - #endif diff --git a/gfx/include/userland/vcfw/rtos/rtos.h b/gfx/include/userland/vcfw/rtos/rtos.h index adee818475..eec56a1ad2 100644 --- a/gfx/include/userland/vcfw/rtos/rtos.h +++ b/gfx/include/userland/vcfw/rtos/rtos.h @@ -116,7 +116,6 @@ extern uint32_t rtos_disable_interrupts( void ); //Routine to re-enable interrupts extern void rtos_restore_interrupts( const uint32_t previous_state ); - //Routine to query if interrupts are enable or not #ifdef __VIDEOCORE__ static inline uint32_t rtos_interrupts_enabled( void ) @@ -137,14 +136,13 @@ typedef uint32_t RTOS_SECURE_FUNC_HANDLE_T; #if defined( __linux__ ) // I get compiler warnings when building for linux (MxC) since () isn't a valid prototype. // Using (...) isn't valid under ANSI C, (you need to have at least one fixed argument). -// So since I don't think that this stuff is actually used from linux, I decided to make it +// So since I don't think that this stuff is actually used from linux, I decided to make it // use (void) until a better solution can be done. typedef void (*RTOS_SECURE_FUNC_T)(void); #else typedef void (*RTOS_SECURE_FUNC_T)(); #endif - //Function to register secure functions //NOTE - these functions should be encrypted extern int32_t rtos_secure_function_register( RTOS_SECURE_FUNC_T secure_func, @@ -222,7 +220,6 @@ extern void rtos_latch_put_real( RTOS_LATCH_T *latch ); // Routine to try and get a latch. Can be called from an interrupt extern int32_t rtos_latch_try_real( RTOS_LATCH_T *latch ); - // See vcfw/rtos/common/rtos_latch_logging.c for more about latch logging. //#define LATCH_LOGGING_ENABLED @@ -236,7 +233,6 @@ extern void rtos_latch_logging_latch_get( RTOS_LATCH_T *latch, const char * name extern void rtos_latch_logging_latch_put( RTOS_LATCH_T *latch, const char * name ); extern int32_t rtos_latch_logging_latch_try( RTOS_LATCH_T *latch, const char * name ); - #ifndef STRINGISED #define _STRINGISED(x) #x #define STRINGISED(x) _STRINGISED(x) @@ -254,10 +250,8 @@ extern void rtos_latch_logging_init(); #define rtos_latch_put( latch ) rtos_latch_put_real( (latch) ) #define rtos_latch_try( latch ) rtos_latch_try_real( (latch) ) - #endif - /****************************************************************************** CPU-related functions *****************************************************************************/ @@ -279,7 +273,6 @@ extern uint32_t rtos_get_sleep_time( const uint32_t cpu ); // zeroing the recorded sleep time is otherwise undesirable. extern void rtos_reset_sleep_time( const uint32_t cpu ); - // Returns a count of the total usecs spent executing LISRs on the // specified CPU extern uint32_t rtos_get_lisr_time( const uint32_t cpu ); @@ -340,7 +333,6 @@ extern int32_t rtos_timer_reset( RTOS_TIMER_T *timer, const RTOS_TIMER_TIME_T de // TIMER is cancelled if running and the callback is not called. Returns 0 if the timer was running extern int32_t rtos_timer_cancel( RTOS_TIMER_T *timer ); - /****************************************************************************** Memory- and address space-related functions *****************************************************************************/ @@ -427,7 +419,6 @@ extern void * rtos_get_sys_mem_start(void); // Returns the size of the memory addressable by VideoCore extern uint32_t rtos_get_sys_mem_size(void); - /****************************************************************************** Malloc / free funcs *****************************************************************************/ @@ -536,5 +527,4 @@ extern void vctest_start_failure_testing(void); } #endif - #endif // RTOS_H_ diff --git a/gfx/include/userland/vcfw/vclib/vclib.h b/gfx/include/userland/vcfw/vclib/vclib.h index 024137a026..a17ddb29b7 100644 --- a/gfx/include/userland/vcfw/vclib/vclib.h +++ b/gfx/include/userland/vcfw/vclib/vclib.h @@ -131,7 +131,6 @@ extern void vclib_l1cache_invalidate_range(void *start_addr, int length); extern int vclib_disableint(void); extern void vclib_restoreint(int sr); - /* Some support for automatic logging. */ /* Have a macro that is guaranteed to be a simple "assert" even when logging is on. */ @@ -141,7 +140,6 @@ extern void vclib_restoreint(int sr); #define simple_assert(cond) if (cond) {} else _bkpt() #endif - /********* ** HACK!!!!!! Temp function definition (code in cache_flush.s) used to enable the run domain in VCIII **********/ @@ -149,7 +147,6 @@ extern void vc_enable_run_domain( void ); #define vclib_memory_is_valid rtos_memory_is_valid - /* Latch events are fast and small event notifications */ typedef RTOS_LATCH_T latch_event_t; @@ -157,7 +154,6 @@ typedef RTOS_LATCH_T latch_event_t; #define latch_event_absent() ((latch_event_t)rtos_latch_locked()) - #define latch_event_is_present( latch ) (latch_event_present() == *(latch)) #if defined(__HIGHC__) /* MetaWare tools */ @@ -192,7 +188,6 @@ typedef RTOS_LATCH_T latch_event_t; #endif // defined __VIDEOCORE__ - // A few helpful things for windows / standalone Linux # ifndef __VIDEOCORE__ @@ -222,7 +217,7 @@ typedef RTOS_LATCH_T latch_event_t; # define VCLIB_PRIORITY_UNIMPORTANT 0 # define vclib_fatal_assert(x, c) assert(x) - + # define vclib_prioritymalloc(size, align, priority, description) \ rtos_prioritymalloc((size), (align), (priority), (description)) # define vclib_prioritycalloc(size, align, priority, description) \ diff --git a/gfx/include/userland/vcinclude/common.h b/gfx/include/userland/vcinclude/common.h index 05d1bdd9be..60805f4c4e 100644 --- a/gfx/include/userland/vcinclude/common.h +++ b/gfx/include/userland/vcinclude/common.h @@ -62,13 +62,11 @@ extern "C" { #elif defined (VCMODS_LCC) #include - #elif !defined(__KERNEL__) #include #endif - /*}}}*/ /* Fixed-point types */ @@ -97,7 +95,6 @@ typedef enum bool_e /*{{{ Common macros */ - /* Align a pointer/integer by rounding up/down */ #define ALIGN_DOWN(p, n) ((uintptr_t)(p) - ( (uintptr_t)(p) % (uintptr_t)(n) )) #define ALIGN_UP(p, n) ALIGN_DOWN((uintptr_t)(p) + (uintptr_t)(n) - 1, (n)) @@ -137,4 +134,3 @@ typedef enum bool_e } #endif #endif /* __VCINCLUDE_COMMON_H__ */ - diff --git a/gfx/include/vulkan/vulkan.hpp b/gfx/include/vulkan/vulkan.hpp index c51360aa12..aba454c24a 100644 --- a/gfx/include/vulkan/vulkan.hpp +++ b/gfx/include/vulkan/vulkan.hpp @@ -1,11 +1,11 @@ // Copyright (c) 2015-2018 The Khronos Group Inc. -// +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 -// +// // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -91,7 +91,6 @@ static_assert( VK_HEADER_VERSION == 73 , "Wrong VK_HEADER_VERSION!" ); # define VULKAN_HPP_CONSTEXPR constexpr #endif - #if !defined(VULKAN_HPP_NAMESPACE) #define VULKAN_HPP_NAMESPACE vk #endif @@ -231,7 +230,6 @@ namespace VULKAN_HPP_NAMESPACE return flags ^ bit; } - template class Optional { @@ -405,7 +403,7 @@ namespace VULKAN_HPP_NAMESPACE { return m_value; } - + Type & get() { return m_value; @@ -444,7 +442,6 @@ namespace VULKAN_HPP_NAMESPACE } #endif - template struct isStructureChainValid { enum { value = false }; }; template @@ -463,7 +460,7 @@ namespace VULKAN_HPP_NAMESPACE public: StructureChain() { - link(); + link(); } StructureChain(StructureChain const &rhs) @@ -995,7 +992,6 @@ namespace VULKAN_HPP_NAMESPACE } #endif - struct AllocationCallbacks; template @@ -2688,7 +2684,7 @@ public: DeviceMemory & operator=(VkDeviceMemory deviceMemory) { m_deviceMemory = deviceMemory; - return *this; + return *this; } #endif @@ -2713,8 +2709,6 @@ public: return m_deviceMemory < rhs.m_deviceMemory; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDeviceMemory() const { return m_deviceMemory; @@ -2755,7 +2749,7 @@ public: CommandPool & operator=(VkCommandPool commandPool) { m_commandPool = commandPool; - return *this; + return *this; } #endif @@ -2780,8 +2774,6 @@ public: return m_commandPool < rhs.m_commandPool; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCommandPool() const { return m_commandPool; @@ -2822,7 +2814,7 @@ public: Buffer & operator=(VkBuffer buffer) { m_buffer = buffer; - return *this; + return *this; } #endif @@ -2847,8 +2839,6 @@ public: return m_buffer < rhs.m_buffer; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkBuffer() const { return m_buffer; @@ -2889,7 +2879,7 @@ public: BufferView & operator=(VkBufferView bufferView) { m_bufferView = bufferView; - return *this; + return *this; } #endif @@ -2914,8 +2904,6 @@ public: return m_bufferView < rhs.m_bufferView; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkBufferView() const { return m_bufferView; @@ -2956,7 +2944,7 @@ public: Image & operator=(VkImage image) { m_image = image; - return *this; + return *this; } #endif @@ -2981,8 +2969,6 @@ public: return m_image < rhs.m_image; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkImage() const { return m_image; @@ -3023,7 +3009,7 @@ public: ImageView & operator=(VkImageView imageView) { m_imageView = imageView; - return *this; + return *this; } #endif @@ -3048,8 +3034,6 @@ public: return m_imageView < rhs.m_imageView; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkImageView() const { return m_imageView; @@ -3090,7 +3074,7 @@ public: ShaderModule & operator=(VkShaderModule shaderModule) { m_shaderModule = shaderModule; - return *this; + return *this; } #endif @@ -3115,8 +3099,6 @@ public: return m_shaderModule < rhs.m_shaderModule; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkShaderModule() const { return m_shaderModule; @@ -3157,7 +3139,7 @@ public: Pipeline & operator=(VkPipeline pipeline) { m_pipeline = pipeline; - return *this; + return *this; } #endif @@ -3182,8 +3164,6 @@ public: return m_pipeline < rhs.m_pipeline; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipeline() const { return m_pipeline; @@ -3224,7 +3204,7 @@ public: PipelineLayout & operator=(VkPipelineLayout pipelineLayout) { m_pipelineLayout = pipelineLayout; - return *this; + return *this; } #endif @@ -3249,8 +3229,6 @@ public: return m_pipelineLayout < rhs.m_pipelineLayout; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipelineLayout() const { return m_pipelineLayout; @@ -3291,7 +3269,7 @@ public: Sampler & operator=(VkSampler sampler) { m_sampler = sampler; - return *this; + return *this; } #endif @@ -3316,8 +3294,6 @@ public: return m_sampler < rhs.m_sampler; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSampler() const { return m_sampler; @@ -3358,7 +3334,7 @@ public: DescriptorSet & operator=(VkDescriptorSet descriptorSet) { m_descriptorSet = descriptorSet; - return *this; + return *this; } #endif @@ -3383,8 +3359,6 @@ public: return m_descriptorSet < rhs.m_descriptorSet; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorSet() const { return m_descriptorSet; @@ -3425,7 +3399,7 @@ public: DescriptorSetLayout & operator=(VkDescriptorSetLayout descriptorSetLayout) { m_descriptorSetLayout = descriptorSetLayout; - return *this; + return *this; } #endif @@ -3450,8 +3424,6 @@ public: return m_descriptorSetLayout < rhs.m_descriptorSetLayout; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorSetLayout() const { return m_descriptorSetLayout; @@ -3492,7 +3464,7 @@ public: DescriptorPool & operator=(VkDescriptorPool descriptorPool) { m_descriptorPool = descriptorPool; - return *this; + return *this; } #endif @@ -3517,8 +3489,6 @@ public: return m_descriptorPool < rhs.m_descriptorPool; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorPool() const { return m_descriptorPool; @@ -3559,7 +3529,7 @@ public: Fence & operator=(VkFence fence) { m_fence = fence; - return *this; + return *this; } #endif @@ -3584,8 +3554,6 @@ public: return m_fence < rhs.m_fence; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkFence() const { return m_fence; @@ -3626,7 +3594,7 @@ public: Semaphore & operator=(VkSemaphore semaphore) { m_semaphore = semaphore; - return *this; + return *this; } #endif @@ -3651,8 +3619,6 @@ public: return m_semaphore < rhs.m_semaphore; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSemaphore() const { return m_semaphore; @@ -3693,7 +3659,7 @@ public: Event & operator=(VkEvent event) { m_event = event; - return *this; + return *this; } #endif @@ -3718,8 +3684,6 @@ public: return m_event < rhs.m_event; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkEvent() const { return m_event; @@ -3760,7 +3724,7 @@ public: QueryPool & operator=(VkQueryPool queryPool) { m_queryPool = queryPool; - return *this; + return *this; } #endif @@ -3785,8 +3749,6 @@ public: return m_queryPool < rhs.m_queryPool; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkQueryPool() const { return m_queryPool; @@ -3827,7 +3789,7 @@ public: Framebuffer & operator=(VkFramebuffer framebuffer) { m_framebuffer = framebuffer; - return *this; + return *this; } #endif @@ -3852,8 +3814,6 @@ public: return m_framebuffer < rhs.m_framebuffer; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkFramebuffer() const { return m_framebuffer; @@ -3894,7 +3854,7 @@ public: RenderPass & operator=(VkRenderPass renderPass) { m_renderPass = renderPass; - return *this; + return *this; } #endif @@ -3919,8 +3879,6 @@ public: return m_renderPass < rhs.m_renderPass; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkRenderPass() const { return m_renderPass; @@ -3961,7 +3919,7 @@ public: PipelineCache & operator=(VkPipelineCache pipelineCache) { m_pipelineCache = pipelineCache; - return *this; + return *this; } #endif @@ -3986,8 +3944,6 @@ public: return m_pipelineCache < rhs.m_pipelineCache; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPipelineCache() const { return m_pipelineCache; @@ -4028,7 +3984,7 @@ public: ObjectTableNVX & operator=(VkObjectTableNVX objectTableNVX) { m_objectTableNVX = objectTableNVX; - return *this; + return *this; } #endif @@ -4053,8 +4009,6 @@ public: return m_objectTableNVX < rhs.m_objectTableNVX; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkObjectTableNVX() const { return m_objectTableNVX; @@ -4095,7 +4049,7 @@ public: IndirectCommandsLayoutNVX & operator=(VkIndirectCommandsLayoutNVX indirectCommandsLayoutNVX) { m_indirectCommandsLayoutNVX = indirectCommandsLayoutNVX; - return *this; + return *this; } #endif @@ -4120,8 +4074,6 @@ public: return m_indirectCommandsLayoutNVX < rhs.m_indirectCommandsLayoutNVX; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkIndirectCommandsLayoutNVX() const { return m_indirectCommandsLayoutNVX; @@ -4162,7 +4114,7 @@ public: DescriptorUpdateTemplate & operator=(VkDescriptorUpdateTemplate descriptorUpdateTemplate) { m_descriptorUpdateTemplate = descriptorUpdateTemplate; - return *this; + return *this; } #endif @@ -4187,8 +4139,6 @@ public: return m_descriptorUpdateTemplate < rhs.m_descriptorUpdateTemplate; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDescriptorUpdateTemplate() const { return m_descriptorUpdateTemplate; @@ -4231,7 +4181,7 @@ public: SamplerYcbcrConversion & operator=(VkSamplerYcbcrConversion samplerYcbcrConversion) { m_samplerYcbcrConversion = samplerYcbcrConversion; - return *this; + return *this; } #endif @@ -4256,8 +4206,6 @@ public: return m_samplerYcbcrConversion < rhs.m_samplerYcbcrConversion; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSamplerYcbcrConversion() const { return m_samplerYcbcrConversion; @@ -4300,7 +4248,7 @@ public: ValidationCacheEXT & operator=(VkValidationCacheEXT validationCacheEXT) { m_validationCacheEXT = validationCacheEXT; - return *this; + return *this; } #endif @@ -4325,8 +4273,6 @@ public: return m_validationCacheEXT < rhs.m_validationCacheEXT; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkValidationCacheEXT() const { return m_validationCacheEXT; @@ -4367,7 +4313,7 @@ public: DisplayKHR & operator=(VkDisplayKHR displayKHR) { m_displayKHR = displayKHR; - return *this; + return *this; } #endif @@ -4392,8 +4338,6 @@ public: return m_displayKHR < rhs.m_displayKHR; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDisplayKHR() const { return m_displayKHR; @@ -4434,7 +4378,7 @@ public: DisplayModeKHR & operator=(VkDisplayModeKHR displayModeKHR) { m_displayModeKHR = displayModeKHR; - return *this; + return *this; } #endif @@ -4459,8 +4403,6 @@ public: return m_displayModeKHR < rhs.m_displayModeKHR; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDisplayModeKHR() const { return m_displayModeKHR; @@ -4501,7 +4443,7 @@ public: SurfaceKHR & operator=(VkSurfaceKHR surfaceKHR) { m_surfaceKHR = surfaceKHR; - return *this; + return *this; } #endif @@ -4526,8 +4468,6 @@ public: return m_surfaceKHR < rhs.m_surfaceKHR; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSurfaceKHR() const { return m_surfaceKHR; @@ -4568,7 +4508,7 @@ public: SwapchainKHR & operator=(VkSwapchainKHR swapchainKHR) { m_swapchainKHR = swapchainKHR; - return *this; + return *this; } #endif @@ -4593,8 +4533,6 @@ public: return m_swapchainKHR < rhs.m_swapchainKHR; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkSwapchainKHR() const { return m_swapchainKHR; @@ -4635,7 +4573,7 @@ public: DebugReportCallbackEXT & operator=(VkDebugReportCallbackEXT debugReportCallbackEXT) { m_debugReportCallbackEXT = debugReportCallbackEXT; - return *this; + return *this; } #endif @@ -4660,8 +4598,6 @@ public: return m_debugReportCallbackEXT < rhs.m_debugReportCallbackEXT; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDebugReportCallbackEXT() const { return m_debugReportCallbackEXT; @@ -4702,7 +4638,7 @@ public: DebugUtilsMessengerEXT & operator=(VkDebugUtilsMessengerEXT debugUtilsMessengerEXT) { m_debugUtilsMessengerEXT = debugUtilsMessengerEXT; - return *this; + return *this; } #endif @@ -4727,8 +4663,6 @@ public: return m_debugUtilsMessengerEXT < rhs.m_debugUtilsMessengerEXT; } - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDebugUtilsMessengerEXT() const { return m_debugUtilsMessengerEXT; @@ -29554,11 +29488,10 @@ public: } #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - template Result enumerateInstanceLayerProperties( uint32_t* pPropertyCount, LayerProperties* pProperties, Dispatch const &d = Dispatch() ); #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumerateInstanceLayerProperties(Dispatch const &d = Dispatch() ); #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -29568,7 +29501,7 @@ public: return static_cast( d.vkEnumerateInstanceLayerProperties( pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type enumerateInstanceLayerProperties(Dispatch const &d ) { std::vector properties; @@ -29589,11 +29522,10 @@ public: } #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - template Result enumerateInstanceExtensionProperties( const char* pLayerName, uint32_t* pPropertyCount, ExtensionProperties* pProperties, Dispatch const &d = Dispatch() ); #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumerateInstanceExtensionProperties( Optional layerName = nullptr, Dispatch const &d = Dispatch() ); #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -29603,7 +29535,7 @@ public: return static_cast( d.vkEnumerateInstanceExtensionProperties( pLayerName, pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type enumerateInstanceExtensionProperties( Optional layerName, Dispatch const &d ) { std::vector properties; @@ -29624,7 +29556,6 @@ public: } #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - // forward declarations struct CmdProcessCommandsInfoNVX; @@ -29647,7 +29578,7 @@ public: CommandBuffer & operator=(VkCommandBuffer commandBuffer) { m_commandBuffer = commandBuffer; - return *this; + return *this; } #endif @@ -30003,8 +29934,6 @@ public: template void writeBufferMarkerAMD( PipelineStageFlagBits pipelineStage, Buffer dstBuffer, DeviceSize dstOffset, uint32_t marker, Dispatch const &d = Dispatch() ) const; - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkCommandBuffer() const { return m_commandBuffer; @@ -31073,7 +31002,7 @@ public: Queue & operator=(VkQueue queue) { m_queue = queue; - return *this; + return *this; } #endif @@ -31144,8 +31073,6 @@ public: void insertDebugUtilsLabelEXT( const DebugUtilsLabelEXT & labelInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkQueue() const { return m_queue; @@ -31342,7 +31269,7 @@ public: Device & operator=(VkDevice device) { m_device = device; - return *this; + return *this; } #endif @@ -31485,7 +31412,7 @@ public: template void getImageSparseMemoryRequirements( Image image, uint32_t* pSparseMemoryRequirementCount, SparseImageMemoryRequirements* pSparseMemoryRequirements, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getImageSparseMemoryRequirements( Image image, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -31792,7 +31719,7 @@ public: template Result getPipelineCacheData( PipelineCache pipelineCache, size_t* pDataSize, void* pData, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getPipelineCacheData( PipelineCache pipelineCache, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -31806,14 +31733,14 @@ public: template Result createGraphicsPipelines( PipelineCache pipelineCache, uint32_t createInfoCount, const GraphicsPipelineCreateInfo* pCreateInfos, const AllocationCallbacks* pAllocator, Pipeline* pPipelines, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createGraphicsPipelines( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createGraphicsPipeline( PipelineCache pipelineCache, const GraphicsPipelineCreateInfo & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_NO_SMART_HANDLE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createGraphicsPipelinesUnique( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createGraphicsPipelineUnique( PipelineCache pipelineCache, const GraphicsPipelineCreateInfo & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -31821,14 +31748,14 @@ public: template Result createComputePipelines( PipelineCache pipelineCache, uint32_t createInfoCount, const ComputePipelineCreateInfo* pCreateInfos, const AllocationCallbacks* pAllocator, Pipeline* pPipelines, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createComputePipelines( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createComputePipeline( PipelineCache pipelineCache, const ComputePipelineCreateInfo & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_NO_SMART_HANDLE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createComputePipelinesUnique( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createComputePipelineUnique( PipelineCache pipelineCache, const ComputePipelineCreateInfo & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -31958,10 +31885,10 @@ public: template Result allocateDescriptorSets( const DescriptorSetAllocateInfo* pAllocateInfo, DescriptorSet* pDescriptorSets, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_NO_SMART_HANDLE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32080,10 +32007,10 @@ public: template Result allocateCommandBuffers( const CommandBufferAllocateInfo* pAllocateInfo, CommandBuffer* pCommandBuffers, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_NO_SMART_HANDLE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32105,14 +32032,14 @@ public: template Result createSharedSwapchainsKHR( uint32_t swapchainCount, const SwapchainCreateInfoKHR* pCreateInfos, const AllocationCallbacks* pAllocator, SwapchainKHR* pSwapchains, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createSharedSwapchainsKHR( ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createSharedSwapchainKHR( const SwapchainCreateInfoKHR & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_NO_SMART_HANDLE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type createSharedSwapchainsKHRUnique( ArrayProxy createInfos, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> ResultValueType::type createSharedSwapchainKHRUnique( const SwapchainCreateInfoKHR & createInfo, Optional allocator = nullptr, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32145,7 +32072,7 @@ public: template Result getSwapchainImagesKHR( SwapchainKHR swapchain, uint32_t* pSwapchainImageCount, Image* pSwapchainImages, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getSwapchainImagesKHR( SwapchainKHR swapchain, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32505,7 +32432,7 @@ public: template Result getPastPresentationTimingGOOGLE( SwapchainKHR swapchain, uint32_t* pPresentationTimingCount, PastPresentationTimingGOOGLE* pPresentationTimings, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getPastPresentationTimingGOOGLE( SwapchainKHR swapchain, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32548,14 +32475,14 @@ public: template void getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, SparseImageMemoryRequirements2* pSparseMemoryRequirements, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template void getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2* pInfo, uint32_t* pSparseMemoryRequirementCount, SparseImageMemoryRequirements2* pSparseMemoryRequirements, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32637,7 +32564,7 @@ public: template Result getValidationCacheDataEXT( ValidationCacheEXT validationCache, size_t* pDataSize, void* pData, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getValidationCacheDataEXT( ValidationCacheEXT validationCache, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32669,7 +32596,7 @@ public: template Result getShaderInfoAMD( Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, size_t* pInfoSize, void* pInfo, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getShaderInfoAMD( Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -32714,8 +32641,6 @@ public: #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ #endif /*VK_USE_PLATFORM_ANDROID_ANDROID*/ - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkDevice() const { return m_device; @@ -32983,7 +32908,7 @@ public: d.vkGetImageSparseMemoryRequirements( m_device, static_cast( image ), pSparseMemoryRequirementCount, reinterpret_cast( pSparseMemoryRequirements ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector Device::getImageSparseMemoryRequirements( Image image, Dispatch const &d ) const { std::vector sparseMemoryRequirements; @@ -33638,7 +33563,7 @@ public: return static_cast( d.vkGetPipelineCacheData( m_device, static_cast( pipelineCache ), pDataSize, pData ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::getPipelineCacheData( PipelineCache pipelineCache, Dispatch const &d ) const { std::vector data; @@ -33679,14 +33604,14 @@ public: return static_cast( d.vkCreateGraphicsPipelines( m_device, static_cast( pipelineCache ), createInfoCount, reinterpret_cast( pCreateInfos ), reinterpret_cast( pAllocator ), reinterpret_cast( pPipelines ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createGraphicsPipelines( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { std::vector pipelines( createInfos.size() ); Result result = static_cast( d.vkCreateGraphicsPipelines( m_device, static_cast( pipelineCache ), createInfos.size() , reinterpret_cast( createInfos.data() ), reinterpret_cast( static_cast( allocator ) ), reinterpret_cast( pipelines.data() ) ) ); return createResultValue( result, pipelines, VULKAN_HPP_NAMESPACE_STRING"::Device::createGraphicsPipelines" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createGraphicsPipeline( PipelineCache pipelineCache, const GraphicsPipelineCreateInfo & createInfo, Optional allocator, Dispatch const &d ) const { Pipeline pipeline; @@ -33694,7 +33619,7 @@ public: return createResultValue( result, pipeline, VULKAN_HPP_NAMESPACE_STRING"::Device::createGraphicsPipeline" ); } #ifndef VULKAN_HPP_NO_SMART_HANDLE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createGraphicsPipelinesUnique( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { static_assert( sizeof( Pipeline ) <= sizeof( UniquePipeline ), "Pipeline is greater than UniquePipeline!" ); @@ -33711,7 +33636,7 @@ public: return createResultValue( result, pipelines, VULKAN_HPP_NAMESPACE_STRING "::Device::createGraphicsPipelinesUnique" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createGraphicsPipelineUnique( PipelineCache pipelineCache, const GraphicsPipelineCreateInfo & createInfo, Optional allocator, Dispatch const &d ) const { Pipeline pipeline; @@ -33729,14 +33654,14 @@ public: return static_cast( d.vkCreateComputePipelines( m_device, static_cast( pipelineCache ), createInfoCount, reinterpret_cast( pCreateInfos ), reinterpret_cast( pAllocator ), reinterpret_cast( pPipelines ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createComputePipelines( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { std::vector pipelines( createInfos.size() ); Result result = static_cast( d.vkCreateComputePipelines( m_device, static_cast( pipelineCache ), createInfos.size() , reinterpret_cast( createInfos.data() ), reinterpret_cast( static_cast( allocator ) ), reinterpret_cast( pipelines.data() ) ) ); return createResultValue( result, pipelines, VULKAN_HPP_NAMESPACE_STRING"::Device::createComputePipelines" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createComputePipeline( PipelineCache pipelineCache, const ComputePipelineCreateInfo & createInfo, Optional allocator, Dispatch const &d ) const { Pipeline pipeline; @@ -33744,7 +33669,7 @@ public: return createResultValue( result, pipeline, VULKAN_HPP_NAMESPACE_STRING"::Device::createComputePipeline" ); } #ifndef VULKAN_HPP_NO_SMART_HANDLE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createComputePipelinesUnique( PipelineCache pipelineCache, ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { static_assert( sizeof( Pipeline ) <= sizeof( UniquePipeline ), "Pipeline is greater than UniquePipeline!" ); @@ -33761,7 +33686,7 @@ public: return createResultValue( result, pipelines, VULKAN_HPP_NAMESPACE_STRING "::Device::createComputePipelinesUnique" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createComputePipelineUnique( PipelineCache pipelineCache, const ComputePipelineCreateInfo & createInfo, Optional allocator, Dispatch const &d ) const { Pipeline pipeline; @@ -34028,7 +33953,7 @@ public: return static_cast( d.vkAllocateDescriptorSets( m_device, reinterpret_cast( pAllocateInfo ), reinterpret_cast( pDescriptorSets ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::allocateDescriptorSets( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const &d ) const { std::vector descriptorSets( allocateInfo.descriptorSetCount ); @@ -34036,7 +33961,7 @@ public: return createResultValue( result, descriptorSets, VULKAN_HPP_NAMESPACE_STRING"::Device::allocateDescriptorSets" ); } #ifndef VULKAN_HPP_NO_SMART_HANDLE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::allocateDescriptorSetsUnique( const DescriptorSetAllocateInfo & allocateInfo, Dispatch const &d ) const { static_assert( sizeof( DescriptorSet ) <= sizeof( UniqueDescriptorSet ), "DescriptorSet is greater than UniqueDescriptorSet!" ); @@ -34289,7 +34214,7 @@ public: return static_cast( d.vkAllocateCommandBuffers( m_device, reinterpret_cast( pAllocateInfo ), reinterpret_cast( pCommandBuffers ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::allocateCommandBuffers( const CommandBufferAllocateInfo & allocateInfo, Dispatch const &d ) const { std::vector commandBuffers( allocateInfo.commandBufferCount ); @@ -34297,7 +34222,7 @@ public: return createResultValue( result, commandBuffers, VULKAN_HPP_NAMESPACE_STRING"::Device::allocateCommandBuffers" ); } #ifndef VULKAN_HPP_NO_SMART_HANDLE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::allocateCommandBuffersUnique( const CommandBufferAllocateInfo & allocateInfo, Dispatch const &d ) const { static_assert( sizeof( CommandBuffer ) <= sizeof( UniqueCommandBuffer ), "CommandBuffer is greater than UniqueCommandBuffer!" ); @@ -34349,14 +34274,14 @@ public: return static_cast( d.vkCreateSharedSwapchainsKHR( m_device, swapchainCount, reinterpret_cast( pCreateInfos ), reinterpret_cast( pAllocator ), reinterpret_cast( pSwapchains ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createSharedSwapchainsKHR( ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { std::vector swapchains( createInfos.size() ); Result result = static_cast( d.vkCreateSharedSwapchainsKHR( m_device, createInfos.size() , reinterpret_cast( createInfos.data() ), reinterpret_cast( static_cast( allocator ) ), reinterpret_cast( swapchains.data() ) ) ); return createResultValue( result, swapchains, VULKAN_HPP_NAMESPACE_STRING"::Device::createSharedSwapchainsKHR" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createSharedSwapchainKHR( const SwapchainCreateInfoKHR & createInfo, Optional allocator, Dispatch const &d ) const { SwapchainKHR swapchain; @@ -34364,7 +34289,7 @@ public: return createResultValue( result, swapchain, VULKAN_HPP_NAMESPACE_STRING"::Device::createSharedSwapchainKHR" ); } #ifndef VULKAN_HPP_NO_SMART_HANDLE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::createSharedSwapchainsKHRUnique( ArrayProxy createInfos, Optional allocator, Dispatch const &d ) const { static_assert( sizeof( SwapchainKHR ) <= sizeof( UniqueSwapchainKHR ), "SwapchainKHR is greater than UniqueSwapchainKHR!" ); @@ -34381,7 +34306,7 @@ public: return createResultValue( result, swapchainKHRs, VULKAN_HPP_NAMESPACE_STRING "::Device::createSharedSwapchainsKHRUnique" ); } - template + template VULKAN_HPP_INLINE ResultValueType::type Device::createSharedSwapchainKHRUnique( const SwapchainCreateInfoKHR & createInfo, Optional allocator, Dispatch const &d ) const { SwapchainKHR swapchain; @@ -34451,7 +34376,7 @@ public: return static_cast( d.vkGetSwapchainImagesKHR( m_device, static_cast( swapchain ), pSwapchainImageCount, reinterpret_cast( pSwapchainImages ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::getSwapchainImagesKHR( SwapchainKHR swapchain, Dispatch const &d ) const { std::vector swapchainImages; @@ -35262,7 +35187,7 @@ public: return static_cast( d.vkGetPastPresentationTimingGOOGLE( m_device, static_cast( swapchain ), pPresentationTimingCount, reinterpret_cast( pPresentationTimings ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::getPastPresentationTimingGOOGLE( SwapchainKHR swapchain, Dispatch const &d ) const { std::vector presentationTimings; @@ -35381,7 +35306,7 @@ public: d.vkGetImageSparseMemoryRequirements2( m_device, reinterpret_cast( pInfo ), pSparseMemoryRequirementCount, reinterpret_cast( pSparseMemoryRequirements ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector Device::getImageSparseMemoryRequirements2( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const &d ) const { std::vector sparseMemoryRequirements; @@ -35399,7 +35324,7 @@ public: d.vkGetImageSparseMemoryRequirements2KHR( m_device, reinterpret_cast( pInfo ), pSparseMemoryRequirementCount, reinterpret_cast( pSparseMemoryRequirements ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector Device::getImageSparseMemoryRequirements2KHR( const ImageSparseMemoryRequirementsInfo2 & info, Dispatch const &d ) const { std::vector sparseMemoryRequirements; @@ -35575,7 +35500,7 @@ public: return static_cast( d.vkGetValidationCacheDataEXT( m_device, static_cast( validationCache ), pDataSize, pData ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::getValidationCacheDataEXT( ValidationCacheEXT validationCache, Dispatch const &d ) const { std::vector data; @@ -35662,7 +35587,7 @@ public: return static_cast( d.vkGetShaderInfoAMD( m_device, static_cast( pipeline ), static_cast( shaderStage ), static_cast( infoType ), pInfoSize, pInfo ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Device::getShaderInfoAMD( Pipeline pipeline, ShaderStageFlagBits shaderStage, ShaderInfoTypeAMD infoType, Dispatch const &d ) const { std::vector info; @@ -35793,7 +35718,7 @@ public: PhysicalDevice & operator=(VkPhysicalDevice physicalDevice) { m_physicalDevice = physicalDevice; - return *this; + return *this; } #endif @@ -35828,7 +35753,7 @@ public: template void getQueueFamilyProperties( uint32_t* pQueueFamilyPropertyCount, QueueFamilyProperties* pQueueFamilyProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getQueueFamilyProperties(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -35874,49 +35799,49 @@ public: template Result enumerateDeviceLayerProperties( uint32_t* pPropertyCount, LayerProperties* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumerateDeviceLayerProperties(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result enumerateDeviceExtensionProperties( const char* pLayerName, uint32_t* pPropertyCount, ExtensionProperties* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumerateDeviceExtensionProperties( Optional layerName = nullptr, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template void getSparseImageFormatProperties( Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling, uint32_t* pPropertyCount, SparseImageFormatProperties* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getSparseImageFormatProperties( Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result getDisplayPropertiesKHR( uint32_t* pPropertyCount, DisplayPropertiesKHR* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getDisplayPropertiesKHR(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result getDisplayPlanePropertiesKHR( uint32_t* pPropertyCount, DisplayPlanePropertiesKHR* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getDisplayPlanePropertiesKHR(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, uint32_t* pDisplayCount, DisplayKHR* pDisplays, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result getDisplayModePropertiesKHR( DisplayKHR display, uint32_t* pPropertyCount, DisplayModePropertiesKHR* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getDisplayModePropertiesKHR( DisplayKHR display, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -35960,14 +35885,14 @@ public: template Result getSurfaceFormatsKHR( SurfaceKHR surface, uint32_t* pSurfaceFormatCount, SurfaceFormatKHR* pSurfaceFormats, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getSurfaceFormatsKHR( SurfaceKHR surface, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result getSurfacePresentModesKHR( SurfaceKHR surface, uint32_t* pPresentModeCount, PresentModeKHR* pPresentModes, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getSurfacePresentModesKHR( SurfaceKHR surface, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -36088,14 +36013,14 @@ public: template void getQueueFamilyProperties2( uint32_t* pQueueFamilyPropertyCount, QueueFamilyProperties2* pQueueFamilyProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getQueueFamilyProperties2(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template void getQueueFamilyProperties2KHR( uint32_t* pQueueFamilyPropertyCount, QueueFamilyProperties2* pQueueFamilyProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getQueueFamilyProperties2KHR(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -36116,14 +36041,14 @@ public: template void getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, SparseImageFormatProperties2* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template void getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2* pFormatInfo, uint32_t* pPropertyCount, SparseImageFormatProperties2* pProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> std::vector getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -36205,7 +36130,7 @@ public: template Result getPresentRectanglesKHR( SurfaceKHR surface, uint32_t* pRectCount, Rect2D* pRects, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getPresentRectanglesKHR( SurfaceKHR surface, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -36228,12 +36153,10 @@ public: template Result getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, SurfaceFormat2KHR* pSurfaceFormats, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkPhysicalDevice() const { return m_physicalDevice; @@ -36276,7 +36199,7 @@ public: d.vkGetPhysicalDeviceQueueFamilyProperties( m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast( pQueueFamilyProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getQueueFamilyProperties(Dispatch const &d ) const { std::vector queueFamilyProperties; @@ -36380,7 +36303,7 @@ public: return static_cast( d.vkEnumerateDeviceLayerProperties( m_physicalDevice, pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::enumerateDeviceLayerProperties(Dispatch const &d ) const { std::vector properties; @@ -36407,7 +36330,7 @@ public: return static_cast( d.vkEnumerateDeviceExtensionProperties( m_physicalDevice, pLayerName, pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::enumerateDeviceExtensionProperties( Optional layerName, Dispatch const &d ) const { std::vector properties; @@ -36434,7 +36357,7 @@ public: d.vkGetPhysicalDeviceSparseImageFormatProperties( m_physicalDevice, static_cast( format ), static_cast( type ), static_cast( samples ), static_cast( usage ), static_cast( tiling ), pPropertyCount, reinterpret_cast( pProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getSparseImageFormatProperties( Format format, ImageType type, SampleCountFlagBits samples, ImageUsageFlags usage, ImageTiling tiling, Dispatch const &d ) const { std::vector properties; @@ -36452,7 +36375,7 @@ public: return static_cast( d.vkGetPhysicalDeviceDisplayPropertiesKHR( m_physicalDevice, pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getDisplayPropertiesKHR(Dispatch const &d ) const { std::vector properties; @@ -36479,7 +36402,7 @@ public: return static_cast( d.vkGetPhysicalDeviceDisplayPlanePropertiesKHR( m_physicalDevice, pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getDisplayPlanePropertiesKHR(Dispatch const &d ) const { std::vector properties; @@ -36506,7 +36429,7 @@ public: return static_cast( d.vkGetDisplayPlaneSupportedDisplaysKHR( m_physicalDevice, planeIndex, pDisplayCount, reinterpret_cast( pDisplays ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getDisplayPlaneSupportedDisplaysKHR( uint32_t planeIndex, Dispatch const &d ) const { std::vector displays; @@ -36533,7 +36456,7 @@ public: return static_cast( d.vkGetDisplayModePropertiesKHR( m_physicalDevice, static_cast( display ), pPropertyCount, reinterpret_cast( pProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getDisplayModePropertiesKHR( DisplayKHR display, Dispatch const &d ) const { std::vector properties; @@ -36635,7 +36558,7 @@ public: return static_cast( d.vkGetPhysicalDeviceSurfaceFormatsKHR( m_physicalDevice, static_cast( surface ), pSurfaceFormatCount, reinterpret_cast( pSurfaceFormats ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getSurfaceFormatsKHR( SurfaceKHR surface, Dispatch const &d ) const { std::vector surfaceFormats; @@ -36662,7 +36585,7 @@ public: return static_cast( d.vkGetPhysicalDeviceSurfacePresentModesKHR( m_physicalDevice, static_cast( surface ), pPresentModeCount, reinterpret_cast( pPresentModes ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getSurfacePresentModesKHR( SurfaceKHR surface, Dispatch const &d ) const { std::vector presentModes; @@ -36948,7 +36871,7 @@ public: d.vkGetPhysicalDeviceQueueFamilyProperties2( m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast( pQueueFamilyProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getQueueFamilyProperties2(Dispatch const &d ) const { std::vector queueFamilyProperties; @@ -36966,7 +36889,7 @@ public: d.vkGetPhysicalDeviceQueueFamilyProperties2KHR( m_physicalDevice, pQueueFamilyPropertyCount, reinterpret_cast( pQueueFamilyProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getQueueFamilyProperties2KHR(Dispatch const &d ) const { std::vector queueFamilyProperties; @@ -37014,7 +36937,7 @@ public: d.vkGetPhysicalDeviceSparseImageFormatProperties2( m_physicalDevice, reinterpret_cast( pFormatInfo ), pPropertyCount, reinterpret_cast( pProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getSparseImageFormatProperties2( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const &d ) const { std::vector properties; @@ -37032,7 +36955,7 @@ public: d.vkGetPhysicalDeviceSparseImageFormatProperties2KHR( m_physicalDevice, reinterpret_cast( pFormatInfo ), pPropertyCount, reinterpret_cast( pProperties ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE std::vector PhysicalDevice::getSparseImageFormatProperties2KHR( const PhysicalDeviceSparseImageFormatInfo2 & formatInfo, Dispatch const &d ) const { std::vector properties; @@ -37204,7 +37127,7 @@ public: return static_cast( d.vkGetPhysicalDevicePresentRectanglesKHR( m_physicalDevice, static_cast( surface ), pRectCount, reinterpret_cast( pRects ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getPresentRectanglesKHR( SurfaceKHR surface, Dispatch const &d ) const { std::vector rects; @@ -37269,7 +37192,7 @@ public: return static_cast( d.vkGetPhysicalDeviceSurfaceFormats2KHR( m_physicalDevice, reinterpret_cast( pSurfaceInfo ), pSurfaceFormatCount, reinterpret_cast( pSurfaceFormats ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type PhysicalDevice::getSurfaceFormats2KHR( const PhysicalDeviceSurfaceInfo2KHR & surfaceInfo, Dispatch const &d ) const { std::vector surfaceFormats; @@ -37490,7 +37413,7 @@ public: Instance & operator=(VkInstance instance) { m_instance = instance; - return *this; + return *this; } #endif @@ -37525,7 +37448,7 @@ public: template Result enumeratePhysicalDevices( uint32_t* pPhysicalDeviceCount, PhysicalDevice* pPhysicalDevices, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumeratePhysicalDevices(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -37687,14 +37610,14 @@ public: template Result enumeratePhysicalDeviceGroups( uint32_t* pPhysicalDeviceGroupCount, PhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumeratePhysicalDeviceGroups(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ template Result enumeratePhysicalDeviceGroupsKHR( uint32_t* pPhysicalDeviceGroupCount, PhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties, Dispatch const &d = Dispatch() ) const; #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template , typename Dispatch = DispatchLoaderStatic> + template , typename Dispatch = DispatchLoaderStatic> typename ResultValueType>::type enumeratePhysicalDeviceGroupsKHR(Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ @@ -37756,8 +37679,6 @@ public: void submitDebugUtilsMessageEXT( DebugUtilsMessageSeverityFlagBitsEXT messageSeverity, DebugUtilsMessageTypeFlagsEXT messageTypes, const DebugUtilsMessengerCallbackDataEXT & callbackData, Dispatch const &d = Dispatch() ) const; #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - - VULKAN_HPP_TYPESAFE_EXPLICIT operator VkInstance() const { return m_instance; @@ -37798,7 +37719,7 @@ public: return static_cast( d.vkEnumeratePhysicalDevices( m_instance, pPhysicalDeviceCount, reinterpret_cast( pPhysicalDevices ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Instance::enumeratePhysicalDevices(Dispatch const &d ) const { std::vector physicalDevices; @@ -38159,7 +38080,7 @@ public: return static_cast( d.vkEnumeratePhysicalDeviceGroups( m_instance, pPhysicalDeviceGroupCount, reinterpret_cast( pPhysicalDeviceGroupProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Instance::enumeratePhysicalDeviceGroups(Dispatch const &d ) const { std::vector physicalDeviceGroupProperties; @@ -38186,7 +38107,7 @@ public: return static_cast( d.vkEnumeratePhysicalDeviceGroupsKHR( m_instance, pPhysicalDeviceGroupCount, reinterpret_cast( pPhysicalDeviceGroupProperties ) ) ); } #ifndef VULKAN_HPP_DISABLE_ENHANCED_MODE - template + template VULKAN_HPP_INLINE typename ResultValueType>::type Instance::enumeratePhysicalDeviceGroupsKHR(Dispatch const &d ) const { std::vector physicalDeviceGroupProperties; @@ -38437,7 +38358,6 @@ public: #endif /*VULKAN_HPP_NO_SMART_HANDLE*/ #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/ - template <> struct isStructureChainValid{ enum { value = true }; }; template <> struct isStructureChainValid{ enum { value = true }; }; template <> struct isStructureChainValid{ enum { value = true }; }; diff --git a/gfx/include/vulkan/vulkan_core.h b/gfx/include/vulkan/vulkan_core.h index 1b65ab4310..95cad8f256 100644 --- a/gfx/include/vulkan/vulkan_core.h +++ b/gfx/include/vulkan/vulkan_core.h @@ -47,7 +47,6 @@ extern "C" { #define VK_HEADER_VERSION 73 #define VK_NULL_HANDLE 0 - #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -58,7 +57,6 @@ extern "C" { #define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object; #endif #endif - typedef uint32_t VkFlags; typedef uint32_t VkBool32; diff --git a/gfx/video_crt_switch.c b/gfx/video_crt_switch.c index cfe73b8e58..c4135a6df1 100644 --- a/gfx/video_crt_switch.c +++ b/gfx/video_crt_switch.c @@ -1,364 +1,361 @@ -/* CRT SwitchRes Core - * Copyright (C) 2018 Alphanu / Ben Templeman. - * - * RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ -#include -#include -#include - -#include "video_driver.h" -#include "video_crt_switch.h" -#include "video_display_server.h" - -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif - -#if defined(HAVE_VIDEOCORE) -#include "include/userland/interface/vmcs_host/vc_vchi_gencmd.h" -static void crt_rpi_switch(int width, int height, float hz); -#endif - -static unsigned ra_core_width = 0; -static unsigned ra_core_height = 0; -static unsigned ra_tmp_width = 0; -static unsigned ra_tmp_height = 0; -static unsigned ra_set_core_hz = 0; -static unsigned orig_width = 0; -static unsigned orig_height = 0; -static int crt_center_adjust = 0; - -static bool first_run = true; - -static float ra_tmp_core_hz = 0.0f; -static float fly_aspect = 0.0f; -static float ra_core_hz = 0.0f; -static unsigned crt_index = 0; - -static void crt_check_first_run(void) -{ - if (!first_run) - return; - - first_run = false; -} - -static void switch_crt_hz(void) -{ - if (ra_core_hz == ra_tmp_core_hz) - return; - /* set hz float to an int for windows switching */ - if (ra_core_hz < 100) - { - if (ra_core_hz < 53) - ra_set_core_hz = 50; - if (ra_core_hz >= 53 && ra_core_hz < 57) - ra_set_core_hz = 55; - if (ra_core_hz >= 57) - ra_set_core_hz = 60; - } - - if (ra_core_hz > 100) - { - if (ra_core_hz < 106) - ra_set_core_hz = 120; - if (ra_core_hz >= 106 && ra_core_hz < 114) - ra_set_core_hz = 110; - if (ra_core_hz >= 114) - ra_set_core_hz = 120; - } - - video_monitor_set_refresh_rate(ra_set_core_hz); - - ra_tmp_core_hz = ra_core_hz; -} - -void crt_aspect_ratio_switch(unsigned width, unsigned height) -{ - /* send aspect float to videeo_driver */ - fly_aspect = (float)width / height; - video_driver_set_aspect_ratio_value((float)fly_aspect); -} - -static void switch_res_crt(unsigned width, unsigned height) -{ - video_display_server_set_resolution(width, height, - ra_set_core_hz, ra_core_hz, crt_center_adjust, crt_index); -#if defined(HAVE_VIDEOCORE) - crt_rpi_switch(width, height, ra_core_hz); - video_monitor_set_refresh_rate(ra_core_hz); - crt_switch_driver_reinit(); -#endif - video_driver_apply_state_changes(); -} - -/* Create correct aspect to fit video if resolution does not exist */ -static void crt_screen_setup_aspect(unsigned width, unsigned height) -{ -#if defined(HAVE_VIDEOCORE) - if (height > 300) - height = height/2; -#endif - - switch_crt_hz(); - /* get original resolution of core */ - if (height == 4) - { - /* detect menu only */ - if (width < 1920) - width = 320; - - height = 240; - - crt_aspect_ratio_switch(width, height); - } - - if (height < 200 && height != 144) - { - crt_aspect_ratio_switch(width, height); - height = 200; - } - - if (height > 200) - crt_aspect_ratio_switch(width, height); - - if (height == 144 && ra_set_core_hz == 50) - { - height = 288; - crt_aspect_ratio_switch(width, height); - } - - if (height > 200 && height < 224) - { - crt_aspect_ratio_switch(width, height); - height = 224; - } - - if (height > 224 && height < 240) - { - crt_aspect_ratio_switch(width, height); - height = 240; - } - - if (height > 240 && height < 255) - { - crt_aspect_ratio_switch(width, height); - height = 254; - } - - if (height == 528 && ra_set_core_hz == 60) - { - crt_aspect_ratio_switch(width, height); - height = 480; - } - - if (height >= 240 && height < 255 && ra_set_core_hz == 55) - { - crt_aspect_ratio_switch(width, height); - height = 254; - } - - switch_res_crt(width, height); -} - -void crt_switch_res_core(unsigned width, unsigned height, - float hz, unsigned crt_mode, - int crt_switch_center_adjust, int monitor_index) -{ - /* ra_core_hz float passed from within - * void video_driver_monitor_adjust_system_rates(void) */ - - ra_core_width = width; - ra_core_height = height; - ra_core_hz = hz; - crt_center_adjust = crt_switch_center_adjust; - crt_index = monitor_index; - - if (crt_mode == 2) - { - if (hz > 53) - ra_core_hz = hz * 2; - - if (hz <= 53) - ra_core_hz = 120.0f; - } - - crt_check_first_run(); - - /* Detect resolution change and switch */ - if ( - (ra_tmp_height != ra_core_height) || - (ra_core_width != ra_tmp_width) - ) - crt_screen_setup_aspect(width, height); - - ra_tmp_height = ra_core_height; - ra_tmp_width = ra_core_width; - - /* Check if aspect is correct, if notchange */ - if (video_driver_get_aspect_ratio() != fly_aspect) - { - video_driver_set_aspect_ratio_value((float)fly_aspect); - video_driver_apply_state_changes(); - } -} - -void crt_video_restore(void) -{ - if (first_run) - return; - - first_run = true; -} - -#if defined(HAVE_VIDEOCORE) -static void crt_rpi_switch(int width, int height, float hz) -{ - char buffer[1024]; - VCHI_INSTANCE_T vchi_instance; - VCHI_CONNECTION_T *vchi_connection = NULL; - static char output[250] = {0}; - static char output1[250] = {0}; - static char output2[250] = {0}; - static char set_hdmi[250] = {0}; - static char set_hdmi_timing[250] = {0}; - int i = 0; - int hfp = 0; - int hsp = 0; - int hbp = 0; - int vfp = 0; - int vsp = 0; - int vbp = 0; - int hmax = 0; - int vmax = 0; - int pdefault = 8; - int pwidth = 0; - float roundw = 0.0f; - float roundh = 0.0f; - float pixel_clock = 0; - int ip_flag = 0; - - /* set core refresh from hz */ - video_monitor_set_refresh_rate(hz); - - /* following code is the mode line generator */ - - pwidth = width; - - if (height < 400 && width > 400) - pwidth = width / 2; - - roundw = roundf((float)pwidth / (float)height * 100) / 100; - - if (height > width) - roundw = roundf((float)height / (float)width * 100) / 100; - - if (roundw > 1.35) - roundw = 1.25; - - if (roundw < 1.20) - roundw = 1.34; - hfp = width * 0.065; - - hsp = width * 0.1433-hfp; - - hbp = width * 0.3-hsp-hfp; - - - if (height < 241) - vmax = 261; - if (height < 241 && hz > 56 && hz < 58) - vmax = 280; - if (height < 241 && hz < 55) - vmax = 313; - if (height > 250 && height < 260 && hz > 54) - vmax = 296; - if (height > 250 && height < 260 && hz > 52 && hz < 54) - vmax = 285; - if (height > 250 && height < 260 && hz < 52) - vmax = 313; - if (height > 260 && height < 300) - vmax = 318; - - if (height > 400 && hz > 56) - vmax = 533; - if (height > 520 && hz < 57) - vmax = 580; - - if (height > 300 && hz < 56) - vmax = 615; - if (height > 500 && hz < 56) - vmax = 624; - if (height > 300) - pdefault = pdefault * 2; - - vfp = (height + ((vmax - height) / 2) - pdefault) - height; - - if (height < 300) - vsp = vfp + 3; /* needs to be 3 for progressive */ - if (height > 300) - vsp = vfp + 6; /* needs to be 6 for interlaced */ - - vsp = 3; - - vbp = (vmax-height)-vsp-vfp; - - hmax = width+hfp+hsp+hbp; - - if (height < 300) - { - pixel_clock = (hmax * vmax * hz) ; - ip_flag = 0; - } - - if (height > 300) - { - pixel_clock = (hmax * vmax * (hz/2)) /2 ; - ip_flag = 1; - } - /* above code is the modeline generator */ - - snprintf(set_hdmi_timing, sizeof(set_hdmi_timing), - "hdmi_timings %d 1 %d %d %d %d 1 %d %d %d 0 0 0 %f %d %f 1 ", - width, hfp, hsp, hbp, height, vfp,vsp, vbp, - hz, ip_flag, pixel_clock); - - vcos_init (); - - vchi_initialise (&vchi_instance); - - vchi_connect (NULL, 0, vchi_instance); - - vc_vchi_gencmd_init (vchi_instance, &vchi_connection, 1); - - - vc_gencmd (buffer, sizeof (buffer), set_hdmi_timing); - - vc_gencmd_stop (); - - vchi_disconnect (vchi_instance); - - snprintf(output1, sizeof(output1), - "tvservice -e \"DMT 87\" > /dev/null"); - system(output1); - snprintf(output2, sizeof(output1), - "fbset -g %d %d %d %d 24 > /dev/null", - width, height, width, height); - system(output2); -} -#endif - +/* CRT SwitchRes Core + * Copyright (C) 2018 Alphanu / Ben Templeman. + * + * RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ +#include +#include +#include + +#include "video_driver.h" +#include "video_crt_switch.h" +#include "video_display_server.h" + +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + +#if defined(HAVE_VIDEOCORE) +#include "include/userland/interface/vmcs_host/vc_vchi_gencmd.h" +static void crt_rpi_switch(int width, int height, float hz); +#endif + +static unsigned ra_core_width = 0; +static unsigned ra_core_height = 0; +static unsigned ra_tmp_width = 0; +static unsigned ra_tmp_height = 0; +static unsigned ra_set_core_hz = 0; +static unsigned orig_width = 0; +static unsigned orig_height = 0; +static int crt_center_adjust = 0; + +static bool first_run = true; + +static float ra_tmp_core_hz = 0.0f; +static float fly_aspect = 0.0f; +static float ra_core_hz = 0.0f; +static unsigned crt_index = 0; + +static void crt_check_first_run(void) +{ + if (!first_run) + return; + + first_run = false; +} + +static void switch_crt_hz(void) +{ + if (ra_core_hz == ra_tmp_core_hz) + return; + /* set hz float to an int for windows switching */ + if (ra_core_hz < 100) + { + if (ra_core_hz < 53) + ra_set_core_hz = 50; + if (ra_core_hz >= 53 && ra_core_hz < 57) + ra_set_core_hz = 55; + if (ra_core_hz >= 57) + ra_set_core_hz = 60; + } + + if (ra_core_hz > 100) + { + if (ra_core_hz < 106) + ra_set_core_hz = 120; + if (ra_core_hz >= 106 && ra_core_hz < 114) + ra_set_core_hz = 110; + if (ra_core_hz >= 114) + ra_set_core_hz = 120; + } + + video_monitor_set_refresh_rate(ra_set_core_hz); + + ra_tmp_core_hz = ra_core_hz; +} + +void crt_aspect_ratio_switch(unsigned width, unsigned height) +{ + /* send aspect float to videeo_driver */ + fly_aspect = (float)width / height; + video_driver_set_aspect_ratio_value((float)fly_aspect); +} + +static void switch_res_crt(unsigned width, unsigned height) +{ + video_display_server_set_resolution(width, height, + ra_set_core_hz, ra_core_hz, crt_center_adjust, crt_index); +#if defined(HAVE_VIDEOCORE) + crt_rpi_switch(width, height, ra_core_hz); + video_monitor_set_refresh_rate(ra_core_hz); + crt_switch_driver_reinit(); +#endif + video_driver_apply_state_changes(); +} + +/* Create correct aspect to fit video if resolution does not exist */ +static void crt_screen_setup_aspect(unsigned width, unsigned height) +{ +#if defined(HAVE_VIDEOCORE) + if (height > 300) + height = height/2; +#endif + + switch_crt_hz(); + /* get original resolution of core */ + if (height == 4) + { + /* detect menu only */ + if (width < 1920) + width = 320; + + height = 240; + + crt_aspect_ratio_switch(width, height); + } + + if (height < 200 && height != 144) + { + crt_aspect_ratio_switch(width, height); + height = 200; + } + + if (height > 200) + crt_aspect_ratio_switch(width, height); + + if (height == 144 && ra_set_core_hz == 50) + { + height = 288; + crt_aspect_ratio_switch(width, height); + } + + if (height > 200 && height < 224) + { + crt_aspect_ratio_switch(width, height); + height = 224; + } + + if (height > 224 && height < 240) + { + crt_aspect_ratio_switch(width, height); + height = 240; + } + + if (height > 240 && height < 255) + { + crt_aspect_ratio_switch(width, height); + height = 254; + } + + if (height == 528 && ra_set_core_hz == 60) + { + crt_aspect_ratio_switch(width, height); + height = 480; + } + + if (height >= 240 && height < 255 && ra_set_core_hz == 55) + { + crt_aspect_ratio_switch(width, height); + height = 254; + } + + switch_res_crt(width, height); +} + +void crt_switch_res_core(unsigned width, unsigned height, + float hz, unsigned crt_mode, + int crt_switch_center_adjust, int monitor_index) +{ + /* ra_core_hz float passed from within + * void video_driver_monitor_adjust_system_rates(void) */ + + ra_core_width = width; + ra_core_height = height; + ra_core_hz = hz; + crt_center_adjust = crt_switch_center_adjust; + crt_index = monitor_index; + + if (crt_mode == 2) + { + if (hz > 53) + ra_core_hz = hz * 2; + + if (hz <= 53) + ra_core_hz = 120.0f; + } + + crt_check_first_run(); + + /* Detect resolution change and switch */ + if ( + (ra_tmp_height != ra_core_height) || + (ra_core_width != ra_tmp_width) + ) + crt_screen_setup_aspect(width, height); + + ra_tmp_height = ra_core_height; + ra_tmp_width = ra_core_width; + + /* Check if aspect is correct, if notchange */ + if (video_driver_get_aspect_ratio() != fly_aspect) + { + video_driver_set_aspect_ratio_value((float)fly_aspect); + video_driver_apply_state_changes(); + } +} + +void crt_video_restore(void) +{ + if (first_run) + return; + + first_run = true; +} + +#if defined(HAVE_VIDEOCORE) +static void crt_rpi_switch(int width, int height, float hz) +{ + char buffer[1024]; + VCHI_INSTANCE_T vchi_instance; + VCHI_CONNECTION_T *vchi_connection = NULL; + static char output[250] = {0}; + static char output1[250] = {0}; + static char output2[250] = {0}; + static char set_hdmi[250] = {0}; + static char set_hdmi_timing[250] = {0}; + int i = 0; + int hfp = 0; + int hsp = 0; + int hbp = 0; + int vfp = 0; + int vsp = 0; + int vbp = 0; + int hmax = 0; + int vmax = 0; + int pdefault = 8; + int pwidth = 0; + float roundw = 0.0f; + float roundh = 0.0f; + float pixel_clock = 0; + int ip_flag = 0; + + /* set core refresh from hz */ + video_monitor_set_refresh_rate(hz); + + /* following code is the mode line generator */ + + pwidth = width; + + if (height < 400 && width > 400) + pwidth = width / 2; + + roundw = roundf((float)pwidth / (float)height * 100) / 100; + + if (height > width) + roundw = roundf((float)height / (float)width * 100) / 100; + + if (roundw > 1.35) + roundw = 1.25; + + if (roundw < 1.20) + roundw = 1.34; + hfp = width * 0.065; + + hsp = width * 0.1433-hfp; + + hbp = width * 0.3-hsp-hfp; + + if (height < 241) + vmax = 261; + if (height < 241 && hz > 56 && hz < 58) + vmax = 280; + if (height < 241 && hz < 55) + vmax = 313; + if (height > 250 && height < 260 && hz > 54) + vmax = 296; + if (height > 250 && height < 260 && hz > 52 && hz < 54) + vmax = 285; + if (height > 250 && height < 260 && hz < 52) + vmax = 313; + if (height > 260 && height < 300) + vmax = 318; + + if (height > 400 && hz > 56) + vmax = 533; + if (height > 520 && hz < 57) + vmax = 580; + + if (height > 300 && hz < 56) + vmax = 615; + if (height > 500 && hz < 56) + vmax = 624; + if (height > 300) + pdefault = pdefault * 2; + + vfp = (height + ((vmax - height) / 2) - pdefault) - height; + + if (height < 300) + vsp = vfp + 3; /* needs to be 3 for progressive */ + if (height > 300) + vsp = vfp + 6; /* needs to be 6 for interlaced */ + + vsp = 3; + + vbp = (vmax-height)-vsp-vfp; + + hmax = width+hfp+hsp+hbp; + + if (height < 300) + { + pixel_clock = (hmax * vmax * hz) ; + ip_flag = 0; + } + + if (height > 300) + { + pixel_clock = (hmax * vmax * (hz/2)) /2 ; + ip_flag = 1; + } + /* above code is the modeline generator */ + + snprintf(set_hdmi_timing, sizeof(set_hdmi_timing), + "hdmi_timings %d 1 %d %d %d %d 1 %d %d %d 0 0 0 %f %d %f 1 ", + width, hfp, hsp, hbp, height, vfp,vsp, vbp, + hz, ip_flag, pixel_clock); + + vcos_init (); + + vchi_initialise (&vchi_instance); + + vchi_connect (NULL, 0, vchi_instance); + + vc_vchi_gencmd_init (vchi_instance, &vchi_connection, 1); + + vc_gencmd (buffer, sizeof (buffer), set_hdmi_timing); + + vc_gencmd_stop (); + + vchi_disconnect (vchi_instance); + + snprintf(output1, sizeof(output1), + "tvservice -e \"DMT 87\" > /dev/null"); + system(output1); + snprintf(output2, sizeof(output1), + "fbset -g %d %d %d %d 24 > /dev/null", + width, height, width, height); + system(output2); +} +#endif diff --git a/gfx/video_crt_switch.h b/gfx/video_crt_switch.h index df388ec2ce..8bf588bae7 100644 --- a/gfx/video_crt_switch.h +++ b/gfx/video_crt_switch.h @@ -1,38 +1,38 @@ -/* CRT SwitchRes Core - * Copyright (C) 2018 Alphanu / Ben Templeman. - * - * RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __VIDEO_CRT_SWITCH_H__ -#define __VIDEO_CRT_SWITCH_H__ - -#include - -#include -#include - -RETRO_BEGIN_DECLS - -void crt_switch_res_core(unsigned width, unsigned height, float hz, unsigned crt_mode, int crt_switch_center_adjust, int monitor_index); - -void crt_aspect_ratio_switch(unsigned width, unsigned height); - -void crt_video_restore(void); - -RETRO_END_DECLS - -#endif +/* CRT SwitchRes Core + * Copyright (C) 2018 Alphanu / Ben Templeman. + * + * RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __VIDEO_CRT_SWITCH_H__ +#define __VIDEO_CRT_SWITCH_H__ + +#include + +#include +#include + +RETRO_BEGIN_DECLS + +void crt_switch_res_core(unsigned width, unsigned height, float hz, unsigned crt_mode, int crt_switch_center_adjust, int monitor_index); + +void crt_aspect_ratio_switch(unsigned width, unsigned height); + +void crt_video_restore(void); + +RETRO_END_DECLS + +#endif diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c index 9917de9ddd..31d1b3a5b0 100644 --- a/gfx/video_display_server.c +++ b/gfx/video_display_server.c @@ -1,112 +1,112 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2016-2017 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include -#include "video_display_server.h" -#include "video_driver.h" -#include "../verbosity.h" - -static const video_display_server_t *current_display_server = &dispserv_null; -static void *current_display_server_data = NULL; - -const char *video_display_server_get_ident(void) -{ - if (!current_display_server) - return "null"; - return current_display_server->ident; -} - -void* video_display_server_init(void) -{ - enum rarch_display_type type = video_driver_display_type_get(); - - video_display_server_destroy(); - - switch (type) - { - case RARCH_DISPLAY_WIN32: -#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) - current_display_server = &dispserv_win32; -#endif - break; - case RARCH_DISPLAY_X11: -#if defined(HAVE_X11) - current_display_server = &dispserv_x11; -#endif - break; - default: - current_display_server = &dispserv_null; - break; - } - - current_display_server_data = current_display_server->init(); - - RARCH_LOG("[Video]: Found display server: %s\n", - current_display_server->ident); - - return current_display_server_data; -} - -void video_display_server_destroy(void) -{ - if (current_display_server && current_display_server->destroy) - if (current_display_server_data) - current_display_server->destroy(current_display_server_data); -} - -bool video_display_server_set_window_opacity(unsigned opacity) -{ - if (current_display_server && current_display_server->set_window_opacity) - return current_display_server->set_window_opacity(current_display_server_data, opacity); - return false; -} - -bool video_display_server_set_window_progress(int progress, bool finished) -{ - if (current_display_server && current_display_server->set_window_progress) - return current_display_server->set_window_progress(current_display_server_data, progress, finished); - return false; -} - -bool video_display_server_set_window_decorations(bool on) -{ - if (current_display_server && current_display_server->set_window_decorations) - return current_display_server->set_window_decorations(current_display_server_data, on); - return false; -} - -bool video_display_server_set_resolution(unsigned width, unsigned height, - int int_hz, float hz, int center, int monitor_index) -{ - if (current_display_server && current_display_server->set_resolution) - return current_display_server->set_resolution(current_display_server_data, width, height, int_hz, hz, center, monitor_index); - return false; -} - -void *video_display_server_get_resolution_list(unsigned *size) -{ - if (current_display_server && current_display_server->get_resolution_list) - return current_display_server->get_resolution_list(current_display_server_data, size); - return NULL; -} - -const char *video_display_server_get_output_options(void) -{ - if (current_display_server && current_display_server->get_output_options) - return current_display_server->get_output_options(current_display_server_data); - return NULL; -} +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * Copyright (C) 2016-2017 - Brad Parker + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include "video_display_server.h" +#include "video_driver.h" +#include "../verbosity.h" + +static const video_display_server_t *current_display_server = &dispserv_null; +static void *current_display_server_data = NULL; + +const char *video_display_server_get_ident(void) +{ + if (!current_display_server) + return "null"; + return current_display_server->ident; +} + +void* video_display_server_init(void) +{ + enum rarch_display_type type = video_driver_display_type_get(); + + video_display_server_destroy(); + + switch (type) + { + case RARCH_DISPLAY_WIN32: +#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) + current_display_server = &dispserv_win32; +#endif + break; + case RARCH_DISPLAY_X11: +#if defined(HAVE_X11) + current_display_server = &dispserv_x11; +#endif + break; + default: + current_display_server = &dispserv_null; + break; + } + + current_display_server_data = current_display_server->init(); + + RARCH_LOG("[Video]: Found display server: %s\n", + current_display_server->ident); + + return current_display_server_data; +} + +void video_display_server_destroy(void) +{ + if (current_display_server && current_display_server->destroy) + if (current_display_server_data) + current_display_server->destroy(current_display_server_data); +} + +bool video_display_server_set_window_opacity(unsigned opacity) +{ + if (current_display_server && current_display_server->set_window_opacity) + return current_display_server->set_window_opacity(current_display_server_data, opacity); + return false; +} + +bool video_display_server_set_window_progress(int progress, bool finished) +{ + if (current_display_server && current_display_server->set_window_progress) + return current_display_server->set_window_progress(current_display_server_data, progress, finished); + return false; +} + +bool video_display_server_set_window_decorations(bool on) +{ + if (current_display_server && current_display_server->set_window_decorations) + return current_display_server->set_window_decorations(current_display_server_data, on); + return false; +} + +bool video_display_server_set_resolution(unsigned width, unsigned height, + int int_hz, float hz, int center, int monitor_index) +{ + if (current_display_server && current_display_server->set_resolution) + return current_display_server->set_resolution(current_display_server_data, width, height, int_hz, hz, center, monitor_index); + return false; +} + +void *video_display_server_get_resolution_list(unsigned *size) +{ + if (current_display_server && current_display_server->get_resolution_list) + return current_display_server->get_resolution_list(current_display_server_data, size); + return NULL; +} + +const char *video_display_server_get_output_options(void) +{ + if (current_display_server && current_display_server->get_output_options) + return current_display_server->get_output_options(current_display_server_data); + return NULL; +} diff --git a/gfx/video_display_server.h b/gfx/video_display_server.h index d3c990ca85..8cb3be269f 100644 --- a/gfx/video_display_server.h +++ b/gfx/video_display_server.h @@ -1,77 +1,77 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2016-2017 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __VIDEO_DISPLAY_SERVER__H -#define __VIDEO_DISPLAY_SERVER__H - -#include -#include - -RETRO_BEGIN_DECLS - -typedef struct video_display_config -{ - unsigned width; - unsigned height; - unsigned bpp; - unsigned refreshrate; - unsigned idx; - bool current; -} video_display_config_t; - -typedef struct video_display_server -{ - void *(*init)(void); - void (*destroy)(void *data); - bool (*set_window_opacity)(void *data, unsigned opacity); - bool (*set_window_progress)(void *data, int progress, bool finished); - bool (*set_window_decorations)(void *data, bool on); - bool (*set_resolution)(void *data, unsigned width, - unsigned height, int int_hz, float hz, int center, int monitor_index); - void *(*get_resolution_list)(void *data, - unsigned *size); - const char *(*get_output_options)(void *data); - const char *ident; -} video_display_server_t; - -void* video_display_server_init(void); - -void video_display_server_destroy(void); - -bool video_display_server_set_window_opacity(unsigned opacity); - -bool video_display_server_set_window_progress(int progress, bool finished); - -bool video_display_server_set_window_decorations(bool on); - -bool video_display_server_set_resolution( - unsigned width, unsigned height, - int int_hz, float hz, int center, int monitor_index); - -void *video_display_server_get_resolution_list(unsigned *size); - -const char *video_display_server_get_output_options(void); - -const char *video_display_server_get_ident(void); - -extern const video_display_server_t dispserv_win32; -extern const video_display_server_t dispserv_x11; -extern const video_display_server_t dispserv_null; - -RETRO_END_DECLS - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * Copyright (C) 2016-2017 - Brad Parker + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __VIDEO_DISPLAY_SERVER__H +#define __VIDEO_DISPLAY_SERVER__H + +#include +#include + +RETRO_BEGIN_DECLS + +typedef struct video_display_config +{ + unsigned width; + unsigned height; + unsigned bpp; + unsigned refreshrate; + unsigned idx; + bool current; +} video_display_config_t; + +typedef struct video_display_server +{ + void *(*init)(void); + void (*destroy)(void *data); + bool (*set_window_opacity)(void *data, unsigned opacity); + bool (*set_window_progress)(void *data, int progress, bool finished); + bool (*set_window_decorations)(void *data, bool on); + bool (*set_resolution)(void *data, unsigned width, + unsigned height, int int_hz, float hz, int center, int monitor_index); + void *(*get_resolution_list)(void *data, + unsigned *size); + const char *(*get_output_options)(void *data); + const char *ident; +} video_display_server_t; + +void* video_display_server_init(void); + +void video_display_server_destroy(void); + +bool video_display_server_set_window_opacity(unsigned opacity); + +bool video_display_server_set_window_progress(int progress, bool finished); + +bool video_display_server_set_window_decorations(bool on); + +bool video_display_server_set_resolution( + unsigned width, unsigned height, + int int_hz, float hz, int center, int monitor_index); + +void *video_display_server_get_resolution_list(unsigned *size); + +const char *video_display_server_get_output_options(void); + +const char *video_display_server_get_ident(void); + +extern const video_display_server_t dispserv_win32; +extern const video_display_server_t dispserv_x11; +extern const video_display_server_t dispserv_null; + +RETRO_END_DECLS + +#endif diff --git a/gfx/video_driver.c b/gfx/video_driver.c index 4ef0611f4a..c38d4ec55e 100644 --- a/gfx/video_driver.c +++ b/gfx/video_driver.c @@ -1,3634 +1,3634 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "../audio/audio_driver.h" -#include "../menu/menu_shader.h" - -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif - -#include "../dynamic.h" - -#ifdef HAVE_THREADS -#include -#endif - -#ifdef HAVE_MENU -#include "../menu/menu_driver.h" -#include "../menu/menu_setting.h" -#endif - -#include "video_thread_wrapper.h" -#include "video_driver.h" -#include "video_display_server.h" -#include "video_crt_switch.h" - -#include "../frontend/frontend_driver.h" -#include "../record/record_driver.h" -#include "../config.def.h" -#include "../configuration.h" -#include "../driver.h" -#include "../retroarch.h" -#include "../input/input_driver.h" -#include "../list_special.h" -#include "../core.h" -#include "../command.h" -#include "../msg_hash.h" -#include "../verbosity.h" - -#define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024) - -#define TIME_TO_FPS(last_time, new_time, frames) ((1000000.0f * (frames)) / ((new_time) - (last_time))) - -#define FPS_UPDATE_INTERVAL 256 - -#ifdef HAVE_THREADS -#define video_driver_is_threaded_internal() ((!video_driver_is_hw_context() && video_driver_threaded) ? true : false) -#else -#define video_driver_is_threaded_internal() (false) -#endif - -#ifdef HAVE_THREADS -#define video_driver_lock() \ - if (display_lock) \ - slock_lock(display_lock) - -#define video_driver_unlock() \ - if (display_lock) \ - slock_unlock(display_lock) - -#define video_driver_context_lock() \ - if (context_lock) \ - slock_lock(context_lock) - -#define video_driver_context_unlock() \ - if (context_lock) \ - slock_unlock(context_lock) - -#define video_driver_lock_free() \ - slock_free(display_lock); \ - slock_free(context_lock); \ - display_lock = NULL; \ - context_lock = NULL - -#define video_driver_threaded_lock(is_threaded) \ - if (is_threaded) \ - video_driver_lock() - -#define video_driver_threaded_unlock(is_threaded) \ - if (is_threaded) \ - video_driver_unlock() -#else -#define video_driver_lock() ((void)0) -#define video_driver_unlock() ((void)0) -#define video_driver_lock_free() ((void)0) -#define video_driver_threaded_lock(is_threaded) ((void)0) -#define video_driver_threaded_unlock(is_threaded) ((void)0) -#define video_driver_context_lock() ((void)0) -#define video_driver_context_unlock() ((void)0) -#endif - -typedef struct video_pixel_scaler -{ - struct scaler_ctx *scaler; - void *scaler_out; -} video_pixel_scaler_t; - -static bool (*video_driver_cb_shader_set_mvp)(void *data, - void *shader_data, const void *mat_data); -bool (*video_driver_cb_has_focus)(void); - -/* Opaque handles to currently running window. - * Used by e.g. input drivers which bind to a window. - * Drivers are responsible for setting these if an input driver - * could potentially make use of this. */ -static uintptr_t video_driver_display = 0; -static uintptr_t video_driver_window = 0; - -static rarch_softfilter_t *video_driver_state_filter = NULL; -static void *video_driver_state_buffer = NULL; -static unsigned video_driver_state_scale = 0; -static unsigned video_driver_state_out_bpp = 0; -static bool video_driver_state_out_rgb32 = false; -static bool video_driver_crt_switching_active = false; - -static struct retro_system_av_info video_driver_av_info; - -static enum retro_pixel_format video_driver_pix_fmt = RETRO_PIXEL_FORMAT_0RGB1555; - -static const void *frame_cache_data = NULL; -static unsigned frame_cache_width = 0; -static unsigned frame_cache_height = 0; -static size_t frame_cache_pitch = 0; -static bool video_driver_threaded = false; - -static float video_driver_core_hz = 0.0f; -static float video_driver_aspect_ratio = 0.0f; -static unsigned video_driver_width = 0; -static unsigned video_driver_height = 0; - -static enum rarch_display_type video_driver_display_type = RARCH_DISPLAY_NONE; -static char video_driver_title_buf[64] = {0}; -static char video_driver_window_title[512] = {0}; -static bool video_driver_window_title_update = true; - -static retro_time_t video_driver_frame_time_samples[MEASURE_FRAME_TIME_SAMPLES_COUNT]; -static uint64_t video_driver_frame_time_count = 0; -static uint64_t video_driver_frame_count = 0; - -static void *video_driver_data = NULL; -static video_driver_t *current_video = NULL; - -/* Interface for "poking". */ -static const video_poke_interface_t *video_driver_poke = NULL; - -/* Used for 15-bit -> 16-bit conversions that take place before - * being passed to video driver. */ -static video_pixel_scaler_t *video_driver_scaler_ptr = NULL; - -static struct retro_hw_render_callback hw_render; - -static const struct -retro_hw_render_context_negotiation_interface * -hw_render_context_negotiation = NULL; - -/* Graphics driver requires RGBA byte order data (ABGR on little-endian) - * for 32-bit. - * This takes effect for overlay and shader cores that wants to load - * data into graphics driver. Kinda hackish to place it here, it is only - * used for GLES. - * TODO: Refactor this better. */ -static bool video_driver_use_rgba = false; -static bool video_driver_data_own = false; -static bool video_driver_active = false; - -static video_driver_frame_t frame_bak = NULL; - -/* If set during context deinit, the driver should keep - * graphics context alive to avoid having to reset all - * context state. */ -static bool video_driver_cache_context = false; - -/* Set to true by driver if context caching succeeded. */ -static bool video_driver_cache_context_ack = false; -static uint8_t *video_driver_record_gpu_buffer = NULL; - -#ifdef HAVE_THREADS -static slock_t *display_lock = NULL; -static slock_t *context_lock = NULL; -#endif - -static gfx_ctx_driver_t current_video_context; - -static void *video_context_data = NULL; - -/** - * dynamic.c:dynamic_request_hw_context will try to set flag data when the context - * is in the middle of being rebuilt; in these cases we will save flag - * data and set this to true. - * When the context is reinit, it checks this, reads from - * deferred_flag_data and cleans it. - * - * TODO - Dirty hack, fix it better - */ -static bool deferred_video_context_driver_set_flags = false; -static gfx_ctx_flags_t deferred_flag_data = {0}; - -static bool video_started_fullscreen = false; - -static shader_backend_t *current_shader = NULL; -static void *current_shader_data = NULL; - -struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = { - { "4:3", 1.3333f }, - { "16:9", 1.7778f }, - { "16:10", 1.6f }, - { "16:15", 16.0f / 15.0f }, - { "21:9", 21.0f / 9.0f }, - { "1:1", 1.0f }, - { "2:1", 2.0f }, - { "3:2", 1.5f }, - { "3:4", 0.75f }, - { "4:1", 4.0f }, - { "9:16", 0.5625f }, - { "5:4", 1.25f }, - { "6:5", 1.2f }, - { "7:9", 0.7777f }, - { "8:3", 2.6666f }, - { "8:7", 1.1428f }, - { "19:12", 1.5833f }, - { "19:14", 1.3571f }, - { "30:17", 1.7647f }, - { "32:9", 3.5555f }, - { "Config", 0.0f }, - { "Square pixel", 1.0f }, - { "Core provided", 1.0f }, - { "Custom", 0.0f } -}; - -static const video_driver_t *video_drivers[] = { -#ifdef HAVE_OPENGL - &video_gl, -#endif -#ifdef HAVE_VULKAN - &video_vulkan, -#endif -#ifdef HAVE_METAL - &video_metal, -#endif -#ifdef XENON - &video_xenon360, -#endif -#if defined(HAVE_D3D12) - &video_d3d12, -#endif -#if defined(HAVE_D3D11) - &video_d3d11, -#endif -#if defined(HAVE_D3D10) - &video_d3d10, -#endif -#if defined(HAVE_D3D9) - &video_d3d9, -#endif -#if defined(HAVE_D3D8) - &video_d3d8, -#endif -#ifdef HAVE_VITA2D - &video_vita2d, -#endif -#ifdef PSP - &video_psp1, -#endif -#ifdef PS2 - &video_ps2, -#endif -#ifdef _3DS - &video_ctr, -#endif -#ifdef SWITCH - &video_switch, -#endif -#ifdef HAVE_SDL - &video_sdl, -#endif -#ifdef HAVE_SDL2 - &video_sdl2, -#endif -#ifdef HAVE_XVIDEO - &video_xvideo, -#endif -#ifdef GEKKO - &video_gx, -#endif -#ifdef WIIU - &video_wiiu, -#endif -#ifdef HAVE_VG - &video_vg, -#endif -#ifdef HAVE_OMAP - &video_omap, -#endif -#ifdef HAVE_EXYNOS - &video_exynos, -#endif -#ifdef HAVE_DISPMANX - &video_dispmanx, -#endif -#ifdef HAVE_SUNXI - &video_sunxi, -#endif -#ifdef HAVE_PLAIN_DRM - &video_drm, -#endif -#ifdef HAVE_XSHM - &video_xshm, -#endif -#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) - &video_gdi, -#endif -#ifdef DJGPP - &video_vga, -#endif -#ifdef HAVE_SIXEL - &video_sixel, -#endif -#ifdef HAVE_CACA - &video_caca, -#endif - &video_null, - NULL, -}; - -static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { -#if defined(ORBIS) - &orbis_ctx, -#endif -#if defined(HAVE_LIBNX) && defined(HAVE_OPENGL) - &switch_ctx, -#endif -#if defined(__CELLOS_LV2__) - &gfx_ctx_ps3, -#endif -#if defined(HAVE_VIDEOCORE) - &gfx_ctx_videocore, -#endif -#if defined(HAVE_MALI_FBDEV) - &gfx_ctx_mali_fbdev, -#endif -#if defined(HAVE_VIVANTE_FBDEV) - &gfx_ctx_vivante_fbdev, -#endif -#if defined(HAVE_OPENDINGUX_FBDEV) - &gfx_ctx_opendingux_fbdev, -#endif -#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN)) - &gfx_ctx_wgl, -#endif -#if defined(HAVE_WAYLAND) - &gfx_ctx_wayland, -#endif -#if defined(HAVE_X11) && !defined(HAVE_OPENGLES) -#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) - &gfx_ctx_x, -#endif -#endif -#if defined(HAVE_X11) && defined(HAVE_OPENGL) && defined(HAVE_EGL) - &gfx_ctx_x_egl, -#endif -#if defined(HAVE_KMS) - &gfx_ctx_drm, -#endif -#if defined(ANDROID) - &gfx_ctx_android, -#endif -#if defined(__QNX__) - &gfx_ctx_qnx, -#endif -#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL) - &gfx_ctx_cocoagl, -#endif -#if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE) - &gfx_ctx_cgl, -#endif -#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL) - &gfx_ctx_sdl_gl, -#endif -#ifdef HAVE_OSMESA - &gfx_ctx_osmesa, -#endif -#ifdef EMSCRIPTEN - &gfx_ctx_emscripten, -#endif -#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY) - &gfx_ctx_khr_display, -#endif -#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) - &gfx_ctx_gdi, -#endif -#ifdef HAVE_SIXEL - &gfx_ctx_sixel, -#endif - &gfx_ctx_null, - NULL -}; - -static const shader_backend_t *shader_ctx_drivers[] = { -#ifdef HAVE_GLSL - &gl_glsl_backend, -#endif -#ifdef HAVE_CG - &gl_cg_backend, -#endif - &shader_null_backend, - NULL -}; - -bool video_driver_started_fullscreen(void) -{ - return video_started_fullscreen; -} - -/* Stub functions */ - -static void update_window_title_null(void *data, void *data2) -{ -} - -static void swap_buffers_null(void *data, void *data2) -{ -} - -static bool get_metrics_null(void *data, enum display_metric_types type, - float *value) -{ - return false; -} - -static bool set_resize_null(void *a, unsigned b, unsigned c) -{ - return false; -} - -/** - * video_driver_find_handle: - * @idx : index of driver to get handle to. - * - * Returns: handle to video driver at index. Can be NULL - * if nothing found. - **/ -const void *video_driver_find_handle(int idx) -{ - const void *drv = video_drivers[idx]; - if (!drv) - return NULL; - return drv; -} - -/** - * video_driver_find_ident: - * @idx : index of driver to get handle to. - * - * Returns: Human-readable identifier of video driver at index. Can be NULL - * if nothing found. - **/ -const char *video_driver_find_ident(int idx) -{ - const video_driver_t *drv = video_drivers[idx]; - if (!drv) - return NULL; - return drv->ident; -} - -/** - * config_get_video_driver_options: - * - * Get an enumerated list of all video driver names, separated by '|'. - * - * Returns: string listing of all video driver names, separated by '|'. - **/ -const char* config_get_video_driver_options(void) -{ - return char_list_new_special(STRING_LIST_VIDEO_DRIVERS, NULL); -} - -bool video_driver_is_threaded(void) -{ - return video_driver_is_threaded_internal(); -} - -#ifdef HAVE_VULKAN -static bool hw_render_context_is_vulkan(enum retro_hw_context_type type) -{ - return type == RETRO_HW_CONTEXT_VULKAN; -} -#endif - -#if defined(HAVE_OPENGL) -static bool hw_render_context_is_gl(enum retro_hw_context_type type) -{ - switch (type) - { - case RETRO_HW_CONTEXT_OPENGL: - case RETRO_HW_CONTEXT_OPENGLES2: - case RETRO_HW_CONTEXT_OPENGL_CORE: - case RETRO_HW_CONTEXT_OPENGLES3: - case RETRO_HW_CONTEXT_OPENGLES_VERSION: - return true; - default: - break; - } - - return false; -} -#endif - -bool *video_driver_get_threaded(void) -{ - return &video_driver_threaded; -} - -void video_driver_set_threaded(bool val) -{ - video_driver_threaded = val; -} - -/** - * video_driver_get_ptr: - * - * Use this if you need the real video driver - * and driver data pointers. - * - * Returns: video driver's userdata. - **/ -void *video_driver_get_ptr(bool force_nonthreaded_data) -{ -#ifdef HAVE_THREADS - if (video_driver_is_threaded_internal() && !force_nonthreaded_data) - return video_thread_get_ptr(NULL); -#endif - - return video_driver_data; -} - -const char *video_driver_get_ident(void) -{ - return (current_video) ? current_video->ident : NULL; -} - -const video_poke_interface_t *video_driver_get_poke(void) -{ - return video_driver_poke; -} - -static bool video_context_has_focus(void) -{ - return current_video_context.has_focus && current_video_context.has_focus(video_context_data); -} - -static bool video_driver_has_focus(void) -{ - return current_video && current_video->focus && current_video->focus(video_driver_data); -} - -static bool null_driver_has_focus(void) -{ - return true; -} - -static void video_context_driver_reset(void) -{ - if (!current_video_context.get_metrics) - current_video_context.get_metrics = get_metrics_null; - - if (!current_video_context.update_window_title) - current_video_context.update_window_title = update_window_title_null; - - if (!current_video_context.set_resize) - current_video_context.set_resize = set_resize_null; - - if (!current_video_context.swap_buffers) - current_video_context.swap_buffers = swap_buffers_null; - - if (current_video_context.has_focus) - video_driver_cb_has_focus = video_context_has_focus; - -} - -bool video_context_driver_set(const gfx_ctx_driver_t *data) -{ - if (!data) - return false; - current_video_context = *data; - video_context_driver_reset(); - return true; -} - -void video_context_driver_destroy(void) -{ - current_video_context.init = NULL; - current_video_context.bind_api = NULL; - current_video_context.swap_interval = NULL; - current_video_context.set_video_mode = NULL; - current_video_context.get_video_size = NULL; - current_video_context.get_video_output_size = NULL; - current_video_context.get_video_output_prev = NULL; - current_video_context.get_video_output_next = NULL; - current_video_context.get_metrics = get_metrics_null; - current_video_context.translate_aspect = NULL; - current_video_context.update_window_title = update_window_title_null; - current_video_context.check_window = NULL; - current_video_context.set_resize = set_resize_null; - current_video_context.has_focus = NULL; - current_video_context.suppress_screensaver = NULL; - current_video_context.has_windowed = NULL; - current_video_context.swap_buffers = swap_buffers_null; - current_video_context.input_driver = NULL; - current_video_context.get_proc_address = NULL; - current_video_context.image_buffer_init = NULL; - current_video_context.image_buffer_write = NULL; - current_video_context.show_mouse = NULL; - current_video_context.ident = NULL; - current_video_context.get_flags = NULL; - current_video_context.set_flags = NULL; - current_video_context.bind_hw_render = NULL; - current_video_context.get_context_data = NULL; - current_video_context.make_current = NULL; -} - -/** - * video_driver_get_current_framebuffer: - * - * Gets pointer to current hardware renderer framebuffer object. - * Used by RETRO_ENVIRONMENT_SET_HW_RENDER. - * - * Returns: pointer to hardware framebuffer object, otherwise 0. - **/ -uintptr_t video_driver_get_current_framebuffer(void) -{ - if (video_driver_poke && video_driver_poke->get_current_framebuffer) - return video_driver_poke->get_current_framebuffer(video_driver_data); - return 0; -} - -retro_proc_address_t video_driver_get_proc_address(const char *sym) -{ - if (video_driver_poke && video_driver_poke->get_proc_address) - return video_driver_poke->get_proc_address(video_driver_data, sym); - return NULL; -} - -bool video_driver_set_shader(enum rarch_shader_type type, - const char *path) -{ - if (current_video->set_shader) - return current_video->set_shader(video_driver_data, type, path); - return false; -} - -static void video_driver_filter_free(void) -{ - if (video_driver_state_filter) - rarch_softfilter_free(video_driver_state_filter); - video_driver_state_filter = NULL; - - if (video_driver_state_buffer) - { -#ifdef _3DS - linearFree(video_driver_state_buffer); -#else - free(video_driver_state_buffer); -#endif - } - video_driver_state_buffer = NULL; - - video_driver_state_scale = 0; - video_driver_state_out_bpp = 0; - video_driver_state_out_rgb32 = false; -} - -static void video_driver_init_filter(enum retro_pixel_format colfmt_int) -{ - unsigned pow2_x, pow2_y, maxsize; - void *buf = NULL; - settings_t *settings = config_get_ptr(); - struct retro_game_geometry *geom = &video_driver_av_info.geometry; - unsigned width = geom->max_width; - unsigned height = geom->max_height; - /* Deprecated format. Gets pre-converted. */ - enum retro_pixel_format colfmt = - (colfmt_int == RETRO_PIXEL_FORMAT_0RGB1555) ? - RETRO_PIXEL_FORMAT_RGB565 : colfmt_int; - - if (video_driver_is_hw_context()) - { - RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n"); - return; - } - - video_driver_state_filter = rarch_softfilter_new( - settings->paths.path_softfilter_plugin, - RARCH_SOFTFILTER_THREADS_AUTO, colfmt, width, height); - - if (!video_driver_state_filter) - { - RARCH_ERR("[Video]: Failed to load filter.\n"); - return; - } - - rarch_softfilter_get_max_output_size(video_driver_state_filter, - &width, &height); - - pow2_x = next_pow2(width); - pow2_y = next_pow2(height); - maxsize = MAX(pow2_x, pow2_y); - video_driver_state_scale = maxsize / RARCH_SCALE_BASE; - video_driver_state_out_rgb32 = rarch_softfilter_get_output_format( - video_driver_state_filter) == - RETRO_PIXEL_FORMAT_XRGB8888; - - video_driver_state_out_bpp = video_driver_state_out_rgb32 ? - sizeof(uint32_t) : - sizeof(uint16_t); - - /* TODO: Aligned output. */ -#ifdef _3DS - buf = linearMemAlign( - width * height * video_driver_state_out_bpp, 0x80); -#else - buf = malloc( - width * height * video_driver_state_out_bpp); -#endif - if (!buf) - { - RARCH_ERR("[Video]: Softfilter initialization failed.\n"); - video_driver_filter_free(); - return; - } - - video_driver_state_buffer = buf; -} - -static void video_driver_init_input(const input_driver_t *tmp) -{ - const input_driver_t **input = input_get_double_ptr(); - if (*input) - return; - - /* Video driver didn't provide an input driver, - * so we use configured one. */ - RARCH_LOG("[Video]: Graphics driver did not initialize an input driver." - " Attempting to pick a suitable driver.\n"); - - if (tmp) - *input = tmp; - else - input_driver_find_driver(); - - /* This should never really happen as tmp (driver.input) is always - * found before this in find_driver_input(), or we have aborted - * in a similar fashion anyways. */ - if (!input_get_ptr()) - goto error; - - if (input_driver_init()) - return; - -error: - RARCH_ERR("[Video]: Cannot initialize input driver. Exiting ...\n"); - retroarch_fail(1, "video_driver_init_input()"); -} - -/** - * video_driver_monitor_compute_fps_statistics: - * - * Computes monitor FPS statistics. - **/ -static void video_driver_monitor_compute_fps_statistics(void) -{ - double avg_fps = 0.0; - double stddev = 0.0; - unsigned samples = 0; - - if (video_driver_frame_time_count < - (2 * MEASURE_FRAME_TIME_SAMPLES_COUNT)) - { - RARCH_LOG( - "[Video]: Does not have enough samples for monitor refresh rate" - " estimation. Requires to run for at least %u frames.\n", - 2 * MEASURE_FRAME_TIME_SAMPLES_COUNT); - return; - } - - if (video_monitor_fps_statistics(&avg_fps, &stddev, &samples)) - { - RARCH_LOG("[Video]: Average monitor Hz: %.6f Hz. (%.3f %% frame time" - " deviation, based on %u last samples).\n", - avg_fps, 100.0 * stddev, samples); - } -} - -static void video_driver_pixel_converter_free(void) -{ - if (!video_driver_scaler_ptr) - return; - - scaler_ctx_gen_reset(video_driver_scaler_ptr->scaler); - - if (video_driver_scaler_ptr->scaler) - free(video_driver_scaler_ptr->scaler); - video_driver_scaler_ptr->scaler = NULL; - - if (video_driver_scaler_ptr->scaler_out) - free(video_driver_scaler_ptr->scaler_out); - video_driver_scaler_ptr->scaler_out = NULL; - - if (video_driver_scaler_ptr) - free(video_driver_scaler_ptr); - video_driver_scaler_ptr = NULL; -} - -static void video_driver_free_internal(void) -{ -#ifdef HAVE_THREADS - bool is_threaded = video_driver_is_threaded_internal(); -#endif - - command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); - - if (!video_driver_is_video_cache_context()) - video_driver_free_hw_context(); - - if ( - !input_driver_owns_driver() && - !input_driver_is_data_ptr_same(video_driver_data) - ) - input_driver_deinit(); - - if ( - !video_driver_data_own - && video_driver_data - && current_video && current_video->free - ) - current_video->free(video_driver_data); - - video_driver_pixel_converter_free(); - video_driver_filter_free(); - - command_event(CMD_EVENT_SHADER_DIR_DEINIT, NULL); - -#ifdef HAVE_THREADS - if (is_threaded) - return; -#endif - - video_driver_monitor_compute_fps_statistics(); -} - -static bool video_driver_pixel_converter_init(unsigned size) -{ - struct retro_hw_render_callback *hwr = - video_driver_get_hw_context(); - void *scalr_out = NULL; - video_pixel_scaler_t *scalr = NULL; - struct scaler_ctx *scalr_ctx = NULL; - - /* If pixel format is not 0RGB1555, we don't need to do - * any internal pixel conversion. */ - if (video_driver_pix_fmt != RETRO_PIXEL_FORMAT_0RGB1555) - return true; - - /* No need to perform pixel conversion for HW rendering contexts. */ - if (hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE) - return true; - - RARCH_WARN("0RGB1555 pixel format is deprecated," - " and will be slower. For 15/16-bit, RGB565" - " format is preferred.\n"); - - scalr = (video_pixel_scaler_t*)calloc(1, sizeof(*scalr)); - - if (!scalr) - goto error; - - video_driver_scaler_ptr = scalr; - - scalr_ctx = (struct scaler_ctx*)calloc(1, sizeof(*scalr_ctx)); - - if (!scalr_ctx) - goto error; - - video_driver_scaler_ptr->scaler = scalr_ctx; - video_driver_scaler_ptr->scaler->scaler_type = SCALER_TYPE_POINT; - video_driver_scaler_ptr->scaler->in_fmt = SCALER_FMT_0RGB1555; - - /* TODO: Pick either ARGB8888 or RGB565 depending on driver. */ - video_driver_scaler_ptr->scaler->out_fmt = SCALER_FMT_RGB565; - - if (!scaler_ctx_gen_filter(scalr_ctx)) - goto error; - - scalr_out = calloc(sizeof(uint16_t), size * size); - - if (!scalr_out) - goto error; - - video_driver_scaler_ptr->scaler_out = scalr_out; - - return true; - -error: - video_driver_pixel_converter_free(); - video_driver_filter_free(); - - return false; -} - -static bool video_driver_init_internal(bool *video_is_threaded) -{ - video_info_t video; - unsigned max_dim, scale, width, height; - video_viewport_t *custom_vp = NULL; - const input_driver_t *tmp = NULL; - rarch_system_info_t *system = NULL; - static uint16_t dummy_pixels[32] = {0}; - settings_t *settings = config_get_ptr(); - struct retro_game_geometry *geom = &video_driver_av_info.geometry; - - if (!string_is_empty(settings->paths.path_softfilter_plugin)) - video_driver_init_filter(video_driver_pix_fmt); - - max_dim = MAX(geom->max_width, geom->max_height); - scale = next_pow2(max_dim) / RARCH_SCALE_BASE; - scale = MAX(scale, 1); - - if (video_driver_state_filter) - scale = video_driver_state_scale; - - /* Update core-dependent aspect ratio values. */ - video_driver_set_viewport_square_pixel(); - video_driver_set_viewport_core(); - video_driver_set_viewport_config(); - - /* Update CUSTOM viewport. */ - custom_vp = video_viewport_get_custom(); - - if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) - { - float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value; - aspectratio_lut[ASPECT_RATIO_CUSTOM].value = - (custom_vp->width && custom_vp->height) ? - (float)custom_vp->width / custom_vp->height : default_aspect; - } - - video_driver_set_aspect_ratio_value( - aspectratio_lut[settings->uints.video_aspect_ratio_idx].value); - - if (settings->bools.video_fullscreen|| retroarch_is_forced_fullscreen()) - { - width = settings->uints.video_fullscreen_x; - height = settings->uints.video_fullscreen_y; - } - else - { - /* To-Do: remove when the new window resizing core is hooked */ - if (settings->bools.video_window_save_positions && - (settings->uints.window_position_width || settings->uints.window_position_height)) - { - width = settings->uints.window_position_width; - height = settings->uints.window_position_height; - } - else - { - if (settings->bools.video_force_aspect) - { - /* Do rounding here to simplify integer scale correctness. */ - unsigned base_width = - roundf(geom->base_height * video_driver_get_aspect_ratio()); - width = roundf(base_width * settings->floats.video_scale); - } - else - width = roundf(geom->base_width * settings->floats.video_scale); - height = roundf(geom->base_height * settings->floats.video_scale); -} - } - - if (width && height) - RARCH_LOG("[Video]: Video @ %ux%u\n", width, height); - else - RARCH_LOG("[Video]: Video @ fullscreen\n"); - - video_driver_display_type_set(RARCH_DISPLAY_NONE); - video_driver_display_set(0); - video_driver_window_set(0); - - if (!video_driver_pixel_converter_init(RARCH_SCALE_BASE * scale)) - { - RARCH_ERR("[Video]: Failed to initialize pixel converter.\n"); - goto error; - } - - video.width = width; - video.height = height; - video.fullscreen = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen(); - video.vsync = settings->bools.video_vsync && !rarch_ctl(RARCH_CTL_IS_NONBLOCK_FORCED, NULL); - video.force_aspect = settings->bools.video_force_aspect; - video.font_enable = settings->bools.video_font_enable; - video.swap_interval = settings->uints.video_swap_interval; -#ifdef GEKKO - video.viwidth = settings->uints.video_viwidth; - video.vfilter = settings->bools.video_vfilter; -#endif - video.smooth = settings->bools.video_smooth; - video.input_scale = scale; - video.rgb32 = video_driver_state_filter ? - video_driver_state_out_rgb32 : - (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888); - video.parent = 0; - - video_started_fullscreen = video.fullscreen; - - /* Reset video frame count */ - video_driver_frame_count = 0; - - tmp = input_get_ptr(); - /* Need to grab the "real" video driver interface on a reinit. */ - video_driver_find_driver(); - -#ifdef HAVE_THREADS - video.is_threaded = video_driver_is_threaded_internal(); - *video_is_threaded = video.is_threaded; - - if (video.is_threaded) - { - /* Can't do hardware rendering with threaded driver currently. */ - RARCH_LOG("[Video]: Starting threaded video driver ...\n"); - - if (!video_init_thread((const video_driver_t**)¤t_video, - &video_driver_data, - input_get_double_ptr(), input_driver_get_data_ptr(), - current_video, video)) - { - RARCH_ERR("[Video]: Cannot open threaded video driver ... Exiting ...\n"); - goto error; - } - } - else -#endif - video_driver_data = current_video->init( - &video, input_get_double_ptr(), - input_driver_get_data_ptr()); - - if (!video_driver_data) - { - RARCH_ERR("[Video]: Cannot open video driver ... Exiting ...\n"); - goto error; - } - - if (current_video->focus) - video_driver_cb_has_focus = video_driver_has_focus; - - video_driver_poke = NULL; - if (current_video->poke_interface) - current_video->poke_interface(video_driver_data, &video_driver_poke); - - if (current_video->viewport_info && - (!custom_vp->width || - !custom_vp->height)) - { - /* Force custom viewport to have sane parameters. */ - custom_vp->width = width; - custom_vp->height = height; - - video_driver_get_viewport_info(custom_vp); - } - - system = runloop_get_system_info(); - - video_driver_set_rotation( - (settings->uints.video_rotation + system->rotation) % 4); - - current_video->suppress_screensaver(video_driver_data, - settings->bools.ui_suspend_screensaver_enable); - - video_driver_init_input(tmp); - - command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); - command_event(CMD_EVENT_OVERLAY_INIT, NULL); - - if (!core_is_game_loaded()) - video_driver_cached_frame_set(&dummy_pixels, 4, 4, 8); - -#if defined(PSP) - video_driver_set_texture_frame(&dummy_pixels, false, 1, 1, 1.0f); -#endif - - video_context_driver_reset(); - - video_display_server_init(); - - command_event(CMD_EVENT_SHADER_DIR_INIT, NULL); - - return true; - -error: - retroarch_fail(1, "init_video()"); - return false; -} - -bool video_driver_set_viewport(unsigned width, unsigned height, - bool force_fullscreen, bool allow_rotate) -{ - if (!current_video || !current_video->set_viewport) - return false; - current_video->set_viewport(video_driver_data, width, height, - force_fullscreen, allow_rotate); - return true; -} - -bool video_driver_set_rotation(unsigned rotation) -{ - if (!current_video || !current_video->set_rotation) - return false; - current_video->set_rotation(video_driver_data, rotation); - return true; -} - -bool video_driver_set_video_mode(unsigned width, - unsigned height, bool fullscreen) -{ - gfx_ctx_mode_t mode; - - if (video_driver_poke && video_driver_poke->set_video_mode) - { - video_driver_poke->set_video_mode(video_driver_data, - width, height, fullscreen); - return true; - } - - mode.width = width; - mode.height = height; - mode.fullscreen = fullscreen; - - return video_context_driver_set_video_mode(&mode); -} - -bool video_driver_get_video_output_size(unsigned *width, unsigned *height) -{ - if (!video_driver_poke || !video_driver_poke->get_video_output_size) - return false; - video_driver_poke->get_video_output_size(video_driver_data, - width, height); - return true; -} - -void video_driver_set_osd_msg(const char *msg, const void *data, void *font) -{ - video_frame_info_t video_info; - video_driver_build_info(&video_info); - if (video_driver_poke && video_driver_poke->set_osd_msg) - video_driver_poke->set_osd_msg(video_driver_data, &video_info, msg, data, font); -} - -void video_driver_set_texture_enable(bool enable, bool fullscreen) -{ - if (video_driver_poke && video_driver_poke->set_texture_enable) - video_driver_poke->set_texture_enable(video_driver_data, - enable, fullscreen); -} - -void video_driver_set_texture_frame(const void *frame, bool rgb32, - unsigned width, unsigned height, float alpha) -{ - if (video_driver_poke && video_driver_poke->set_texture_frame) - video_driver_poke->set_texture_frame(video_driver_data, - frame, rgb32, width, height, alpha); -} - -#ifdef HAVE_OVERLAY -bool video_driver_overlay_interface(const video_overlay_interface_t **iface) -{ - if (!current_video || !current_video->overlay_interface) - return false; - current_video->overlay_interface(video_driver_data, iface); - return true; -} -#endif - -void *video_driver_read_frame_raw(unsigned *width, - unsigned *height, size_t *pitch) -{ - if (!current_video || !current_video->read_frame_raw) - return NULL; - return current_video->read_frame_raw(video_driver_data, width, - height, pitch); -} - -void video_driver_set_filtering(unsigned index, bool smooth) -{ - if (video_driver_poke && video_driver_poke->set_filtering) - video_driver_poke->set_filtering(video_driver_data, index, smooth); -} - -void video_driver_cached_frame_set(const void *data, unsigned width, - unsigned height, size_t pitch) -{ - if (data) - frame_cache_data = data; - frame_cache_width = width; - frame_cache_height = height; - frame_cache_pitch = pitch; -} - -void video_driver_cached_frame_get(const void **data, unsigned *width, - unsigned *height, size_t *pitch) -{ - if (data) - *data = frame_cache_data; - if (width) - *width = frame_cache_width; - if (height) - *height = frame_cache_height; - if (pitch) - *pitch = frame_cache_pitch; -} - -void video_driver_get_size(unsigned *width, unsigned *height) -{ -#ifdef HAVE_THREADS - bool is_threaded = video_driver_is_threaded_internal(); - video_driver_threaded_lock(is_threaded); -#endif - if (width) - *width = video_driver_width; - if (height) - *height = video_driver_height; -#ifdef HAVE_THREADS - video_driver_threaded_unlock(is_threaded); -#endif -} - -void video_driver_set_size(unsigned *width, unsigned *height) -{ -#ifdef HAVE_THREADS - bool is_threaded = video_driver_is_threaded_internal(); - video_driver_threaded_lock(is_threaded); -#endif - if (width) - video_driver_width = *width; - if (height) - video_driver_height = *height; -#ifdef HAVE_THREADS - video_driver_threaded_unlock(is_threaded); -#endif -} - -/** - * video_monitor_set_refresh_rate: - * @hz : New refresh rate for monitor. - * - * Sets monitor refresh rate to new value. - **/ -void video_monitor_set_refresh_rate(float hz) -{ - char msg[128]; - settings_t *settings = config_get_ptr(); - - snprintf(msg, sizeof(msg), - "Setting refresh rate to: %.3f Hz.", hz); - runloop_msg_queue_push(msg, 1, 180, false); - RARCH_LOG("%s\n", msg); - - configuration_set_float(settings, - settings->floats.video_refresh_rate, - hz); -} - -/** - * video_monitor_fps_statistics - * @refresh_rate : Monitor refresh rate. - * @deviation : Deviation from measured refresh rate. - * @sample_points : Amount of sampled points. - * - * Gets the monitor FPS statistics based on the current - * runtime. - * - * Returns: true (1) on success. - * false (0) if: - * a) threaded video mode is enabled - * b) less than 2 frame time samples. - * c) FPS monitor enable is off. - **/ -bool video_monitor_fps_statistics(double *refresh_rate, - double *deviation, unsigned *sample_points) -{ - unsigned i; - retro_time_t accum = 0; - retro_time_t avg = 0; - retro_time_t accum_var = 0; - unsigned samples = 0; - -#ifdef HAVE_THREADS - if (video_driver_is_threaded_internal()) - return false; -#endif - - samples = MIN(MEASURE_FRAME_TIME_SAMPLES_COUNT, - (unsigned)video_driver_frame_time_count); - - if (samples < 2) - return false; - - /* Measure statistics on frame time (microsecs), *not* FPS. */ - for (i = 0; i < samples; i++) - { - accum += video_driver_frame_time_samples[i]; -#if 0 - RARCH_LOG("[Video]: Interval #%u: %d usec / frame.\n", - i, (int)frame_time_samples[i]); -#endif - } - - avg = accum / samples; - - /* Drop first measurement. It is likely to be bad. */ - for (i = 0; i < samples; i++) - { - retro_time_t diff = video_driver_frame_time_samples[i] - avg; - accum_var += diff * diff; - } - - *deviation = sqrt((double)accum_var / (samples - 1)) / avg; - - if (refresh_rate) - *refresh_rate = 1000000.0 / avg; - - if (sample_points) - *sample_points = samples; - - return true; -} - -float video_driver_get_aspect_ratio(void) -{ - return video_driver_aspect_ratio; -} - -void video_driver_set_aspect_ratio_value(float value) -{ - video_driver_aspect_ratio = value; -} - -static bool video_driver_frame_filter( - const void *data, - video_frame_info_t *video_info, - unsigned width, unsigned height, - size_t pitch, - unsigned *output_width, unsigned *output_height, - unsigned *output_pitch) -{ - rarch_softfilter_get_output_size(video_driver_state_filter, - output_width, output_height, width, height); - - *output_pitch = (*output_width) * video_driver_state_out_bpp; - - rarch_softfilter_process(video_driver_state_filter, - video_driver_state_buffer, *output_pitch, - data, width, height, pitch); - - if (video_info->post_filter_record && recording_data) - recording_dump_frame(video_driver_state_buffer, - *output_width, *output_height, *output_pitch, - video_info->runloop_is_idle); - - return true; -} - -rarch_softfilter_t *video_driver_frame_filter_get_ptr(void) -{ - return video_driver_state_filter; -} - -enum retro_pixel_format video_driver_get_pixel_format(void) -{ - return video_driver_pix_fmt; -} - -void video_driver_set_pixel_format(enum retro_pixel_format fmt) -{ - video_driver_pix_fmt = fmt; -} - -/** - * video_driver_cached_frame: - * - * Renders the current video frame. - **/ -bool video_driver_cached_frame(void) -{ - void *recording = recording_driver_get_data_ptr(); - - recording_driver_lock(); - - /* Cannot allow recording when pushing duped frames. */ - recording_data = NULL; - - retro_ctx.frame_cb( - (frame_cache_data != RETRO_HW_FRAME_BUFFER_VALID) - ? frame_cache_data : NULL, - frame_cache_width, - frame_cache_height, frame_cache_pitch); - - recording_data = recording; - - recording_driver_unlock(); - - return true; -} - -void video_driver_monitor_adjust_system_rates(void) -{ - float timing_skew = 0.0f; - settings_t *settings = config_get_ptr(); - float video_refresh_rate = settings->floats.video_refresh_rate; - float timing_skew_hz = video_refresh_rate; - const struct retro_system_timing *info = (const struct retro_system_timing*)&video_driver_av_info.timing; - - rarch_ctl(RARCH_CTL_UNSET_NONBLOCK_FORCED, NULL); - - if (!info || info->fps <= 0.0) - return; - - video_driver_core_hz = info->fps; - - if (video_driver_crt_switching_active) - timing_skew_hz = video_driver_core_hz; - timing_skew = fabs( - 1.0f - info->fps / timing_skew_hz); - - if (!settings->bools.vrr_runloop_enable) - { - /* We don't want to adjust pitch too much. If we have extreme cases, - * just don't readjust at all. */ - if (timing_skew <= settings->floats.audio_max_timing_skew) - return; - - RARCH_LOG("[Video]: Timings deviate too much. Will not adjust." - " (Display = %.2f Hz, Game = %.2f Hz)\n", - video_refresh_rate, - (float)info->fps); - } - - if (info->fps <= timing_skew_hz) - return; - - /* We won't be able to do VSync reliably when game FPS > monitor FPS. */ - rarch_ctl(RARCH_CTL_SET_NONBLOCK_FORCED, NULL); - RARCH_LOG("[Video]: Game FPS > Monitor FPS. Cannot rely on VSync.\n"); -} - -void video_driver_menu_settings(void **list_data, void *list_info_data, - void *group_data, void *subgroup_data, const char *parent_group) -{ -#ifdef HAVE_MENU - rarch_setting_t **list = (rarch_setting_t**)list_data; - rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_data; - rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data; - rarch_setting_group_info_t *subgroup_info = (rarch_setting_group_info_t*)subgroup_data; - global_t *global = global_get_ptr(); - - (void)list; - (void)list_info; - (void)group_info; - (void)subgroup_info; - (void)global; - -#if defined(__CELLOS_LV2__) - CONFIG_BOOL( - list, list_info, - &global->console.screen.pal60_enable, - MENU_ENUM_LABEL_PAL60_ENABLE, - MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, - false, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE); -#endif -#if defined(GEKKO) || defined(_XBOX360) - CONFIG_UINT( - list, list_info, - &global->console.screen.gamma_correction, - MENU_ENUM_LABEL_VIDEO_GAMMA, - MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, - 0, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - menu_settings_list_current_add_cmd( - list, - list_info, - CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); - menu_settings_list_current_add_range( - list, - list_info, - 0, - MAX_GAMMA_SETTING, - 1, - true, - true); - settings_data_list_current_add_flags(list, list_info, - SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); -#endif -#if defined(_XBOX1) || defined(HW_RVL) - CONFIG_BOOL( - list, list_info, - &global->console.softfilter_enable, - MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, - false, - MENU_ENUM_LABEL_VALUE_OFF, - MENU_ENUM_LABEL_VALUE_ON, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler, - SD_FLAG_NONE); - menu_settings_list_current_add_cmd( - list, - list_info, - CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); -#endif -#ifdef _XBOX1 - CONFIG_UINT( - list, list_info, - &global->console.screen.flicker_filter_index, - MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, - 0, - group_info, - subgroup_info, - parent_group, - general_write_handler, - general_read_handler); - menu_settings_list_current_add_range(list, list_info, - 0, 5, 1, true, true); -#endif -#endif -} - -static void video_driver_lock_new(void) -{ - video_driver_lock_free(); -#ifdef HAVE_THREADS - if (!display_lock) - display_lock = slock_new(); - retro_assert(display_lock); - - if (!context_lock) - context_lock = slock_new(); - retro_assert(context_lock); -#endif -} - -void video_driver_destroy(void) -{ - video_display_server_destroy(); - crt_video_restore(); - - video_driver_cb_has_focus = null_driver_has_focus; - video_driver_use_rgba = false; - video_driver_data_own = false; - video_driver_active = false; - video_driver_cache_context = false; - video_driver_cache_context_ack = false; - video_driver_record_gpu_buffer = NULL; - current_video = NULL; - video_driver_set_cached_frame_ptr(NULL); -} - -void video_driver_set_cached_frame_ptr(const void *data) -{ - if (data) - frame_cache_data = data; -} - -void video_driver_set_stub_frame(void) -{ - frame_bak = current_video->frame; - current_video->frame = video_null.frame; -} - -void video_driver_unset_stub_frame(void) -{ - if (frame_bak != NULL) - current_video->frame = frame_bak; - - frame_bak = NULL; -} - -bool video_driver_is_stub_frame(void) -{ - return current_video->frame == video_null.frame; -} - -bool video_driver_supports_recording(void) -{ - settings_t *settings = config_get_ptr(); - return settings->bools.video_gpu_record - && current_video->read_viewport; -} - -bool video_driver_supports_viewport_read(void) -{ - settings_t *settings = config_get_ptr(); - return (settings->bools.video_gpu_screenshot || - (video_driver_is_hw_context() && !current_video->read_frame_raw)) - && current_video->read_viewport && current_video->viewport_info; -} - -bool video_driver_supports_read_frame_raw(void) -{ - if (current_video->read_frame_raw) - return true; - return false; -} - -void video_driver_set_viewport_config(void) -{ - settings_t *settings = config_get_ptr(); - - if (settings->floats.video_aspect_ratio < 0.0f) - { - struct retro_game_geometry *geom = &video_driver_av_info.geometry; - - if (geom->aspect_ratio > 0.0f && - settings->bools.video_aspect_ratio_auto) - aspectratio_lut[ASPECT_RATIO_CONFIG].value = geom->aspect_ratio; - else - { - unsigned base_width = geom->base_width; - unsigned base_height = geom->base_height; - - /* Get around division by zero errors */ - if (base_width == 0) - base_width = 1; - if (base_height == 0) - base_height = 1; - aspectratio_lut[ASPECT_RATIO_CONFIG].value = - (float)base_width / base_height; /* 1:1 PAR. */ - } - } - else - { - aspectratio_lut[ASPECT_RATIO_CONFIG].value = - settings->floats.video_aspect_ratio; - } -} - -void video_driver_set_viewport_square_pixel(void) -{ - unsigned len, highest, i, aspect_x, aspect_y; - struct retro_game_geometry *geom = &video_driver_av_info.geometry; - unsigned width = geom->base_width; - unsigned height = geom->base_height; - - if (width == 0 || height == 0) - return; - - len = MIN(width, height); - highest = 1; - - for (i = 1; i < len; i++) - { - if ((width % i) == 0 && (height % i) == 0) - highest = i; - } - - aspect_x = width / highest; - aspect_y = height / highest; - - snprintf(aspectratio_lut[ASPECT_RATIO_SQUARE].name, - sizeof(aspectratio_lut[ASPECT_RATIO_SQUARE].name), - "1:1 PAR (%u:%u DAR)", aspect_x, aspect_y); - - aspectratio_lut[ASPECT_RATIO_SQUARE].value = (float)aspect_x / aspect_y; -} - -void video_driver_set_viewport_core(void) -{ - struct retro_game_geometry *geom = &video_driver_av_info.geometry; - - if (!geom || geom->base_width <= 0.0f || geom->base_height <= 0.0f) - return; - - /* Fallback to 1:1 pixel ratio if none provided */ - if (geom->aspect_ratio > 0.0f) - aspectratio_lut[ASPECT_RATIO_CORE].value = geom->aspect_ratio; - else - aspectratio_lut[ASPECT_RATIO_CORE].value = - (float)geom->base_width / geom->base_height; -} - -void video_driver_reset_custom_viewport(void) -{ - struct video_viewport *custom_vp = video_viewport_get_custom(); - - custom_vp->width = 0; - custom_vp->height = 0; - custom_vp->x = 0; - custom_vp->y = 0; -} - -void video_driver_set_rgba(void) -{ - video_driver_lock(); - video_driver_use_rgba = true; - video_driver_unlock(); -} - -void video_driver_unset_rgba(void) -{ - video_driver_lock(); - video_driver_use_rgba = false; - video_driver_unlock(); -} - -bool video_driver_supports_rgba(void) -{ - bool tmp; - video_driver_lock(); - tmp = video_driver_use_rgba; - video_driver_unlock(); - return tmp; -} - -bool video_driver_get_next_video_out(void) -{ - if (!video_driver_poke) - return false; - - if (!video_driver_poke->get_video_output_next) - return video_context_driver_get_video_output_next(); - video_driver_poke->get_video_output_next(video_driver_data); - return true; -} - -bool video_driver_get_prev_video_out(void) -{ - if (!video_driver_poke) - return false; - - if (!video_driver_poke->get_video_output_prev) - return video_context_driver_get_video_output_prev(); - video_driver_poke->get_video_output_prev(video_driver_data); - return true; -} - -bool video_driver_init(bool *video_is_threaded) -{ - video_driver_lock_new(); - video_driver_filter_free(); - video_driver_set_cached_frame_ptr(NULL); - return video_driver_init_internal(video_is_threaded); -} - -void video_driver_destroy_data(void) -{ - video_driver_data = NULL; -} - -void video_driver_free(void) -{ - video_driver_free_internal(); - video_driver_lock_free(); - video_driver_data = NULL; - video_driver_set_cached_frame_ptr(NULL); -} - -void video_driver_monitor_reset(void) -{ - video_driver_frame_time_count = 0; -} - -void video_driver_set_aspect_ratio(void) -{ - settings_t *settings = config_get_ptr(); - - switch (settings->uints.video_aspect_ratio_idx) - { - case ASPECT_RATIO_SQUARE: - video_driver_set_viewport_square_pixel(); - break; - - case ASPECT_RATIO_CORE: - video_driver_set_viewport_core(); - break; - - case ASPECT_RATIO_CONFIG: - video_driver_set_viewport_config(); - break; - - default: - break; - } - - video_driver_set_aspect_ratio_value( - aspectratio_lut[settings->uints.video_aspect_ratio_idx].value); - - if (!video_driver_poke || !video_driver_poke->set_aspect_ratio) - return; - video_driver_poke->set_aspect_ratio( - video_driver_data, settings->uints.video_aspect_ratio_idx); -} - -void video_driver_update_viewport(struct video_viewport* vp, bool force_full, bool keep_aspect) -{ - gfx_ctx_aspect_t aspect_data; - float device_aspect = (float)vp->full_width / vp->full_height; - settings_t* settings = config_get_ptr(); - - aspect_data.aspect = &device_aspect; - aspect_data.width = vp->full_width; - aspect_data.height = vp->full_height; - - video_context_driver_translate_aspect(&aspect_data); - - vp->x = 0; - vp->y = 0; - vp->width = vp->full_width; - vp->height = vp->full_height; - - if (settings->bools.video_scale_integer && !force_full) - { - video_viewport_get_scaled_integer( - vp, vp->full_width, vp->full_height, video_driver_get_aspect_ratio(), keep_aspect); - } - else if (keep_aspect && !force_full) - { - float desired_aspect = video_driver_get_aspect_ratio(); - -#if defined(HAVE_MENU) - if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) - { - const struct video_viewport* custom = video_viewport_get_custom(); - - vp->x = custom->x; - vp->y = custom->y; - vp->width = custom->width; - vp->height = custom->height; - } - else -#endif - { - float delta; - - if (fabsf(device_aspect - desired_aspect) < 0.0001f) - { - /* If the aspect ratios of screen and desired aspect - * ratio are sufficiently equal (floating point stuff), - * assume they are actually equal. - */ - } - else if (device_aspect > desired_aspect) - { - delta = (desired_aspect / device_aspect - 1.0f) - / 2.0f + 0.5f; - vp->x = (int)roundf(vp->full_width * (0.5f - delta)); - vp->width = (unsigned)roundf(2.0f * vp->full_width * delta); - vp->y = 0; - vp->height = vp->full_height; - } - else - { - vp->x = 0; - vp->width = vp->full_width; - delta = (device_aspect / desired_aspect - 1.0f) - / 2.0f + 0.5f; - vp->y = (int)roundf(vp->full_height * (0.5f - delta)); - vp->height = (unsigned)roundf(2.0f * vp->full_height * delta); - } - } - } - -#if defined(RARCH_MOBILE) - /* In portrait mode, we want viewport to gravitate to top of screen. */ - if (device_aspect < 1.0f) - vp->y = 0; -#endif -} - -void video_driver_show_mouse(void) -{ - if (video_driver_poke && video_driver_poke->show_mouse) - video_driver_poke->show_mouse(video_driver_data, true); -} - -void video_driver_hide_mouse(void) -{ - if (video_driver_poke && video_driver_poke->show_mouse) - video_driver_poke->show_mouse(video_driver_data, false); -} - -void video_driver_set_nonblock_state(bool toggle) -{ - if (current_video->set_nonblock_state) - current_video->set_nonblock_state(video_driver_data, toggle); -} - -bool video_driver_find_driver(void) -{ - int i; - driver_ctx_info_t drv; - settings_t *settings = config_get_ptr(); - - if (video_driver_is_hw_context()) - { - struct retro_hw_render_callback *hwr = video_driver_get_hw_context(); - - current_video = NULL; - - (void)hwr; - -#if defined(HAVE_VULKAN) - if (hwr && hw_render_context_is_vulkan(hwr->context_type)) - { - RARCH_LOG("[Video]: Using HW render, Vulkan driver forced.\n"); - current_video = &video_vulkan; - } -#endif - -#if defined(HAVE_OPENGL) - if (hwr && hw_render_context_is_gl(hwr->context_type)) - { - RARCH_LOG("[Video]: Using HW render, OpenGL driver forced.\n"); - current_video = &video_gl; - } -#endif - - if (current_video) - return true; - } - - if (frontend_driver_has_get_video_driver_func()) - { - current_video = (video_driver_t*)frontend_driver_get_video_driver(); - - if (current_video) - return true; - RARCH_WARN("Frontend supports get_video_driver() but did not specify one.\n"); - } - - drv.label = "video_driver"; - drv.s = settings->arrays.video_driver; - - driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); - - i = (int)drv.len; - - if (i >= 0) - current_video = (video_driver_t*)video_driver_find_handle(i); - else - { - if (verbosity_is_enabled()) - { - unsigned d; - RARCH_ERR("Couldn't find any video driver named \"%s\"\n", - settings->arrays.video_driver); - RARCH_LOG_OUTPUT("Available video drivers are:\n"); - for (d = 0; video_driver_find_handle(d); d++) - RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d)); - RARCH_WARN("Going to default to first video driver...\n"); - } - - current_video = (video_driver_t*)video_driver_find_handle(0); - - if (!current_video) - retroarch_fail(1, "find_video_driver()"); - } - return true; -} - -void video_driver_apply_state_changes(void) -{ - if (video_driver_poke && - video_driver_poke->apply_state_changes) - video_driver_poke->apply_state_changes(video_driver_data); -} - -bool video_driver_read_viewport(uint8_t *buffer, bool is_idle) -{ - if ( current_video->read_viewport - && current_video->read_viewport( - video_driver_data, buffer, is_idle)) - return true; - return false; -} - -bool video_driver_frame_filter_alive(void) -{ - return !!video_driver_state_filter; -} - -bool video_driver_frame_filter_is_32bit(void) -{ - return video_driver_state_out_rgb32; -} - -void video_driver_default_settings(void) -{ - global_t *global = global_get_ptr(); - - if (!global) - return; - - global->console.screen.gamma_correction = DEFAULT_GAMMA; - global->console.flickerfilter_enable = false; - global->console.softfilter_enable = false; - - global->console.screen.resolutions.current.id = 0; -} - -void video_driver_load_settings(config_file_t *conf) -{ - bool tmp_bool = false; - global_t *global = global_get_ptr(); - - if (!conf) - return; - -#ifdef _XBOX - CONFIG_GET_BOOL_BASE(conf, global, - console.screen.gamma_correction, "gamma_correction"); -#else - CONFIG_GET_INT_BASE(conf, global, - console.screen.gamma_correction, "gamma_correction"); -#endif - - if (config_get_bool(conf, "flicker_filter_enable", - &tmp_bool)) - global->console.flickerfilter_enable = tmp_bool; - - if (config_get_bool(conf, "soft_filter_enable", - &tmp_bool)) - global->console.softfilter_enable = tmp_bool; - - CONFIG_GET_INT_BASE(conf, global, - console.screen.soft_filter_index, - "soft_filter_index"); - CONFIG_GET_INT_BASE(conf, global, - console.screen.resolutions.current.id, - "current_resolution_id"); - CONFIG_GET_INT_BASE(conf, global, - console.screen.flicker_filter_index, - "flicker_filter_index"); -} - -void video_driver_save_settings(config_file_t *conf) -{ - global_t *global = global_get_ptr(); - if (!conf) - return; - -#ifdef _XBOX - config_set_bool(conf, "gamma_correction", - global->console.screen.gamma_correction); -#else - config_set_int(conf, "gamma_correction", - global->console.screen.gamma_correction); -#endif - config_set_bool(conf, "flicker_filter_enable", - global->console.flickerfilter_enable); - config_set_bool(conf, "soft_filter_enable", - global->console.softfilter_enable); - - config_set_int(conf, "soft_filter_index", - global->console.screen.soft_filter_index); - config_set_int(conf, "current_resolution_id", - global->console.screen.resolutions.current.id); - config_set_int(conf, "flicker_filter_index", - global->console.screen.flicker_filter_index); -} - -void video_driver_reinit(void) -{ - struct retro_hw_render_callback *hwr = - video_driver_get_hw_context(); - - if (hwr->cache_context) - video_driver_cache_context = true; - else - video_driver_cache_context = false; - - video_driver_cache_context_ack = false; - command_event(CMD_EVENT_RESET_CONTEXT, NULL); - video_driver_cache_context = false; -} - -void video_driver_set_own_driver(void) -{ - video_driver_data_own = true; -} - -void video_driver_unset_own_driver(void) -{ - video_driver_data_own = false; -} - -bool video_driver_owns_driver(void) -{ - return video_driver_data_own; -} - -bool video_driver_is_hw_context(void) -{ - bool is_hw_context = false; - - video_driver_context_lock(); - is_hw_context = (hw_render.context_type != RETRO_HW_CONTEXT_NONE); - video_driver_context_unlock(); - - return is_hw_context; -} - -void video_driver_free_hw_context(void) -{ - video_driver_context_lock(); - - if (hw_render.context_destroy) - hw_render.context_destroy(); - - memset(&hw_render, 0, sizeof(hw_render)); - - video_driver_context_unlock(); - - hw_render_context_negotiation = NULL; -} - -struct retro_hw_render_callback *video_driver_get_hw_context(void) -{ - return &hw_render; -} - -const struct retro_hw_render_context_negotiation_interface * - video_driver_get_context_negotiation_interface(void) -{ - return hw_render_context_negotiation; -} - -void video_driver_set_context_negotiation_interface( - const struct retro_hw_render_context_negotiation_interface *iface) -{ - hw_render_context_negotiation = iface; -} - -bool video_driver_is_video_cache_context(void) -{ - return video_driver_cache_context; -} - -void video_driver_set_video_cache_context_ack(void) -{ - video_driver_cache_context_ack = true; -} - -void video_driver_unset_video_cache_context_ack(void) -{ - video_driver_cache_context_ack = false; -} - -bool video_driver_is_video_cache_context_ack(void) -{ - return video_driver_cache_context_ack; -} - -void video_driver_set_active(void) -{ - video_driver_active = true; -} - -void video_driver_unset_active(void) -{ - video_driver_active = false; -} - -bool video_driver_is_active(void) -{ - return video_driver_active; -} - -void video_driver_get_record_status( - bool *has_gpu_record, - uint8_t **gpu_buf) -{ - *gpu_buf = video_driver_record_gpu_buffer; - *has_gpu_record = video_driver_record_gpu_buffer != NULL; -} - -bool video_driver_gpu_record_init(unsigned size) -{ - video_driver_record_gpu_buffer = (uint8_t*)malloc(size); - if (!video_driver_record_gpu_buffer) - return false; - return true; -} - -void video_driver_gpu_record_deinit(void) -{ - free(video_driver_record_gpu_buffer); - video_driver_record_gpu_buffer = NULL; -} - -bool video_driver_get_current_software_framebuffer( - struct retro_framebuffer *fb) -{ - if ( - video_driver_poke - && video_driver_poke->get_current_software_framebuffer - && video_driver_poke->get_current_software_framebuffer( - video_driver_data, fb)) - return true; - - return false; -} - -bool video_driver_get_hw_render_interface( - const struct retro_hw_render_interface **iface) -{ - if ( - video_driver_poke - && video_driver_poke->get_hw_render_interface - && video_driver_poke->get_hw_render_interface( - video_driver_data, iface)) - return true; - - return false; -} - -bool video_driver_get_viewport_info(struct video_viewport *viewport) -{ - if (!current_video || !current_video->viewport_info) - return false; - current_video->viewport_info(video_driver_data, viewport); - return true; -} - -void video_driver_set_title_buf(void) -{ - struct retro_system_info info; - core_get_system_info(&info); - - fill_pathname_join_concat_noext( - video_driver_title_buf, - msg_hash_to_str(MSG_PROGRAM), - " ", - info.library_name, - sizeof(video_driver_title_buf)); - strlcat(video_driver_title_buf, - " ", sizeof(video_driver_title_buf)); - strlcat(video_driver_title_buf, - info.library_version, - sizeof(video_driver_title_buf)); -} - -/** - * video_viewport_get_scaled_integer: - * @vp : Viewport handle - * @width : Width. - * @height : Height. - * @aspect_ratio : Aspect ratio (in float). - * @keep_aspect : Preserve aspect ratio? - * - * Gets viewport scaling dimensions based on - * scaled integer aspect ratio. - **/ -void video_viewport_get_scaled_integer(struct video_viewport *vp, - unsigned width, unsigned height, - float aspect_ratio, bool keep_aspect) -{ - int padding_x = 0; - int padding_y = 0; - settings_t *settings = config_get_ptr(); - - if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) - { - struct video_viewport *custom = video_viewport_get_custom(); - - if (custom) - { - padding_x = width - custom->width; - padding_y = height - custom->height; - width = custom->width; - height = custom->height; - } - } - else - { - unsigned base_width; - /* Use system reported sizes as these define the - * geometry for the "normal" case. */ - unsigned base_height = - video_driver_av_info.geometry.base_height; - - if (base_height == 0) - base_height = 1; - - /* Account for non-square pixels. - * This is sort of contradictory with the goal of integer scale, - * but it is desirable in some cases. - * - * If square pixels are used, base_height will be equal to - * system->av_info.base_height. */ - base_width = (unsigned)roundf(base_height * aspect_ratio); - - /* Make sure that we don't get 0x scale ... */ - if (width >= base_width && height >= base_height) - { - if (keep_aspect) - { - /* X/Y scale must be same. */ - unsigned max_scale = MIN(width / base_width, - height / base_height); - padding_x = width - base_width * max_scale; - padding_y = height - base_height * max_scale; - } - else - { - /* X/Y can be independent, each scaled as much as possible. */ - padding_x = width % base_width; - padding_y = height % base_height; - } - } - - width -= padding_x; - height -= padding_y; - } - - vp->width = width; - vp->height = height; - vp->x = padding_x / 2; - vp->y = padding_y / 2; -} - -struct retro_system_av_info *video_viewport_get_system_av_info(void) -{ - return &video_driver_av_info; -} - -struct video_viewport *video_viewport_get_custom(void) -{ - settings_t *settings = config_get_ptr(); - return &settings->video_viewport_custom; -} - -unsigned video_pixel_get_alignment(unsigned pitch) -{ - if (pitch & 1) - return 1; - if (pitch & 2) - return 2; - if (pitch & 4) - return 4; - return 8; -} - -/** - * video_driver_frame: - * @data : pointer to data of the video frame. - * @width : width of the video frame. - * @height : height of the video frame. - * @pitch : pitch of the video frame. - * - * Video frame render callback function. - **/ -void video_driver_frame(const void *data, unsigned width, - unsigned height, size_t pitch) -{ - static char video_driver_msg[256]; - static char title[256]; - video_frame_info_t video_info; - static retro_time_t curr_time; - static retro_time_t fps_time; - static float last_fps, frame_time; - unsigned output_width = 0; - unsigned output_height = 0; - unsigned output_pitch = 0; - const char *msg = NULL; - retro_time_t new_time = - cpu_features_get_time_usec(); - - if (!video_driver_active) - return; - - if (video_driver_scaler_ptr && data && - (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_0RGB1555) && - (data != RETRO_HW_FRAME_BUFFER_VALID)) - { - if (video_pixel_frame_scale( - video_driver_scaler_ptr->scaler, - video_driver_scaler_ptr->scaler_out, - data, width, height, pitch)) - { - data = video_driver_scaler_ptr->scaler_out; - pitch = video_driver_scaler_ptr->scaler->out_stride; - } - } - - if (data) - frame_cache_data = data; - frame_cache_width = width; - frame_cache_height = height; - frame_cache_pitch = pitch; - - video_driver_build_info(&video_info); - - /* Get the amount of frames per seconds. */ - if (video_driver_frame_count) - { - unsigned write_index = - video_driver_frame_time_count++ & - (MEASURE_FRAME_TIME_SAMPLES_COUNT - 1); - frame_time = new_time - fps_time; - video_driver_frame_time_samples[write_index] = frame_time; - fps_time = new_time; - - if (video_driver_frame_count == 1) - strlcpy(title, video_driver_window_title, sizeof(title)); - - if ((video_driver_frame_count % FPS_UPDATE_INTERVAL) == 0) - { - char frames_text[64]; - last_fps = TIME_TO_FPS(curr_time, new_time, FPS_UPDATE_INTERVAL); - - if (video_info.fps_show || video_info.framecount_show) - { - if (video_info.fps_show) - { - snprintf(video_info.fps_text, sizeof(video_info.fps_text), - " || FPS: %6.1f ", last_fps); - } - if (video_info.framecount_show) - { - snprintf(frames_text, - sizeof(frames_text), - " || Frames: %" PRIu64, - (uint64_t)video_driver_frame_count); - } - snprintf(video_driver_window_title, sizeof(video_driver_window_title), - "%s%s%s", title, - video_info.fps_show ? video_info.fps_text : "", - video_info.framecount_show ? frames_text : ""); - } - else - { - if (!string_is_equal(video_driver_window_title, title)) - strlcpy(video_driver_window_title, title, sizeof(video_driver_window_title)); - } - - curr_time = new_time; - video_driver_window_title_update = true; - } - - if (video_info.fps_show) - { - if (video_info.framecount_show) - snprintf( - video_info.fps_text, - sizeof(video_info.fps_text), - "FPS: %6.1f || %s: %" PRIu64, - last_fps, - msg_hash_to_str(MSG_FRAMES), - (uint64_t)video_driver_frame_count); - else - snprintf( - video_info.fps_text, - sizeof(video_info.fps_text), - "FPS: %6.1f", - last_fps); - } - - if (video_info.fps_show && video_info.framecount_show) - snprintf( - video_info.fps_text, - sizeof(video_info.fps_text), - "FPS: %6.1f || %s: %" PRIu64, - last_fps, - msg_hash_to_str(MSG_FRAMES), - (uint64_t)video_driver_frame_count); - else if (video_info.framecount_show) - snprintf( - video_info.fps_text, - sizeof(video_info.fps_text), - "%s: %" PRIu64, - msg_hash_to_str(MSG_FRAMES), - (uint64_t)video_driver_frame_count); - else if (video_info.fps_show) - snprintf( - video_info.fps_text, - sizeof(video_info.fps_text), - "FPS: %6.1f", - last_fps); - } - else - { - - curr_time = fps_time = new_time; - - strlcpy(video_driver_window_title, - video_driver_title_buf, - sizeof(video_driver_window_title)); - - if (video_info.fps_show) - strlcpy(video_info.fps_text, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), - sizeof(video_info.fps_text)); - - video_driver_window_title_update = true; - } - - video_info.frame_rate = last_fps; - video_info.frame_time = frame_time / 1000.0f; - video_info.frame_count = (uint64_t) video_driver_frame_count; - - /* Slightly messy code, - * but we really need to do processing before blocking on VSync - * for best possible scheduling. - */ - if ( - ( - !video_driver_state_filter - || !video_info.post_filter_record - || !data - || video_driver_record_gpu_buffer - ) && recording_data - ) - recording_dump_frame(data, width, height, - pitch, video_info.runloop_is_idle); - - if (data && video_driver_state_filter && - video_driver_frame_filter(data, &video_info, width, height, pitch, - &output_width, &output_height, &output_pitch)) - { - data = video_driver_state_buffer; - width = output_width; - height = output_height; - pitch = output_pitch; - } - - video_driver_msg[0] = '\0'; - - if ( video_info.font_enable - && runloop_msg_queue_pull((const char**)&msg) - && msg) - { -#ifdef HAVE_THREADS - /* the msg pointer may point to data modified by another thread */ - runloop_msg_queue_lock(); -#endif - strlcpy(video_driver_msg, msg, sizeof(video_driver_msg)); -#ifdef HAVE_THREADS - runloop_msg_queue_unlock(); -#endif - } - - if (video_info.statistics_show) - { - audio_statistics_t audio_stats = {0.0f}; - double stddev = 0.0; - struct retro_system_av_info *av_info = &video_driver_av_info; - unsigned red = 255; - unsigned green = 255; - unsigned blue = 255; - unsigned alpha = 255; - - video_monitor_fps_statistics(NULL, &stddev, NULL); - - video_info.osd_stat_params.x = 0.010f; - video_info.osd_stat_params.y = 0.950f; - video_info.osd_stat_params.scale = 1.0f; - video_info.osd_stat_params.full_screen = true; - video_info.osd_stat_params.drop_x = -2; - video_info.osd_stat_params.drop_y = -2; - video_info.osd_stat_params.drop_mod = 0.3f; - video_info.osd_stat_params.drop_alpha = 1.0f; - video_info.osd_stat_params.color = COLOR_ABGR( - red, green, blue, alpha); - - compute_audio_buffer_statistics(&audio_stats); - - snprintf(video_info.stat_text, - sizeof(video_info.stat_text), - "Video Statistics:\n -Frame rate: %6.2f fps\n -Frame time: %6.2f ms\n -Frame time deviation: %.3f %%\n" - " -Frame count: %" PRIu64"\n -Viewport: %d x %d x %3.2f\n" - "Audio Statistics:\n -Average buffer saturation: %.2f %%\n -Standard deviation: %.2f %%\n -Time spent close to underrun: %.2f %%\n -Time spent close to blocking: %.2f %%\n -Sample count: %d\n" - "Core Geometry:\n -Size: %u x %u\n -Max Size: %u x %u\n -Aspect: %3.2f\nCore Timing:\n -FPS: %3.2f\n -Sample Rate: %6.2f\n", - video_info.frame_rate, - video_info.frame_time, - 100.0 * stddev, - video_info.frame_count, - video_info.width, - video_info.height, - video_info.refresh_rate, - audio_stats.average_buffer_saturation, - audio_stats.std_deviation_percentage, - audio_stats.close_to_underrun, - audio_stats.close_to_blocking, - audio_stats.samples, - av_info->geometry.base_width, - av_info->geometry.base_height, - av_info->geometry.max_width, - av_info->geometry.max_height, - av_info->geometry.aspect_ratio, - av_info->timing.fps, - av_info->timing.sample_rate); - - /* TODO/FIXME - add OSD chat text here */ -#if 0 - snprintf(video_info.chat_text, sizeof(video_info.chat_text), - "anon: does retroarch netplay have in-game chat?\nradius: I don't know \u2605"); -#endif - } - - video_driver_active = current_video->frame( - video_driver_data, data, width, height, - video_driver_frame_count, - (unsigned)pitch, video_driver_msg, &video_info); - - video_driver_frame_count++; - - /* Display the FPS, with a higher priority. */ - if (video_info.fps_show || video_info.framecount_show) - runloop_msg_queue_push(video_info.fps_text, 2, 1, true); - - /* trigger set resolution*/ - if (video_info.crt_switch_resolution) - { - video_driver_crt_switching_active = true; - - if (video_info.crt_switch_resolution_super == 2560) - width = 2560; - if (video_info.crt_switch_resolution_super == 3840) - width = 3840; - if (video_info.crt_switch_resolution_super == 1920) - width = 1920; - crt_switch_res_core(width, height, video_driver_core_hz, video_info.crt_switch_resolution, video_info.crt_switch_center_adjust, video_info.monitor_index); - } - else if (!video_info.crt_switch_resolution) - video_driver_crt_switching_active = false; - - /* trigger set resolution*/ -} - -void crt_switch_driver_reinit(void) -{ - video_driver_reinit(); -} - -void video_driver_display_type_set(enum rarch_display_type type) -{ - video_driver_display_type = type; -} - -uintptr_t video_driver_display_get(void) -{ - return video_driver_display; -} - -void video_driver_display_set(uintptr_t idx) -{ - video_driver_display = idx; -} - -enum rarch_display_type video_driver_display_type_get(void) -{ - return video_driver_display_type; -} - -void video_driver_window_set(uintptr_t idx) -{ - video_driver_window = idx; -} - -uintptr_t video_driver_window_get(void) -{ - return video_driver_window; -} - -bool video_driver_texture_load(void *data, - enum texture_filter_type filter_type, - uintptr_t *id) -{ - if (!id || !video_driver_poke || !video_driver_poke->load_texture) - return false; - - *id = video_driver_poke->load_texture(video_driver_data, data, - video_driver_is_threaded_internal(), - filter_type); - - return true; -} - -bool video_driver_texture_unload(uintptr_t *id) -{ - if (!video_driver_poke || !video_driver_poke->unload_texture) - return false; - - video_driver_poke->unload_texture(video_driver_data, *id); - *id = 0; - return true; -} - -static bool video_driver_cb_set_coords(void *handle_data, - void *shader_data, const struct video_coords *coords) -{ - video_shader_ctx_coords_t ctx_coords; - ctx_coords.handle_data = handle_data; - ctx_coords.data = coords; - - video_driver_set_coords(&ctx_coords); - return true; -} - -void video_driver_build_info(video_frame_info_t *video_info) -{ - bool is_perfcnt_enable = false; - bool is_paused = false; - bool is_idle = false; - bool is_slowmotion = false; - settings_t *settings = NULL; - video_viewport_t *custom_vp = NULL; - struct retro_hw_render_callback *hwr = - video_driver_get_hw_context(); -#ifdef HAVE_THREADS - bool is_threaded = video_driver_is_threaded_internal(); - video_driver_threaded_lock(is_threaded); -#endif - settings = config_get_ptr(); - custom_vp = &settings->video_viewport_custom; - video_info->refresh_rate = settings->floats.video_refresh_rate; - video_info->crt_switch_resolution = settings->uints.crt_switch_resolution; - video_info->crt_switch_resolution_super = settings->uints.crt_switch_resolution_super; - video_info->crt_switch_center_adjust = settings->ints.crt_switch_center_adjust; - video_info->black_frame_insertion = settings->bools.video_black_frame_insertion; - video_info->hard_sync = settings->bools.video_hard_sync; - video_info->hard_sync_frames = settings->uints.video_hard_sync_frames; - video_info->fps_show = settings->bools.video_fps_show; - video_info->statistics_show = settings->bools.video_statistics_show; - video_info->framecount_show = settings->bools.video_framecount_show; - video_info->scale_integer = settings->bools.video_scale_integer; - video_info->aspect_ratio_idx = settings->uints.video_aspect_ratio_idx; - video_info->post_filter_record = settings->bools.video_post_filter_record; - video_info->input_menu_swap_ok_cancel_buttons = settings->bools.input_menu_swap_ok_cancel_buttons; - video_info->max_swapchain_images = settings->uints.video_max_swapchain_images; - video_info->windowed_fullscreen = settings->bools.video_windowed_fullscreen; - video_info->fullscreen = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen(); - video_info->monitor_index = settings->uints.video_monitor_index; - video_info->shared_context = settings->bools.video_shared_context; - - if (libretro_get_shared_context() && hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE) - video_info->shared_context = true; - - video_info->font_enable = settings->bools.video_font_enable; - video_info->font_msg_pos_x = settings->floats.video_msg_pos_x; - video_info->font_msg_pos_y = settings->floats.video_msg_pos_y; - video_info->font_msg_color_r = settings->floats.video_msg_color_r; - video_info->font_msg_color_g = settings->floats.video_msg_color_g; - video_info->font_msg_color_b = settings->floats.video_msg_color_b; - video_info->custom_vp_x = custom_vp->x; - video_info->custom_vp_y = custom_vp->y; - video_info->custom_vp_width = custom_vp->width; - video_info->custom_vp_height = custom_vp->height; - video_info->custom_vp_full_width = custom_vp->full_width; - video_info->custom_vp_full_height = custom_vp->full_height; - - video_info->fps_text[0] = '\0'; - - video_info->width = video_driver_width; - video_info->height = video_driver_height; - - video_info->use_rgba = video_driver_use_rgba; - - video_info->libretro_running = false; - video_info->msg_bgcolor_enable = settings->bools.video_msg_bgcolor_enable; - -#ifdef HAVE_MENU - video_info->menu_is_alive = menu_driver_is_alive(); - video_info->menu_footer_opacity = settings->floats.menu_footer_opacity; - video_info->menu_header_opacity = settings->floats.menu_header_opacity; - video_info->materialui_color_theme = settings->uints.menu_materialui_color_theme; - video_info->ozone_color_theme = settings->uints.menu_ozone_color_theme; - video_info->menu_shader_pipeline = settings->uints.menu_xmb_shader_pipeline; - video_info->xmb_theme = settings->uints.menu_xmb_theme; - video_info->xmb_color_theme = settings->uints.menu_xmb_color_theme; - video_info->timedate_enable = settings->bools.menu_timedate_enable; - video_info->battery_level_enable = settings->bools.menu_battery_level_enable; - video_info->xmb_shadows_enable = settings->bools.menu_xmb_shadows_enable; - video_info->xmb_alpha_factor = settings->uints.menu_xmb_alpha_factor; - video_info->menu_wallpaper_opacity = settings->floats.menu_wallpaper_opacity; - video_info->menu_framebuffer_opacity = settings->floats.menu_framebuffer_opacity; - - video_info->libretro_running = core_is_game_loaded(); -#else - video_info->menu_is_alive = false; - video_info->menu_footer_opacity = 0.0f; - video_info->menu_header_opacity = 0.0f; - video_info->materialui_color_theme = 0; - video_info->menu_shader_pipeline = 0; - video_info->xmb_color_theme = 0; - video_info->xmb_theme = 0; - video_info->timedate_enable = false; - video_info->battery_level_enable = false; - video_info->xmb_shadows_enable = false; - video_info->xmb_alpha_factor = 0.0f; - video_info->menu_framebuffer_opacity = 0.0f; - video_info->menu_wallpaper_opacity = 0.0f; -#endif - - runloop_get_status(&is_paused, &is_idle, &is_slowmotion, &is_perfcnt_enable); - - video_info->is_perfcnt_enable = is_perfcnt_enable; - video_info->runloop_is_paused = is_paused; - video_info->runloop_is_idle = is_idle; - video_info->runloop_is_slowmotion = is_slowmotion; - - video_info->input_driver_nonblock_state = input_driver_is_nonblock_state(); - - video_info->context_data = video_context_data; - video_info->shader_driver = current_shader; - video_info->shader_data = current_shader_data; - - video_info->cb_update_window_title = current_video_context.update_window_title; - video_info->cb_swap_buffers = current_video_context.swap_buffers; - video_info->cb_get_metrics = current_video_context.get_metrics; - video_info->cb_set_resize = current_video_context.set_resize; - - video_info->cb_set_mvp = video_driver_cb_shader_set_mvp; - - video_info->userdata = video_driver_get_ptr(false); - -#ifdef HAVE_THREADS - video_driver_threaded_unlock(is_threaded); -#endif -} - -/** - * video_driver_translate_coord_viewport: - * @mouse_x : Pointer X coordinate. - * @mouse_y : Pointer Y coordinate. - * @res_x : Scaled X coordinate. - * @res_y : Scaled Y coordinate. - * @res_screen_x : Scaled screen X coordinate. - * @res_screen_y : Scaled screen Y coordinate. - * - * Translates pointer [X,Y] coordinates into scaled screen - * coordinates based on viewport info. - * - * Returns: true (1) if successful, false if video driver doesn't support - * viewport info. - **/ -bool video_driver_translate_coord_viewport( - struct video_viewport *vp, - int mouse_x, int mouse_y, - int16_t *res_x, int16_t *res_y, - int16_t *res_screen_x, int16_t *res_screen_y) -{ - int scaled_screen_x, scaled_screen_y, scaled_x, scaled_y; - int norm_vp_width = (int)vp->width; - int norm_vp_height = (int)vp->height; - int norm_full_vp_width = (int)vp->full_width; - int norm_full_vp_height = (int)vp->full_height; - - if (norm_full_vp_width <= 0 || norm_full_vp_height <= 0) - return false; - - if (mouse_x >= 0 && mouse_x <= norm_full_vp_width) - scaled_screen_x = ((2 * mouse_x * 0x7fff) - / norm_full_vp_width) - 0x7fff; - else - scaled_screen_x = -0x8000; /* OOB */ - - if (mouse_y >= 0 && mouse_y <= norm_full_vp_height) - scaled_screen_y = ((2 * mouse_y * 0x7fff) - / norm_full_vp_height) - 0x7fff; - else - scaled_screen_y = -0x8000; /* OOB */ - - mouse_x -= vp->x; - mouse_y -= vp->y; - - if (mouse_x >= 0 && mouse_x <= norm_vp_width) - scaled_x = ((2 * mouse_x * 0x7fff) - / norm_vp_width) - 0x7fff; - else - scaled_x = -0x8000; /* OOB */ - - if (mouse_y >= 0 && mouse_y <= norm_vp_height) - scaled_y = ((2 * mouse_y * 0x7fff) - / norm_vp_height) - 0x7fff; - else - scaled_y = -0x8000; /* OOB */ - - *res_x = scaled_x; - *res_y = scaled_y; - *res_screen_x = scaled_screen_x; - *res_screen_y = scaled_screen_y; - - return true; -} - -void video_driver_get_window_title(char *buf, unsigned len) -{ - if (buf && video_driver_window_title_update) - { - strlcpy(buf, video_driver_window_title, len); - video_driver_window_title_update = false; - } -} - -void video_driver_get_status(uint64_t *frame_count, bool * is_alive, - bool *is_focused) -{ - *frame_count = video_driver_frame_count; - *is_alive = current_video ? - current_video->alive(video_driver_data) : true; - *is_focused = video_driver_cb_has_focus(); -} - -/** - * find_video_context_driver_driver_index: - * @ident : Identifier of resampler driver to find. - * - * Finds graphics context driver index by @ident name. - * - * Returns: graphics context driver index if driver was found, otherwise - * -1. - **/ -static int find_video_context_driver_index(const char *ident) -{ - unsigned i; - for (i = 0; gfx_ctx_drivers[i]; i++) - if (string_is_equal_noncase(ident, gfx_ctx_drivers[i]->ident)) - return i; - return -1; -} - -/** - * find_prev_context_driver: - * - * Finds previous driver in graphics context driver array. - **/ -bool video_context_driver_find_prev_driver(void) -{ - settings_t *settings = config_get_ptr(); - int i = find_video_context_driver_index( - settings->arrays.video_context_driver); - - if (i > 0) - { - strlcpy(settings->arrays.video_context_driver, - gfx_ctx_drivers[i - 1]->ident, - sizeof(settings->arrays.video_context_driver)); - return true; - } - - RARCH_WARN("Couldn't find any previous video context driver.\n"); - return false; -} - -/** - * find_next_context_driver: - * - * Finds next driver in graphics context driver array. - **/ -bool video_context_driver_find_next_driver(void) -{ - settings_t *settings = config_get_ptr(); - int i = find_video_context_driver_index( - settings->arrays.video_context_driver); - - if (i >= 0 && gfx_ctx_drivers[i + 1]) - { - strlcpy(settings->arrays.video_context_driver, - gfx_ctx_drivers[i + 1]->ident, - sizeof(settings->arrays.video_context_driver)); - return true; - } - - RARCH_WARN("Couldn't find any next video context driver.\n"); - return false; -} - -/** - * video_context_driver_init: - * @data : Input data. - * @ctx : Graphics context driver to initialize. - * @ident : Identifier of graphics context driver to find. - * @api : API of higher-level graphics API. - * @major : Major version number of higher-level graphics API. - * @minor : Minor version number of higher-level graphics API. - * @hw_render_ctx : Request a graphics context driver capable of - * hardware rendering? - * - * Initialize graphics context driver. - * - * Returns: graphics context driver if successfully initialized, - * otherwise NULL. - **/ -static const gfx_ctx_driver_t *video_context_driver_init( - void *data, - const gfx_ctx_driver_t *ctx, - const char *ident, - enum gfx_ctx_api api, unsigned major, - unsigned minor, bool hw_render_ctx, - void **ctx_data) -{ - video_frame_info_t video_info; - - if (!ctx->bind_api(data, api, major, minor)) - { - RARCH_WARN("Failed to bind API (#%u, version %u.%u)" - " on context driver \"%s\".\n", - (unsigned)api, major, minor, ctx->ident); - - return NULL; - } - - video_driver_build_info(&video_info); - - if (!(*ctx_data = ctx->init(&video_info, data))) - return NULL; - - if (ctx->bind_hw_render) - ctx->bind_hw_render(*ctx_data, - video_info.shared_context && hw_render_ctx); - - return ctx; -} - -/** - * video_context_driver_init_first: - * @data : Input data. - * @ident : Identifier of graphics context driver to find. - * @api : API of higher-level graphics API. - * @major : Major version number of higher-level graphics API. - * @minor : Minor version number of higher-level graphics API. - * @hw_render_ctx : Request a graphics context driver capable of - * hardware rendering? - * - * Finds first suitable graphics context driver and initializes. - * - * Returns: graphics context driver if found, otherwise NULL. - **/ -const gfx_ctx_driver_t *video_context_driver_init_first(void *data, - const char *ident, enum gfx_ctx_api api, unsigned major, - unsigned minor, bool hw_render_ctx, void **ctx_data) -{ - int i = find_video_context_driver_index(ident); - - if (i >= 0) - { - const gfx_ctx_driver_t *ctx = video_context_driver_init(data, gfx_ctx_drivers[i], ident, - api, major, minor, hw_render_ctx, ctx_data); - if (ctx) - { - video_context_data = *ctx_data; - return ctx; - } - } - - for (i = 0; gfx_ctx_drivers[i]; i++) - { - const gfx_ctx_driver_t *ctx = - video_context_driver_init(data, gfx_ctx_drivers[i], ident, - api, major, minor, hw_render_ctx, ctx_data); - - if (ctx) - { - video_context_data = *ctx_data; - return ctx; - } - } - - return NULL; -} - -bool video_context_driver_init_image_buffer(const video_info_t *data) -{ - if ( - current_video_context.image_buffer_init - && current_video_context.image_buffer_init( - video_context_data, data)) - return true; - return false; -} - -bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img) -{ - if ( - current_video_context.image_buffer_write - && current_video_context.image_buffer_write(video_context_data, - img->frame, img->width, img->height, img->pitch, - img->rgb32, img->index, img->handle)) - return true; - return false; -} - -bool video_context_driver_get_video_output_prev(void) -{ - if (!current_video_context.get_video_output_prev) - return false; - current_video_context.get_video_output_prev(video_context_data); - return true; -} - -bool video_context_driver_get_video_output_next(void) -{ - if (!current_video_context.get_video_output_next) - return false; - current_video_context.get_video_output_next(video_context_data); - return true; -} - -void video_context_driver_make_current(bool release) -{ - if (current_video_context.make_current) - current_video_context.make_current(release); -} - -bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect) -{ - if (!video_context_data || !aspect) - return false; - if (!current_video_context.translate_aspect) - return false; - *aspect->aspect = current_video_context.translate_aspect( - video_context_data, aspect->width, aspect->height); - return true; -} - -void video_context_driver_free(void) -{ - if (current_video_context.destroy) - current_video_context.destroy(video_context_data); - video_context_driver_destroy(); - video_context_data = NULL; -} - -bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data) -{ - if (!size_data) - return false; - if (!current_video_context.get_video_output_size) - return false; - current_video_context.get_video_output_size(video_context_data, - size_data->width, size_data->height); - return true; -} - -bool video_context_driver_swap_interval(int *interval) -{ - gfx_ctx_flags_t flags; - int current_interval = *interval; - settings_t *settings = config_get_ptr(); - bool adaptive_vsync_enabled = video_driver_get_all_flags(&flags, GFX_CTX_FLAGS_ADAPTIVE_VSYNC) && settings->bools.video_adaptive_vsync; - - if (!current_video_context.swap_interval) - return false; - if (adaptive_vsync_enabled && current_interval == 1) - current_interval = -1; - current_video_context.swap_interval(video_context_data, current_interval); - return true; -} - -bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc) -{ - if (!current_video_context.get_proc_address) - return false; - - proc->addr = current_video_context.get_proc_address(proc->sym); - - return true; -} - -bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics) -{ - if ( - current_video_context.get_metrics(video_context_data, - metrics->type, - metrics->value)) - return true; - return false; -} - -bool video_context_driver_get_refresh_rate(float *refresh_rate) -{ - float refresh_holder = 0; - - if (!current_video_context.get_refresh_rate || !refresh_rate) - return false; - if (!video_context_data) - return false; - - if (!video_driver_crt_switching_active) - if (refresh_rate) - *refresh_rate = - current_video_context.get_refresh_rate(video_context_data); - - if (video_driver_crt_switching_active) - { - if (refresh_rate) - refresh_holder = - current_video_context.get_refresh_rate(video_context_data); - if (refresh_holder != video_driver_core_hz) /* Fix for incorrect interlace detsction -- HARD SET VSNC TO REQUIRED REFRESH FOR CRT*/ - *refresh_rate = video_driver_core_hz; - } - - return true; -} - -bool video_context_driver_input_driver(gfx_ctx_input_t *inp) -{ - settings_t *settings = config_get_ptr(); - const char *joypad_name = settings ? - settings->arrays.input_joypad_driver : NULL; - - if (!current_video_context.input_driver) - return false; - current_video_context.input_driver( - video_context_data, joypad_name, - inp->input, inp->input_data); - return true; -} - -bool video_context_driver_suppress_screensaver(bool *bool_data) -{ - if ( video_context_data - && current_video_context.suppress_screensaver( - video_context_data, *bool_data)) - return true; - return false; -} - -bool video_context_driver_get_ident(gfx_ctx_ident_t *ident) -{ - if (!ident) - return false; - ident->ident = current_video_context.ident; - return true; -} - -bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info) -{ - video_frame_info_t video_info; - - if (!current_video_context.set_video_mode) - return false; - - video_driver_build_info(&video_info); - - if (!current_video_context.set_video_mode( - video_context_data, &video_info, mode_info->width, - mode_info->height, mode_info->fullscreen)) - return false; - return true; -} - -bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info) -{ - if (!current_video_context.get_video_size) - return false; - current_video_context.get_video_size(video_context_data, - &mode_info->width, &mode_info->height); - return true; -} - -bool video_context_driver_show_mouse(bool *bool_data) -{ - if (!current_video_context.show_mouse) - return false; - current_video_context.show_mouse(video_context_data, *bool_data); - return true; -} - -static bool video_context_driver_get_flags(gfx_ctx_flags_t *flags) -{ - if (!current_video_context.get_flags) - return false; - - if (deferred_video_context_driver_set_flags) - { - flags->flags = deferred_flag_data.flags; - deferred_video_context_driver_set_flags = false; - return true; - } - - flags->flags = current_video_context.get_flags(video_context_data); - return true; -} - -static bool video_driver_get_flags(gfx_ctx_flags_t *flags) -{ - if (!video_driver_poke || !video_driver_poke->get_flags) - return false; - flags->flags = video_driver_poke->get_flags(video_driver_data); - return true; -} - -bool video_driver_get_all_flags(gfx_ctx_flags_t *flags, enum display_flags flag) -{ - if (!flags) - return false; - - if (video_driver_get_flags(flags)) - if (BIT32_GET(flags->flags, flag)) - return true; - - flags->flags = 0; - - if (video_context_driver_get_flags(flags)) - if (BIT32_GET(flags->flags, flag)) - return true; - - return false; -} - -bool video_context_driver_set_flags(gfx_ctx_flags_t *flags) -{ - if (!flags) - return false; - if (!current_video_context.set_flags) - { - deferred_flag_data.flags = flags->flags; - deferred_video_context_driver_set_flags = true; - return false; - } - - current_video_context.set_flags(video_context_data, flags->flags); - return true; -} - -enum gfx_ctx_api video_context_driver_get_api(void) -{ - enum gfx_ctx_api ctx_api = video_context_data ? - current_video_context.get_api(video_context_data) : GFX_CTX_NONE; - - if (ctx_api == GFX_CTX_NONE) - { - const char *video_driver = video_driver_get_ident(); - if (string_is_equal(video_driver, "d3d9")) - return GFX_CTX_DIRECT3D9_API; - else if (string_is_equal(video_driver, "d3d10")) - return GFX_CTX_DIRECT3D10_API; - else if (string_is_equal(video_driver, "d3d11")) - return GFX_CTX_DIRECT3D11_API; - else if (string_is_equal(video_driver, "d3d12")) - return GFX_CTX_DIRECT3D12_API; - else if (string_is_equal(video_driver, "gx2")) - return GFX_CTX_GX2_API; - else if (string_is_equal(video_driver, "gx")) - return GFX_CTX_GX_API; - else if (string_is_equal(video_driver, "gl")) - return GFX_CTX_OPENGL_API; - else if (string_is_equal(video_driver, "vulkan")) - return GFX_CTX_VULKAN_API; - else if (string_is_equal(video_driver, "metal")) - return GFX_CTX_METAL_API; - - return GFX_CTX_NONE; - } - - return ctx_api; -} - -bool video_driver_has_windowed(void) -{ -#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) - if (video_driver_data && current_video->has_windowed) - return current_video->has_windowed(video_driver_data); - else if (video_context_data && current_video_context.has_windowed) - return current_video_context.has_windowed(video_context_data); -#endif - return false; -} - -bool video_driver_cached_frame_has_valid_framebuffer(void) -{ - if (frame_cache_data) - return (frame_cache_data == RETRO_HW_FRAME_BUFFER_VALID); - return false; -} - -static const shader_backend_t *video_shader_set_backend( - enum rarch_shader_type type) -{ - switch (type) - { - case RARCH_SHADER_CG: - { -#ifdef HAVE_CG - gfx_ctx_flags_t flags; - flags.flags = 0; - video_context_driver_get_flags(&flags); - - if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) - { - RARCH_ERR("[Shader driver]: Cg cannot be used with core" - " GL context. Trying to fall back to GLSL...\n"); - return video_shader_set_backend(RARCH_SHADER_GLSL); - } - - RARCH_LOG("[Shader driver]: Using Cg shader backend.\n"); - return &gl_cg_backend; -#else - break; -#endif - } - case RARCH_SHADER_GLSL: -#ifdef HAVE_GLSL - RARCH_LOG("[Shader driver]: Using GLSL shader backend.\n"); - return &gl_glsl_backend; -#else - break; -#endif - case RARCH_SHADER_HLSL: - case RARCH_SHADER_NONE: - default: - break; - } - - return NULL; -} - -bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident) -{ - if (!ident || !current_shader) - return false; - ident->ident = current_shader->ident; - return true; -} - -bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader) -{ - void *video_driver = video_driver_get_ptr(true); - const video_poke_interface_t *video_poke = video_driver_get_poke(); - - shader->data = NULL; - if (!video_poke || !video_driver || !video_poke->get_current_shader) - return false; - shader->data = video_poke->get_current_shader(video_driver); - return true; -} - -bool video_shader_driver_deinit(void) -{ - if (!current_shader) - return false; - - if (current_shader->deinit) - current_shader->deinit(current_shader_data); - - current_shader_data = NULL; - current_shader = NULL; - return true; -} - -static bool video_driver_cb_set_mvp(void *data, - void *shader_data, const void *mat_data) -{ - video_shader_ctx_mvp_t mvp; - mvp.data = data; - mvp.matrix = mat_data; - - video_driver_set_mvp(&mvp); - return true; -} - -static void video_shader_driver_scale_null(void *data, - unsigned idx, struct gfx_fbo_scale *scale) -{ - (void)idx; - (void)scale; -} - -static void video_shader_driver_reset_to_defaults(void) -{ - if (!current_shader) - return; - - if (current_shader->set_mvp) - video_driver_cb_shader_set_mvp = current_shader->set_mvp; - else - { - current_shader->set_mvp = video_driver_cb_set_mvp; - video_driver_cb_shader_set_mvp = video_driver_cb_set_mvp; - } - if (!current_shader->set_coords) - current_shader->set_coords = video_driver_cb_set_coords; - - if (!current_shader->shader_scale) - current_shader->shader_scale = video_shader_driver_scale_null; -} - -/* Finds first suitable shader context driver. */ -bool video_shader_driver_init_first(void) -{ - current_shader = (shader_backend_t*)shader_ctx_drivers[0]; - video_shader_driver_reset_to_defaults(); - return true; -} - -bool video_shader_driver_init(video_shader_ctx_init_t *init) -{ - void *tmp = NULL; - settings_t *settings = config_get_ptr(); - - if (!init->shader || !init->shader->init) - { - init->shader = video_shader_set_backend(init->shader_type); - - if (!init->shader) - return false; - } - - tmp = init->shader->init(init->data, init->path); - - if (!tmp) - return false; - - if (string_is_equal(settings->arrays.menu_driver, "xmb") - && init->shader->init_menu_shaders) - { - RARCH_LOG("Setting up menu pipeline shaders for XMB ... \n"); - init->shader->init_menu_shaders(tmp); - } - - init->shader_data = tmp; - current_shader_data = tmp; - - RARCH_LOG("Resetting shader to defaults ... \n"); - - current_shader = (shader_backend_t*)init->shader; - video_shader_driver_reset_to_defaults(); - - return true; -} - -bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler) -{ - if (!scaler || !scaler->scale) - return false; - - scaler->scale->valid = false; - - current_shader->shader_scale(current_shader_data, - scaler->idx, scaler->scale); - return true; -} - -bool video_shader_driver_info(video_shader_ctx_info_t *shader_info) -{ - if (!shader_info) - return false; - - shader_info->num = current_shader->num_shaders(current_shader_data); - - return true; -} - -void video_driver_set_coords(video_shader_ctx_coords_t *coords) -{ - if (current_shader && current_shader->set_coords) - current_shader->set_coords(coords->handle_data, - current_shader_data, - (const struct video_coords*)coords->data); - else - { - if (video_driver_poke && video_driver_poke->set_coords) - video_driver_poke->set_coords(coords->handle_data, - current_shader_data, - (const struct video_coords*)coords->data); - } -} - -void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp) -{ - if (!mvp || !mvp->matrix) - return; - - if (current_shader && current_shader->set_mvp) - current_shader->set_mvp(mvp->data, - current_shader_data, mvp->matrix); - else - { - if (video_driver_poke && video_driver_poke->set_mvp) - video_driver_poke->set_mvp(mvp->data, - current_shader_data, mvp->matrix); - } -} - -float video_driver_get_refresh_rate(void) -{ - if (video_driver_poke && video_driver_poke->get_refresh_rate) - return video_driver_poke->get_refresh_rate(video_driver_data); - - return 0.0f; -} +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "../audio/audio_driver.h" +#include "../menu/menu_shader.h" + +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + +#include "../dynamic.h" + +#ifdef HAVE_THREADS +#include +#endif + +#ifdef HAVE_MENU +#include "../menu/menu_driver.h" +#include "../menu/menu_setting.h" +#endif + +#include "video_thread_wrapper.h" +#include "video_driver.h" +#include "video_display_server.h" +#include "video_crt_switch.h" + +#include "../frontend/frontend_driver.h" +#include "../record/record_driver.h" +#include "../config.def.h" +#include "../configuration.h" +#include "../driver.h" +#include "../retroarch.h" +#include "../input/input_driver.h" +#include "../list_special.h" +#include "../core.h" +#include "../command.h" +#include "../msg_hash.h" +#include "../verbosity.h" + +#define MEASURE_FRAME_TIME_SAMPLES_COUNT (2 * 1024) + +#define TIME_TO_FPS(last_time, new_time, frames) ((1000000.0f * (frames)) / ((new_time) - (last_time))) + +#define FPS_UPDATE_INTERVAL 256 + +#ifdef HAVE_THREADS +#define video_driver_is_threaded_internal() ((!video_driver_is_hw_context() && video_driver_threaded) ? true : false) +#else +#define video_driver_is_threaded_internal() (false) +#endif + +#ifdef HAVE_THREADS +#define video_driver_lock() \ + if (display_lock) \ + slock_lock(display_lock) + +#define video_driver_unlock() \ + if (display_lock) \ + slock_unlock(display_lock) + +#define video_driver_context_lock() \ + if (context_lock) \ + slock_lock(context_lock) + +#define video_driver_context_unlock() \ + if (context_lock) \ + slock_unlock(context_lock) + +#define video_driver_lock_free() \ + slock_free(display_lock); \ + slock_free(context_lock); \ + display_lock = NULL; \ + context_lock = NULL + +#define video_driver_threaded_lock(is_threaded) \ + if (is_threaded) \ + video_driver_lock() + +#define video_driver_threaded_unlock(is_threaded) \ + if (is_threaded) \ + video_driver_unlock() +#else +#define video_driver_lock() ((void)0) +#define video_driver_unlock() ((void)0) +#define video_driver_lock_free() ((void)0) +#define video_driver_threaded_lock(is_threaded) ((void)0) +#define video_driver_threaded_unlock(is_threaded) ((void)0) +#define video_driver_context_lock() ((void)0) +#define video_driver_context_unlock() ((void)0) +#endif + +typedef struct video_pixel_scaler +{ + struct scaler_ctx *scaler; + void *scaler_out; +} video_pixel_scaler_t; + +static bool (*video_driver_cb_shader_set_mvp)(void *data, + void *shader_data, const void *mat_data); +bool (*video_driver_cb_has_focus)(void); + +/* Opaque handles to currently running window. + * Used by e.g. input drivers which bind to a window. + * Drivers are responsible for setting these if an input driver + * could potentially make use of this. */ +static uintptr_t video_driver_display = 0; +static uintptr_t video_driver_window = 0; + +static rarch_softfilter_t *video_driver_state_filter = NULL; +static void *video_driver_state_buffer = NULL; +static unsigned video_driver_state_scale = 0; +static unsigned video_driver_state_out_bpp = 0; +static bool video_driver_state_out_rgb32 = false; +static bool video_driver_crt_switching_active = false; + +static struct retro_system_av_info video_driver_av_info; + +static enum retro_pixel_format video_driver_pix_fmt = RETRO_PIXEL_FORMAT_0RGB1555; + +static const void *frame_cache_data = NULL; +static unsigned frame_cache_width = 0; +static unsigned frame_cache_height = 0; +static size_t frame_cache_pitch = 0; +static bool video_driver_threaded = false; + +static float video_driver_core_hz = 0.0f; +static float video_driver_aspect_ratio = 0.0f; +static unsigned video_driver_width = 0; +static unsigned video_driver_height = 0; + +static enum rarch_display_type video_driver_display_type = RARCH_DISPLAY_NONE; +static char video_driver_title_buf[64] = {0}; +static char video_driver_window_title[512] = {0}; +static bool video_driver_window_title_update = true; + +static retro_time_t video_driver_frame_time_samples[MEASURE_FRAME_TIME_SAMPLES_COUNT]; +static uint64_t video_driver_frame_time_count = 0; +static uint64_t video_driver_frame_count = 0; + +static void *video_driver_data = NULL; +static video_driver_t *current_video = NULL; + +/* Interface for "poking". */ +static const video_poke_interface_t *video_driver_poke = NULL; + +/* Used for 15-bit -> 16-bit conversions that take place before + * being passed to video driver. */ +static video_pixel_scaler_t *video_driver_scaler_ptr = NULL; + +static struct retro_hw_render_callback hw_render; + +static const struct +retro_hw_render_context_negotiation_interface * +hw_render_context_negotiation = NULL; + +/* Graphics driver requires RGBA byte order data (ABGR on little-endian) + * for 32-bit. + * This takes effect for overlay and shader cores that wants to load + * data into graphics driver. Kinda hackish to place it here, it is only + * used for GLES. + * TODO: Refactor this better. */ +static bool video_driver_use_rgba = false; +static bool video_driver_data_own = false; +static bool video_driver_active = false; + +static video_driver_frame_t frame_bak = NULL; + +/* If set during context deinit, the driver should keep + * graphics context alive to avoid having to reset all + * context state. */ +static bool video_driver_cache_context = false; + +/* Set to true by driver if context caching succeeded. */ +static bool video_driver_cache_context_ack = false; +static uint8_t *video_driver_record_gpu_buffer = NULL; + +#ifdef HAVE_THREADS +static slock_t *display_lock = NULL; +static slock_t *context_lock = NULL; +#endif + +static gfx_ctx_driver_t current_video_context; + +static void *video_context_data = NULL; + +/** + * dynamic.c:dynamic_request_hw_context will try to set flag data when the context + * is in the middle of being rebuilt; in these cases we will save flag + * data and set this to true. + * When the context is reinit, it checks this, reads from + * deferred_flag_data and cleans it. + * + * TODO - Dirty hack, fix it better + */ +static bool deferred_video_context_driver_set_flags = false; +static gfx_ctx_flags_t deferred_flag_data = {0}; + +static bool video_started_fullscreen = false; + +static shader_backend_t *current_shader = NULL; +static void *current_shader_data = NULL; + +struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = { + { "4:3", 1.3333f }, + { "16:9", 1.7778f }, + { "16:10", 1.6f }, + { "16:15", 16.0f / 15.0f }, + { "21:9", 21.0f / 9.0f }, + { "1:1", 1.0f }, + { "2:1", 2.0f }, + { "3:2", 1.5f }, + { "3:4", 0.75f }, + { "4:1", 4.0f }, + { "9:16", 0.5625f }, + { "5:4", 1.25f }, + { "6:5", 1.2f }, + { "7:9", 0.7777f }, + { "8:3", 2.6666f }, + { "8:7", 1.1428f }, + { "19:12", 1.5833f }, + { "19:14", 1.3571f }, + { "30:17", 1.7647f }, + { "32:9", 3.5555f }, + { "Config", 0.0f }, + { "Square pixel", 1.0f }, + { "Core provided", 1.0f }, + { "Custom", 0.0f } +}; + +static const video_driver_t *video_drivers[] = { +#ifdef HAVE_OPENGL + &video_gl, +#endif +#ifdef HAVE_VULKAN + &video_vulkan, +#endif +#ifdef HAVE_METAL + &video_metal, +#endif +#ifdef XENON + &video_xenon360, +#endif +#if defined(HAVE_D3D12) + &video_d3d12, +#endif +#if defined(HAVE_D3D11) + &video_d3d11, +#endif +#if defined(HAVE_D3D10) + &video_d3d10, +#endif +#if defined(HAVE_D3D9) + &video_d3d9, +#endif +#if defined(HAVE_D3D8) + &video_d3d8, +#endif +#ifdef HAVE_VITA2D + &video_vita2d, +#endif +#ifdef PSP + &video_psp1, +#endif +#ifdef PS2 + &video_ps2, +#endif +#ifdef _3DS + &video_ctr, +#endif +#ifdef SWITCH + &video_switch, +#endif +#ifdef HAVE_SDL + &video_sdl, +#endif +#ifdef HAVE_SDL2 + &video_sdl2, +#endif +#ifdef HAVE_XVIDEO + &video_xvideo, +#endif +#ifdef GEKKO + &video_gx, +#endif +#ifdef WIIU + &video_wiiu, +#endif +#ifdef HAVE_VG + &video_vg, +#endif +#ifdef HAVE_OMAP + &video_omap, +#endif +#ifdef HAVE_EXYNOS + &video_exynos, +#endif +#ifdef HAVE_DISPMANX + &video_dispmanx, +#endif +#ifdef HAVE_SUNXI + &video_sunxi, +#endif +#ifdef HAVE_PLAIN_DRM + &video_drm, +#endif +#ifdef HAVE_XSHM + &video_xshm, +#endif +#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) + &video_gdi, +#endif +#ifdef DJGPP + &video_vga, +#endif +#ifdef HAVE_SIXEL + &video_sixel, +#endif +#ifdef HAVE_CACA + &video_caca, +#endif + &video_null, + NULL, +}; + +static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { +#if defined(ORBIS) + &orbis_ctx, +#endif +#if defined(HAVE_LIBNX) && defined(HAVE_OPENGL) + &switch_ctx, +#endif +#if defined(__CELLOS_LV2__) + &gfx_ctx_ps3, +#endif +#if defined(HAVE_VIDEOCORE) + &gfx_ctx_videocore, +#endif +#if defined(HAVE_MALI_FBDEV) + &gfx_ctx_mali_fbdev, +#endif +#if defined(HAVE_VIVANTE_FBDEV) + &gfx_ctx_vivante_fbdev, +#endif +#if defined(HAVE_OPENDINGUX_FBDEV) + &gfx_ctx_opendingux_fbdev, +#endif +#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN)) + &gfx_ctx_wgl, +#endif +#if defined(HAVE_WAYLAND) + &gfx_ctx_wayland, +#endif +#if defined(HAVE_X11) && !defined(HAVE_OPENGLES) +#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN) + &gfx_ctx_x, +#endif +#endif +#if defined(HAVE_X11) && defined(HAVE_OPENGL) && defined(HAVE_EGL) + &gfx_ctx_x_egl, +#endif +#if defined(HAVE_KMS) + &gfx_ctx_drm, +#endif +#if defined(ANDROID) + &gfx_ctx_android, +#endif +#if defined(__QNX__) + &gfx_ctx_qnx, +#endif +#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL) + &gfx_ctx_cocoagl, +#endif +#if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE) + &gfx_ctx_cgl, +#endif +#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL) + &gfx_ctx_sdl_gl, +#endif +#ifdef HAVE_OSMESA + &gfx_ctx_osmesa, +#endif +#ifdef EMSCRIPTEN + &gfx_ctx_emscripten, +#endif +#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY) + &gfx_ctx_khr_display, +#endif +#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) + &gfx_ctx_gdi, +#endif +#ifdef HAVE_SIXEL + &gfx_ctx_sixel, +#endif + &gfx_ctx_null, + NULL +}; + +static const shader_backend_t *shader_ctx_drivers[] = { +#ifdef HAVE_GLSL + &gl_glsl_backend, +#endif +#ifdef HAVE_CG + &gl_cg_backend, +#endif + &shader_null_backend, + NULL +}; + +bool video_driver_started_fullscreen(void) +{ + return video_started_fullscreen; +} + +/* Stub functions */ + +static void update_window_title_null(void *data, void *data2) +{ +} + +static void swap_buffers_null(void *data, void *data2) +{ +} + +static bool get_metrics_null(void *data, enum display_metric_types type, + float *value) +{ + return false; +} + +static bool set_resize_null(void *a, unsigned b, unsigned c) +{ + return false; +} + +/** + * video_driver_find_handle: + * @idx : index of driver to get handle to. + * + * Returns: handle to video driver at index. Can be NULL + * if nothing found. + **/ +const void *video_driver_find_handle(int idx) +{ + const void *drv = video_drivers[idx]; + if (!drv) + return NULL; + return drv; +} + +/** + * video_driver_find_ident: + * @idx : index of driver to get handle to. + * + * Returns: Human-readable identifier of video driver at index. Can be NULL + * if nothing found. + **/ +const char *video_driver_find_ident(int idx) +{ + const video_driver_t *drv = video_drivers[idx]; + if (!drv) + return NULL; + return drv->ident; +} + +/** + * config_get_video_driver_options: + * + * Get an enumerated list of all video driver names, separated by '|'. + * + * Returns: string listing of all video driver names, separated by '|'. + **/ +const char* config_get_video_driver_options(void) +{ + return char_list_new_special(STRING_LIST_VIDEO_DRIVERS, NULL); +} + +bool video_driver_is_threaded(void) +{ + return video_driver_is_threaded_internal(); +} + +#ifdef HAVE_VULKAN +static bool hw_render_context_is_vulkan(enum retro_hw_context_type type) +{ + return type == RETRO_HW_CONTEXT_VULKAN; +} +#endif + +#if defined(HAVE_OPENGL) +static bool hw_render_context_is_gl(enum retro_hw_context_type type) +{ + switch (type) + { + case RETRO_HW_CONTEXT_OPENGL: + case RETRO_HW_CONTEXT_OPENGLES2: + case RETRO_HW_CONTEXT_OPENGL_CORE: + case RETRO_HW_CONTEXT_OPENGLES3: + case RETRO_HW_CONTEXT_OPENGLES_VERSION: + return true; + default: + break; + } + + return false; +} +#endif + +bool *video_driver_get_threaded(void) +{ + return &video_driver_threaded; +} + +void video_driver_set_threaded(bool val) +{ + video_driver_threaded = val; +} + +/** + * video_driver_get_ptr: + * + * Use this if you need the real video driver + * and driver data pointers. + * + * Returns: video driver's userdata. + **/ +void *video_driver_get_ptr(bool force_nonthreaded_data) +{ +#ifdef HAVE_THREADS + if (video_driver_is_threaded_internal() && !force_nonthreaded_data) + return video_thread_get_ptr(NULL); +#endif + + return video_driver_data; +} + +const char *video_driver_get_ident(void) +{ + return (current_video) ? current_video->ident : NULL; +} + +const video_poke_interface_t *video_driver_get_poke(void) +{ + return video_driver_poke; +} + +static bool video_context_has_focus(void) +{ + return current_video_context.has_focus && current_video_context.has_focus(video_context_data); +} + +static bool video_driver_has_focus(void) +{ + return current_video && current_video->focus && current_video->focus(video_driver_data); +} + +static bool null_driver_has_focus(void) +{ + return true; +} + +static void video_context_driver_reset(void) +{ + if (!current_video_context.get_metrics) + current_video_context.get_metrics = get_metrics_null; + + if (!current_video_context.update_window_title) + current_video_context.update_window_title = update_window_title_null; + + if (!current_video_context.set_resize) + current_video_context.set_resize = set_resize_null; + + if (!current_video_context.swap_buffers) + current_video_context.swap_buffers = swap_buffers_null; + + if (current_video_context.has_focus) + video_driver_cb_has_focus = video_context_has_focus; + +} + +bool video_context_driver_set(const gfx_ctx_driver_t *data) +{ + if (!data) + return false; + current_video_context = *data; + video_context_driver_reset(); + return true; +} + +void video_context_driver_destroy(void) +{ + current_video_context.init = NULL; + current_video_context.bind_api = NULL; + current_video_context.swap_interval = NULL; + current_video_context.set_video_mode = NULL; + current_video_context.get_video_size = NULL; + current_video_context.get_video_output_size = NULL; + current_video_context.get_video_output_prev = NULL; + current_video_context.get_video_output_next = NULL; + current_video_context.get_metrics = get_metrics_null; + current_video_context.translate_aspect = NULL; + current_video_context.update_window_title = update_window_title_null; + current_video_context.check_window = NULL; + current_video_context.set_resize = set_resize_null; + current_video_context.has_focus = NULL; + current_video_context.suppress_screensaver = NULL; + current_video_context.has_windowed = NULL; + current_video_context.swap_buffers = swap_buffers_null; + current_video_context.input_driver = NULL; + current_video_context.get_proc_address = NULL; + current_video_context.image_buffer_init = NULL; + current_video_context.image_buffer_write = NULL; + current_video_context.show_mouse = NULL; + current_video_context.ident = NULL; + current_video_context.get_flags = NULL; + current_video_context.set_flags = NULL; + current_video_context.bind_hw_render = NULL; + current_video_context.get_context_data = NULL; + current_video_context.make_current = NULL; +} + +/** + * video_driver_get_current_framebuffer: + * + * Gets pointer to current hardware renderer framebuffer object. + * Used by RETRO_ENVIRONMENT_SET_HW_RENDER. + * + * Returns: pointer to hardware framebuffer object, otherwise 0. + **/ +uintptr_t video_driver_get_current_framebuffer(void) +{ + if (video_driver_poke && video_driver_poke->get_current_framebuffer) + return video_driver_poke->get_current_framebuffer(video_driver_data); + return 0; +} + +retro_proc_address_t video_driver_get_proc_address(const char *sym) +{ + if (video_driver_poke && video_driver_poke->get_proc_address) + return video_driver_poke->get_proc_address(video_driver_data, sym); + return NULL; +} + +bool video_driver_set_shader(enum rarch_shader_type type, + const char *path) +{ + if (current_video->set_shader) + return current_video->set_shader(video_driver_data, type, path); + return false; +} + +static void video_driver_filter_free(void) +{ + if (video_driver_state_filter) + rarch_softfilter_free(video_driver_state_filter); + video_driver_state_filter = NULL; + + if (video_driver_state_buffer) + { +#ifdef _3DS + linearFree(video_driver_state_buffer); +#else + free(video_driver_state_buffer); +#endif + } + video_driver_state_buffer = NULL; + + video_driver_state_scale = 0; + video_driver_state_out_bpp = 0; + video_driver_state_out_rgb32 = false; +} + +static void video_driver_init_filter(enum retro_pixel_format colfmt_int) +{ + unsigned pow2_x, pow2_y, maxsize; + void *buf = NULL; + settings_t *settings = config_get_ptr(); + struct retro_game_geometry *geom = &video_driver_av_info.geometry; + unsigned width = geom->max_width; + unsigned height = geom->max_height; + /* Deprecated format. Gets pre-converted. */ + enum retro_pixel_format colfmt = + (colfmt_int == RETRO_PIXEL_FORMAT_0RGB1555) ? + RETRO_PIXEL_FORMAT_RGB565 : colfmt_int; + + if (video_driver_is_hw_context()) + { + RARCH_WARN("Cannot use CPU filters when hardware rendering is used.\n"); + return; + } + + video_driver_state_filter = rarch_softfilter_new( + settings->paths.path_softfilter_plugin, + RARCH_SOFTFILTER_THREADS_AUTO, colfmt, width, height); + + if (!video_driver_state_filter) + { + RARCH_ERR("[Video]: Failed to load filter.\n"); + return; + } + + rarch_softfilter_get_max_output_size(video_driver_state_filter, + &width, &height); + + pow2_x = next_pow2(width); + pow2_y = next_pow2(height); + maxsize = MAX(pow2_x, pow2_y); + video_driver_state_scale = maxsize / RARCH_SCALE_BASE; + video_driver_state_out_rgb32 = rarch_softfilter_get_output_format( + video_driver_state_filter) == + RETRO_PIXEL_FORMAT_XRGB8888; + + video_driver_state_out_bpp = video_driver_state_out_rgb32 ? + sizeof(uint32_t) : + sizeof(uint16_t); + + /* TODO: Aligned output. */ +#ifdef _3DS + buf = linearMemAlign( + width * height * video_driver_state_out_bpp, 0x80); +#else + buf = malloc( + width * height * video_driver_state_out_bpp); +#endif + if (!buf) + { + RARCH_ERR("[Video]: Softfilter initialization failed.\n"); + video_driver_filter_free(); + return; + } + + video_driver_state_buffer = buf; +} + +static void video_driver_init_input(const input_driver_t *tmp) +{ + const input_driver_t **input = input_get_double_ptr(); + if (*input) + return; + + /* Video driver didn't provide an input driver, + * so we use configured one. */ + RARCH_LOG("[Video]: Graphics driver did not initialize an input driver." + " Attempting to pick a suitable driver.\n"); + + if (tmp) + *input = tmp; + else + input_driver_find_driver(); + + /* This should never really happen as tmp (driver.input) is always + * found before this in find_driver_input(), or we have aborted + * in a similar fashion anyways. */ + if (!input_get_ptr()) + goto error; + + if (input_driver_init()) + return; + +error: + RARCH_ERR("[Video]: Cannot initialize input driver. Exiting ...\n"); + retroarch_fail(1, "video_driver_init_input()"); +} + +/** + * video_driver_monitor_compute_fps_statistics: + * + * Computes monitor FPS statistics. + **/ +static void video_driver_monitor_compute_fps_statistics(void) +{ + double avg_fps = 0.0; + double stddev = 0.0; + unsigned samples = 0; + + if (video_driver_frame_time_count < + (2 * MEASURE_FRAME_TIME_SAMPLES_COUNT)) + { + RARCH_LOG( + "[Video]: Does not have enough samples for monitor refresh rate" + " estimation. Requires to run for at least %u frames.\n", + 2 * MEASURE_FRAME_TIME_SAMPLES_COUNT); + return; + } + + if (video_monitor_fps_statistics(&avg_fps, &stddev, &samples)) + { + RARCH_LOG("[Video]: Average monitor Hz: %.6f Hz. (%.3f %% frame time" + " deviation, based on %u last samples).\n", + avg_fps, 100.0 * stddev, samples); + } +} + +static void video_driver_pixel_converter_free(void) +{ + if (!video_driver_scaler_ptr) + return; + + scaler_ctx_gen_reset(video_driver_scaler_ptr->scaler); + + if (video_driver_scaler_ptr->scaler) + free(video_driver_scaler_ptr->scaler); + video_driver_scaler_ptr->scaler = NULL; + + if (video_driver_scaler_ptr->scaler_out) + free(video_driver_scaler_ptr->scaler_out); + video_driver_scaler_ptr->scaler_out = NULL; + + if (video_driver_scaler_ptr) + free(video_driver_scaler_ptr); + video_driver_scaler_ptr = NULL; +} + +static void video_driver_free_internal(void) +{ +#ifdef HAVE_THREADS + bool is_threaded = video_driver_is_threaded_internal(); +#endif + + command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); + + if (!video_driver_is_video_cache_context()) + video_driver_free_hw_context(); + + if ( + !input_driver_owns_driver() && + !input_driver_is_data_ptr_same(video_driver_data) + ) + input_driver_deinit(); + + if ( + !video_driver_data_own + && video_driver_data + && current_video && current_video->free + ) + current_video->free(video_driver_data); + + video_driver_pixel_converter_free(); + video_driver_filter_free(); + + command_event(CMD_EVENT_SHADER_DIR_DEINIT, NULL); + +#ifdef HAVE_THREADS + if (is_threaded) + return; +#endif + + video_driver_monitor_compute_fps_statistics(); +} + +static bool video_driver_pixel_converter_init(unsigned size) +{ + struct retro_hw_render_callback *hwr = + video_driver_get_hw_context(); + void *scalr_out = NULL; + video_pixel_scaler_t *scalr = NULL; + struct scaler_ctx *scalr_ctx = NULL; + + /* If pixel format is not 0RGB1555, we don't need to do + * any internal pixel conversion. */ + if (video_driver_pix_fmt != RETRO_PIXEL_FORMAT_0RGB1555) + return true; + + /* No need to perform pixel conversion for HW rendering contexts. */ + if (hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE) + return true; + + RARCH_WARN("0RGB1555 pixel format is deprecated," + " and will be slower. For 15/16-bit, RGB565" + " format is preferred.\n"); + + scalr = (video_pixel_scaler_t*)calloc(1, sizeof(*scalr)); + + if (!scalr) + goto error; + + video_driver_scaler_ptr = scalr; + + scalr_ctx = (struct scaler_ctx*)calloc(1, sizeof(*scalr_ctx)); + + if (!scalr_ctx) + goto error; + + video_driver_scaler_ptr->scaler = scalr_ctx; + video_driver_scaler_ptr->scaler->scaler_type = SCALER_TYPE_POINT; + video_driver_scaler_ptr->scaler->in_fmt = SCALER_FMT_0RGB1555; + + /* TODO: Pick either ARGB8888 or RGB565 depending on driver. */ + video_driver_scaler_ptr->scaler->out_fmt = SCALER_FMT_RGB565; + + if (!scaler_ctx_gen_filter(scalr_ctx)) + goto error; + + scalr_out = calloc(sizeof(uint16_t), size * size); + + if (!scalr_out) + goto error; + + video_driver_scaler_ptr->scaler_out = scalr_out; + + return true; + +error: + video_driver_pixel_converter_free(); + video_driver_filter_free(); + + return false; +} + +static bool video_driver_init_internal(bool *video_is_threaded) +{ + video_info_t video; + unsigned max_dim, scale, width, height; + video_viewport_t *custom_vp = NULL; + const input_driver_t *tmp = NULL; + rarch_system_info_t *system = NULL; + static uint16_t dummy_pixels[32] = {0}; + settings_t *settings = config_get_ptr(); + struct retro_game_geometry *geom = &video_driver_av_info.geometry; + + if (!string_is_empty(settings->paths.path_softfilter_plugin)) + video_driver_init_filter(video_driver_pix_fmt); + + max_dim = MAX(geom->max_width, geom->max_height); + scale = next_pow2(max_dim) / RARCH_SCALE_BASE; + scale = MAX(scale, 1); + + if (video_driver_state_filter) + scale = video_driver_state_scale; + + /* Update core-dependent aspect ratio values. */ + video_driver_set_viewport_square_pixel(); + video_driver_set_viewport_core(); + video_driver_set_viewport_config(); + + /* Update CUSTOM viewport. */ + custom_vp = video_viewport_get_custom(); + + if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) + { + float default_aspect = aspectratio_lut[ASPECT_RATIO_CORE].value; + aspectratio_lut[ASPECT_RATIO_CUSTOM].value = + (custom_vp->width && custom_vp->height) ? + (float)custom_vp->width / custom_vp->height : default_aspect; + } + + video_driver_set_aspect_ratio_value( + aspectratio_lut[settings->uints.video_aspect_ratio_idx].value); + + if (settings->bools.video_fullscreen|| retroarch_is_forced_fullscreen()) + { + width = settings->uints.video_fullscreen_x; + height = settings->uints.video_fullscreen_y; + } + else + { + /* To-Do: remove when the new window resizing core is hooked */ + if (settings->bools.video_window_save_positions && + (settings->uints.window_position_width || settings->uints.window_position_height)) + { + width = settings->uints.window_position_width; + height = settings->uints.window_position_height; + } + else + { + if (settings->bools.video_force_aspect) + { + /* Do rounding here to simplify integer scale correctness. */ + unsigned base_width = + roundf(geom->base_height * video_driver_get_aspect_ratio()); + width = roundf(base_width * settings->floats.video_scale); + } + else + width = roundf(geom->base_width * settings->floats.video_scale); + height = roundf(geom->base_height * settings->floats.video_scale); +} + } + + if (width && height) + RARCH_LOG("[Video]: Video @ %ux%u\n", width, height); + else + RARCH_LOG("[Video]: Video @ fullscreen\n"); + + video_driver_display_type_set(RARCH_DISPLAY_NONE); + video_driver_display_set(0); + video_driver_window_set(0); + + if (!video_driver_pixel_converter_init(RARCH_SCALE_BASE * scale)) + { + RARCH_ERR("[Video]: Failed to initialize pixel converter.\n"); + goto error; + } + + video.width = width; + video.height = height; + video.fullscreen = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen(); + video.vsync = settings->bools.video_vsync && !rarch_ctl(RARCH_CTL_IS_NONBLOCK_FORCED, NULL); + video.force_aspect = settings->bools.video_force_aspect; + video.font_enable = settings->bools.video_font_enable; + video.swap_interval = settings->uints.video_swap_interval; +#ifdef GEKKO + video.viwidth = settings->uints.video_viwidth; + video.vfilter = settings->bools.video_vfilter; +#endif + video.smooth = settings->bools.video_smooth; + video.input_scale = scale; + video.rgb32 = video_driver_state_filter ? + video_driver_state_out_rgb32 : + (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888); + video.parent = 0; + + video_started_fullscreen = video.fullscreen; + + /* Reset video frame count */ + video_driver_frame_count = 0; + + tmp = input_get_ptr(); + /* Need to grab the "real" video driver interface on a reinit. */ + video_driver_find_driver(); + +#ifdef HAVE_THREADS + video.is_threaded = video_driver_is_threaded_internal(); + *video_is_threaded = video.is_threaded; + + if (video.is_threaded) + { + /* Can't do hardware rendering with threaded driver currently. */ + RARCH_LOG("[Video]: Starting threaded video driver ...\n"); + + if (!video_init_thread((const video_driver_t**)¤t_video, + &video_driver_data, + input_get_double_ptr(), input_driver_get_data_ptr(), + current_video, video)) + { + RARCH_ERR("[Video]: Cannot open threaded video driver ... Exiting ...\n"); + goto error; + } + } + else +#endif + video_driver_data = current_video->init( + &video, input_get_double_ptr(), + input_driver_get_data_ptr()); + + if (!video_driver_data) + { + RARCH_ERR("[Video]: Cannot open video driver ... Exiting ...\n"); + goto error; + } + + if (current_video->focus) + video_driver_cb_has_focus = video_driver_has_focus; + + video_driver_poke = NULL; + if (current_video->poke_interface) + current_video->poke_interface(video_driver_data, &video_driver_poke); + + if (current_video->viewport_info && + (!custom_vp->width || + !custom_vp->height)) + { + /* Force custom viewport to have sane parameters. */ + custom_vp->width = width; + custom_vp->height = height; + + video_driver_get_viewport_info(custom_vp); + } + + system = runloop_get_system_info(); + + video_driver_set_rotation( + (settings->uints.video_rotation + system->rotation) % 4); + + current_video->suppress_screensaver(video_driver_data, + settings->bools.ui_suspend_screensaver_enable); + + video_driver_init_input(tmp); + + command_event(CMD_EVENT_OVERLAY_DEINIT, NULL); + command_event(CMD_EVENT_OVERLAY_INIT, NULL); + + if (!core_is_game_loaded()) + video_driver_cached_frame_set(&dummy_pixels, 4, 4, 8); + +#if defined(PSP) + video_driver_set_texture_frame(&dummy_pixels, false, 1, 1, 1.0f); +#endif + + video_context_driver_reset(); + + video_display_server_init(); + + command_event(CMD_EVENT_SHADER_DIR_INIT, NULL); + + return true; + +error: + retroarch_fail(1, "init_video()"); + return false; +} + +bool video_driver_set_viewport(unsigned width, unsigned height, + bool force_fullscreen, bool allow_rotate) +{ + if (!current_video || !current_video->set_viewport) + return false; + current_video->set_viewport(video_driver_data, width, height, + force_fullscreen, allow_rotate); + return true; +} + +bool video_driver_set_rotation(unsigned rotation) +{ + if (!current_video || !current_video->set_rotation) + return false; + current_video->set_rotation(video_driver_data, rotation); + return true; +} + +bool video_driver_set_video_mode(unsigned width, + unsigned height, bool fullscreen) +{ + gfx_ctx_mode_t mode; + + if (video_driver_poke && video_driver_poke->set_video_mode) + { + video_driver_poke->set_video_mode(video_driver_data, + width, height, fullscreen); + return true; + } + + mode.width = width; + mode.height = height; + mode.fullscreen = fullscreen; + + return video_context_driver_set_video_mode(&mode); +} + +bool video_driver_get_video_output_size(unsigned *width, unsigned *height) +{ + if (!video_driver_poke || !video_driver_poke->get_video_output_size) + return false; + video_driver_poke->get_video_output_size(video_driver_data, + width, height); + return true; +} + +void video_driver_set_osd_msg(const char *msg, const void *data, void *font) +{ + video_frame_info_t video_info; + video_driver_build_info(&video_info); + if (video_driver_poke && video_driver_poke->set_osd_msg) + video_driver_poke->set_osd_msg(video_driver_data, &video_info, msg, data, font); +} + +void video_driver_set_texture_enable(bool enable, bool fullscreen) +{ + if (video_driver_poke && video_driver_poke->set_texture_enable) + video_driver_poke->set_texture_enable(video_driver_data, + enable, fullscreen); +} + +void video_driver_set_texture_frame(const void *frame, bool rgb32, + unsigned width, unsigned height, float alpha) +{ + if (video_driver_poke && video_driver_poke->set_texture_frame) + video_driver_poke->set_texture_frame(video_driver_data, + frame, rgb32, width, height, alpha); +} + +#ifdef HAVE_OVERLAY +bool video_driver_overlay_interface(const video_overlay_interface_t **iface) +{ + if (!current_video || !current_video->overlay_interface) + return false; + current_video->overlay_interface(video_driver_data, iface); + return true; +} +#endif + +void *video_driver_read_frame_raw(unsigned *width, + unsigned *height, size_t *pitch) +{ + if (!current_video || !current_video->read_frame_raw) + return NULL; + return current_video->read_frame_raw(video_driver_data, width, + height, pitch); +} + +void video_driver_set_filtering(unsigned index, bool smooth) +{ + if (video_driver_poke && video_driver_poke->set_filtering) + video_driver_poke->set_filtering(video_driver_data, index, smooth); +} + +void video_driver_cached_frame_set(const void *data, unsigned width, + unsigned height, size_t pitch) +{ + if (data) + frame_cache_data = data; + frame_cache_width = width; + frame_cache_height = height; + frame_cache_pitch = pitch; +} + +void video_driver_cached_frame_get(const void **data, unsigned *width, + unsigned *height, size_t *pitch) +{ + if (data) + *data = frame_cache_data; + if (width) + *width = frame_cache_width; + if (height) + *height = frame_cache_height; + if (pitch) + *pitch = frame_cache_pitch; +} + +void video_driver_get_size(unsigned *width, unsigned *height) +{ +#ifdef HAVE_THREADS + bool is_threaded = video_driver_is_threaded_internal(); + video_driver_threaded_lock(is_threaded); +#endif + if (width) + *width = video_driver_width; + if (height) + *height = video_driver_height; +#ifdef HAVE_THREADS + video_driver_threaded_unlock(is_threaded); +#endif +} + +void video_driver_set_size(unsigned *width, unsigned *height) +{ +#ifdef HAVE_THREADS + bool is_threaded = video_driver_is_threaded_internal(); + video_driver_threaded_lock(is_threaded); +#endif + if (width) + video_driver_width = *width; + if (height) + video_driver_height = *height; +#ifdef HAVE_THREADS + video_driver_threaded_unlock(is_threaded); +#endif +} + +/** + * video_monitor_set_refresh_rate: + * @hz : New refresh rate for monitor. + * + * Sets monitor refresh rate to new value. + **/ +void video_monitor_set_refresh_rate(float hz) +{ + char msg[128]; + settings_t *settings = config_get_ptr(); + + snprintf(msg, sizeof(msg), + "Setting refresh rate to: %.3f Hz.", hz); + runloop_msg_queue_push(msg, 1, 180, false); + RARCH_LOG("%s\n", msg); + + configuration_set_float(settings, + settings->floats.video_refresh_rate, + hz); +} + +/** + * video_monitor_fps_statistics + * @refresh_rate : Monitor refresh rate. + * @deviation : Deviation from measured refresh rate. + * @sample_points : Amount of sampled points. + * + * Gets the monitor FPS statistics based on the current + * runtime. + * + * Returns: true (1) on success. + * false (0) if: + * a) threaded video mode is enabled + * b) less than 2 frame time samples. + * c) FPS monitor enable is off. + **/ +bool video_monitor_fps_statistics(double *refresh_rate, + double *deviation, unsigned *sample_points) +{ + unsigned i; + retro_time_t accum = 0; + retro_time_t avg = 0; + retro_time_t accum_var = 0; + unsigned samples = 0; + +#ifdef HAVE_THREADS + if (video_driver_is_threaded_internal()) + return false; +#endif + + samples = MIN(MEASURE_FRAME_TIME_SAMPLES_COUNT, + (unsigned)video_driver_frame_time_count); + + if (samples < 2) + return false; + + /* Measure statistics on frame time (microsecs), *not* FPS. */ + for (i = 0; i < samples; i++) + { + accum += video_driver_frame_time_samples[i]; +#if 0 + RARCH_LOG("[Video]: Interval #%u: %d usec / frame.\n", + i, (int)frame_time_samples[i]); +#endif + } + + avg = accum / samples; + + /* Drop first measurement. It is likely to be bad. */ + for (i = 0; i < samples; i++) + { + retro_time_t diff = video_driver_frame_time_samples[i] - avg; + accum_var += diff * diff; + } + + *deviation = sqrt((double)accum_var / (samples - 1)) / avg; + + if (refresh_rate) + *refresh_rate = 1000000.0 / avg; + + if (sample_points) + *sample_points = samples; + + return true; +} + +float video_driver_get_aspect_ratio(void) +{ + return video_driver_aspect_ratio; +} + +void video_driver_set_aspect_ratio_value(float value) +{ + video_driver_aspect_ratio = value; +} + +static bool video_driver_frame_filter( + const void *data, + video_frame_info_t *video_info, + unsigned width, unsigned height, + size_t pitch, + unsigned *output_width, unsigned *output_height, + unsigned *output_pitch) +{ + rarch_softfilter_get_output_size(video_driver_state_filter, + output_width, output_height, width, height); + + *output_pitch = (*output_width) * video_driver_state_out_bpp; + + rarch_softfilter_process(video_driver_state_filter, + video_driver_state_buffer, *output_pitch, + data, width, height, pitch); + + if (video_info->post_filter_record && recording_data) + recording_dump_frame(video_driver_state_buffer, + *output_width, *output_height, *output_pitch, + video_info->runloop_is_idle); + + return true; +} + +rarch_softfilter_t *video_driver_frame_filter_get_ptr(void) +{ + return video_driver_state_filter; +} + +enum retro_pixel_format video_driver_get_pixel_format(void) +{ + return video_driver_pix_fmt; +} + +void video_driver_set_pixel_format(enum retro_pixel_format fmt) +{ + video_driver_pix_fmt = fmt; +} + +/** + * video_driver_cached_frame: + * + * Renders the current video frame. + **/ +bool video_driver_cached_frame(void) +{ + void *recording = recording_driver_get_data_ptr(); + + recording_driver_lock(); + + /* Cannot allow recording when pushing duped frames. */ + recording_data = NULL; + + retro_ctx.frame_cb( + (frame_cache_data != RETRO_HW_FRAME_BUFFER_VALID) + ? frame_cache_data : NULL, + frame_cache_width, + frame_cache_height, frame_cache_pitch); + + recording_data = recording; + + recording_driver_unlock(); + + return true; +} + +void video_driver_monitor_adjust_system_rates(void) +{ + float timing_skew = 0.0f; + settings_t *settings = config_get_ptr(); + float video_refresh_rate = settings->floats.video_refresh_rate; + float timing_skew_hz = video_refresh_rate; + const struct retro_system_timing *info = (const struct retro_system_timing*)&video_driver_av_info.timing; + + rarch_ctl(RARCH_CTL_UNSET_NONBLOCK_FORCED, NULL); + + if (!info || info->fps <= 0.0) + return; + + video_driver_core_hz = info->fps; + + if (video_driver_crt_switching_active) + timing_skew_hz = video_driver_core_hz; + timing_skew = fabs( + 1.0f - info->fps / timing_skew_hz); + + if (!settings->bools.vrr_runloop_enable) + { + /* We don't want to adjust pitch too much. If we have extreme cases, + * just don't readjust at all. */ + if (timing_skew <= settings->floats.audio_max_timing_skew) + return; + + RARCH_LOG("[Video]: Timings deviate too much. Will not adjust." + " (Display = %.2f Hz, Game = %.2f Hz)\n", + video_refresh_rate, + (float)info->fps); + } + + if (info->fps <= timing_skew_hz) + return; + + /* We won't be able to do VSync reliably when game FPS > monitor FPS. */ + rarch_ctl(RARCH_CTL_SET_NONBLOCK_FORCED, NULL); + RARCH_LOG("[Video]: Game FPS > Monitor FPS. Cannot rely on VSync.\n"); +} + +void video_driver_menu_settings(void **list_data, void *list_info_data, + void *group_data, void *subgroup_data, const char *parent_group) +{ +#ifdef HAVE_MENU + rarch_setting_t **list = (rarch_setting_t**)list_data; + rarch_setting_info_t *list_info = (rarch_setting_info_t*)list_info_data; + rarch_setting_group_info_t *group_info = (rarch_setting_group_info_t*)group_data; + rarch_setting_group_info_t *subgroup_info = (rarch_setting_group_info_t*)subgroup_data; + global_t *global = global_get_ptr(); + + (void)list; + (void)list_info; + (void)group_info; + (void)subgroup_info; + (void)global; + +#if defined(__CELLOS_LV2__) + CONFIG_BOOL( + list, list_info, + &global->console.screen.pal60_enable, + MENU_ENUM_LABEL_PAL60_ENABLE, + MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, + false, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); +#endif +#if defined(GEKKO) || defined(_XBOX360) + CONFIG_UINT( + list, list_info, + &global->console.screen.gamma_correction, + MENU_ENUM_LABEL_VIDEO_GAMMA, + MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, + 0, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + menu_settings_list_current_add_cmd( + list, + list_info, + CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); + menu_settings_list_current_add_range( + list, + list_info, + 0, + MAX_GAMMA_SETTING, + 1, + true, + true); + settings_data_list_current_add_flags(list, list_info, + SD_FLAG_CMD_APPLY_AUTO|SD_FLAG_ADVANCED); +#endif +#if defined(_XBOX1) || defined(HW_RVL) + CONFIG_BOOL( + list, list_info, + &global->console.softfilter_enable, + MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, + MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, + false, + MENU_ENUM_LABEL_VALUE_OFF, + MENU_ENUM_LABEL_VALUE_ON, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler, + SD_FLAG_NONE); + menu_settings_list_current_add_cmd( + list, + list_info, + CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); +#endif +#ifdef _XBOX1 + CONFIG_UINT( + list, list_info, + &global->console.screen.flicker_filter_index, + MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, + MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, + 0, + group_info, + subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + menu_settings_list_current_add_range(list, list_info, + 0, 5, 1, true, true); +#endif +#endif +} + +static void video_driver_lock_new(void) +{ + video_driver_lock_free(); +#ifdef HAVE_THREADS + if (!display_lock) + display_lock = slock_new(); + retro_assert(display_lock); + + if (!context_lock) + context_lock = slock_new(); + retro_assert(context_lock); +#endif +} + +void video_driver_destroy(void) +{ + video_display_server_destroy(); + crt_video_restore(); + + video_driver_cb_has_focus = null_driver_has_focus; + video_driver_use_rgba = false; + video_driver_data_own = false; + video_driver_active = false; + video_driver_cache_context = false; + video_driver_cache_context_ack = false; + video_driver_record_gpu_buffer = NULL; + current_video = NULL; + video_driver_set_cached_frame_ptr(NULL); +} + +void video_driver_set_cached_frame_ptr(const void *data) +{ + if (data) + frame_cache_data = data; +} + +void video_driver_set_stub_frame(void) +{ + frame_bak = current_video->frame; + current_video->frame = video_null.frame; +} + +void video_driver_unset_stub_frame(void) +{ + if (frame_bak != NULL) + current_video->frame = frame_bak; + + frame_bak = NULL; +} + +bool video_driver_is_stub_frame(void) +{ + return current_video->frame == video_null.frame; +} + +bool video_driver_supports_recording(void) +{ + settings_t *settings = config_get_ptr(); + return settings->bools.video_gpu_record + && current_video->read_viewport; +} + +bool video_driver_supports_viewport_read(void) +{ + settings_t *settings = config_get_ptr(); + return (settings->bools.video_gpu_screenshot || + (video_driver_is_hw_context() && !current_video->read_frame_raw)) + && current_video->read_viewport && current_video->viewport_info; +} + +bool video_driver_supports_read_frame_raw(void) +{ + if (current_video->read_frame_raw) + return true; + return false; +} + +void video_driver_set_viewport_config(void) +{ + settings_t *settings = config_get_ptr(); + + if (settings->floats.video_aspect_ratio < 0.0f) + { + struct retro_game_geometry *geom = &video_driver_av_info.geometry; + + if (geom->aspect_ratio > 0.0f && + settings->bools.video_aspect_ratio_auto) + aspectratio_lut[ASPECT_RATIO_CONFIG].value = geom->aspect_ratio; + else + { + unsigned base_width = geom->base_width; + unsigned base_height = geom->base_height; + + /* Get around division by zero errors */ + if (base_width == 0) + base_width = 1; + if (base_height == 0) + base_height = 1; + aspectratio_lut[ASPECT_RATIO_CONFIG].value = + (float)base_width / base_height; /* 1:1 PAR. */ + } + } + else + { + aspectratio_lut[ASPECT_RATIO_CONFIG].value = + settings->floats.video_aspect_ratio; + } +} + +void video_driver_set_viewport_square_pixel(void) +{ + unsigned len, highest, i, aspect_x, aspect_y; + struct retro_game_geometry *geom = &video_driver_av_info.geometry; + unsigned width = geom->base_width; + unsigned height = geom->base_height; + + if (width == 0 || height == 0) + return; + + len = MIN(width, height); + highest = 1; + + for (i = 1; i < len; i++) + { + if ((width % i) == 0 && (height % i) == 0) + highest = i; + } + + aspect_x = width / highest; + aspect_y = height / highest; + + snprintf(aspectratio_lut[ASPECT_RATIO_SQUARE].name, + sizeof(aspectratio_lut[ASPECT_RATIO_SQUARE].name), + "1:1 PAR (%u:%u DAR)", aspect_x, aspect_y); + + aspectratio_lut[ASPECT_RATIO_SQUARE].value = (float)aspect_x / aspect_y; +} + +void video_driver_set_viewport_core(void) +{ + struct retro_game_geometry *geom = &video_driver_av_info.geometry; + + if (!geom || geom->base_width <= 0.0f || geom->base_height <= 0.0f) + return; + + /* Fallback to 1:1 pixel ratio if none provided */ + if (geom->aspect_ratio > 0.0f) + aspectratio_lut[ASPECT_RATIO_CORE].value = geom->aspect_ratio; + else + aspectratio_lut[ASPECT_RATIO_CORE].value = + (float)geom->base_width / geom->base_height; +} + +void video_driver_reset_custom_viewport(void) +{ + struct video_viewport *custom_vp = video_viewport_get_custom(); + + custom_vp->width = 0; + custom_vp->height = 0; + custom_vp->x = 0; + custom_vp->y = 0; +} + +void video_driver_set_rgba(void) +{ + video_driver_lock(); + video_driver_use_rgba = true; + video_driver_unlock(); +} + +void video_driver_unset_rgba(void) +{ + video_driver_lock(); + video_driver_use_rgba = false; + video_driver_unlock(); +} + +bool video_driver_supports_rgba(void) +{ + bool tmp; + video_driver_lock(); + tmp = video_driver_use_rgba; + video_driver_unlock(); + return tmp; +} + +bool video_driver_get_next_video_out(void) +{ + if (!video_driver_poke) + return false; + + if (!video_driver_poke->get_video_output_next) + return video_context_driver_get_video_output_next(); + video_driver_poke->get_video_output_next(video_driver_data); + return true; +} + +bool video_driver_get_prev_video_out(void) +{ + if (!video_driver_poke) + return false; + + if (!video_driver_poke->get_video_output_prev) + return video_context_driver_get_video_output_prev(); + video_driver_poke->get_video_output_prev(video_driver_data); + return true; +} + +bool video_driver_init(bool *video_is_threaded) +{ + video_driver_lock_new(); + video_driver_filter_free(); + video_driver_set_cached_frame_ptr(NULL); + return video_driver_init_internal(video_is_threaded); +} + +void video_driver_destroy_data(void) +{ + video_driver_data = NULL; +} + +void video_driver_free(void) +{ + video_driver_free_internal(); + video_driver_lock_free(); + video_driver_data = NULL; + video_driver_set_cached_frame_ptr(NULL); +} + +void video_driver_monitor_reset(void) +{ + video_driver_frame_time_count = 0; +} + +void video_driver_set_aspect_ratio(void) +{ + settings_t *settings = config_get_ptr(); + + switch (settings->uints.video_aspect_ratio_idx) + { + case ASPECT_RATIO_SQUARE: + video_driver_set_viewport_square_pixel(); + break; + + case ASPECT_RATIO_CORE: + video_driver_set_viewport_core(); + break; + + case ASPECT_RATIO_CONFIG: + video_driver_set_viewport_config(); + break; + + default: + break; + } + + video_driver_set_aspect_ratio_value( + aspectratio_lut[settings->uints.video_aspect_ratio_idx].value); + + if (!video_driver_poke || !video_driver_poke->set_aspect_ratio) + return; + video_driver_poke->set_aspect_ratio( + video_driver_data, settings->uints.video_aspect_ratio_idx); +} + +void video_driver_update_viewport(struct video_viewport* vp, bool force_full, bool keep_aspect) +{ + gfx_ctx_aspect_t aspect_data; + float device_aspect = (float)vp->full_width / vp->full_height; + settings_t* settings = config_get_ptr(); + + aspect_data.aspect = &device_aspect; + aspect_data.width = vp->full_width; + aspect_data.height = vp->full_height; + + video_context_driver_translate_aspect(&aspect_data); + + vp->x = 0; + vp->y = 0; + vp->width = vp->full_width; + vp->height = vp->full_height; + + if (settings->bools.video_scale_integer && !force_full) + { + video_viewport_get_scaled_integer( + vp, vp->full_width, vp->full_height, video_driver_get_aspect_ratio(), keep_aspect); + } + else if (keep_aspect && !force_full) + { + float desired_aspect = video_driver_get_aspect_ratio(); + +#if defined(HAVE_MENU) + if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) + { + const struct video_viewport* custom = video_viewport_get_custom(); + + vp->x = custom->x; + vp->y = custom->y; + vp->width = custom->width; + vp->height = custom->height; + } + else +#endif + { + float delta; + + if (fabsf(device_aspect - desired_aspect) < 0.0001f) + { + /* If the aspect ratios of screen and desired aspect + * ratio are sufficiently equal (floating point stuff), + * assume they are actually equal. + */ + } + else if (device_aspect > desired_aspect) + { + delta = (desired_aspect / device_aspect - 1.0f) + / 2.0f + 0.5f; + vp->x = (int)roundf(vp->full_width * (0.5f - delta)); + vp->width = (unsigned)roundf(2.0f * vp->full_width * delta); + vp->y = 0; + vp->height = vp->full_height; + } + else + { + vp->x = 0; + vp->width = vp->full_width; + delta = (device_aspect / desired_aspect - 1.0f) + / 2.0f + 0.5f; + vp->y = (int)roundf(vp->full_height * (0.5f - delta)); + vp->height = (unsigned)roundf(2.0f * vp->full_height * delta); + } + } + } + +#if defined(RARCH_MOBILE) + /* In portrait mode, we want viewport to gravitate to top of screen. */ + if (device_aspect < 1.0f) + vp->y = 0; +#endif +} + +void video_driver_show_mouse(void) +{ + if (video_driver_poke && video_driver_poke->show_mouse) + video_driver_poke->show_mouse(video_driver_data, true); +} + +void video_driver_hide_mouse(void) +{ + if (video_driver_poke && video_driver_poke->show_mouse) + video_driver_poke->show_mouse(video_driver_data, false); +} + +void video_driver_set_nonblock_state(bool toggle) +{ + if (current_video->set_nonblock_state) + current_video->set_nonblock_state(video_driver_data, toggle); +} + +bool video_driver_find_driver(void) +{ + int i; + driver_ctx_info_t drv; + settings_t *settings = config_get_ptr(); + + if (video_driver_is_hw_context()) + { + struct retro_hw_render_callback *hwr = video_driver_get_hw_context(); + + current_video = NULL; + + (void)hwr; + +#if defined(HAVE_VULKAN) + if (hwr && hw_render_context_is_vulkan(hwr->context_type)) + { + RARCH_LOG("[Video]: Using HW render, Vulkan driver forced.\n"); + current_video = &video_vulkan; + } +#endif + +#if defined(HAVE_OPENGL) + if (hwr && hw_render_context_is_gl(hwr->context_type)) + { + RARCH_LOG("[Video]: Using HW render, OpenGL driver forced.\n"); + current_video = &video_gl; + } +#endif + + if (current_video) + return true; + } + + if (frontend_driver_has_get_video_driver_func()) + { + current_video = (video_driver_t*)frontend_driver_get_video_driver(); + + if (current_video) + return true; + RARCH_WARN("Frontend supports get_video_driver() but did not specify one.\n"); + } + + drv.label = "video_driver"; + drv.s = settings->arrays.video_driver; + + driver_ctl(RARCH_DRIVER_CTL_FIND_INDEX, &drv); + + i = (int)drv.len; + + if (i >= 0) + current_video = (video_driver_t*)video_driver_find_handle(i); + else + { + if (verbosity_is_enabled()) + { + unsigned d; + RARCH_ERR("Couldn't find any video driver named \"%s\"\n", + settings->arrays.video_driver); + RARCH_LOG_OUTPUT("Available video drivers are:\n"); + for (d = 0; video_driver_find_handle(d); d++) + RARCH_LOG_OUTPUT("\t%s\n", video_driver_find_ident(d)); + RARCH_WARN("Going to default to first video driver...\n"); + } + + current_video = (video_driver_t*)video_driver_find_handle(0); + + if (!current_video) + retroarch_fail(1, "find_video_driver()"); + } + return true; +} + +void video_driver_apply_state_changes(void) +{ + if (video_driver_poke && + video_driver_poke->apply_state_changes) + video_driver_poke->apply_state_changes(video_driver_data); +} + +bool video_driver_read_viewport(uint8_t *buffer, bool is_idle) +{ + if ( current_video->read_viewport + && current_video->read_viewport( + video_driver_data, buffer, is_idle)) + return true; + return false; +} + +bool video_driver_frame_filter_alive(void) +{ + return !!video_driver_state_filter; +} + +bool video_driver_frame_filter_is_32bit(void) +{ + return video_driver_state_out_rgb32; +} + +void video_driver_default_settings(void) +{ + global_t *global = global_get_ptr(); + + if (!global) + return; + + global->console.screen.gamma_correction = DEFAULT_GAMMA; + global->console.flickerfilter_enable = false; + global->console.softfilter_enable = false; + + global->console.screen.resolutions.current.id = 0; +} + +void video_driver_load_settings(config_file_t *conf) +{ + bool tmp_bool = false; + global_t *global = global_get_ptr(); + + if (!conf) + return; + +#ifdef _XBOX + CONFIG_GET_BOOL_BASE(conf, global, + console.screen.gamma_correction, "gamma_correction"); +#else + CONFIG_GET_INT_BASE(conf, global, + console.screen.gamma_correction, "gamma_correction"); +#endif + + if (config_get_bool(conf, "flicker_filter_enable", + &tmp_bool)) + global->console.flickerfilter_enable = tmp_bool; + + if (config_get_bool(conf, "soft_filter_enable", + &tmp_bool)) + global->console.softfilter_enable = tmp_bool; + + CONFIG_GET_INT_BASE(conf, global, + console.screen.soft_filter_index, + "soft_filter_index"); + CONFIG_GET_INT_BASE(conf, global, + console.screen.resolutions.current.id, + "current_resolution_id"); + CONFIG_GET_INT_BASE(conf, global, + console.screen.flicker_filter_index, + "flicker_filter_index"); +} + +void video_driver_save_settings(config_file_t *conf) +{ + global_t *global = global_get_ptr(); + if (!conf) + return; + +#ifdef _XBOX + config_set_bool(conf, "gamma_correction", + global->console.screen.gamma_correction); +#else + config_set_int(conf, "gamma_correction", + global->console.screen.gamma_correction); +#endif + config_set_bool(conf, "flicker_filter_enable", + global->console.flickerfilter_enable); + config_set_bool(conf, "soft_filter_enable", + global->console.softfilter_enable); + + config_set_int(conf, "soft_filter_index", + global->console.screen.soft_filter_index); + config_set_int(conf, "current_resolution_id", + global->console.screen.resolutions.current.id); + config_set_int(conf, "flicker_filter_index", + global->console.screen.flicker_filter_index); +} + +void video_driver_reinit(void) +{ + struct retro_hw_render_callback *hwr = + video_driver_get_hw_context(); + + if (hwr->cache_context) + video_driver_cache_context = true; + else + video_driver_cache_context = false; + + video_driver_cache_context_ack = false; + command_event(CMD_EVENT_RESET_CONTEXT, NULL); + video_driver_cache_context = false; +} + +void video_driver_set_own_driver(void) +{ + video_driver_data_own = true; +} + +void video_driver_unset_own_driver(void) +{ + video_driver_data_own = false; +} + +bool video_driver_owns_driver(void) +{ + return video_driver_data_own; +} + +bool video_driver_is_hw_context(void) +{ + bool is_hw_context = false; + + video_driver_context_lock(); + is_hw_context = (hw_render.context_type != RETRO_HW_CONTEXT_NONE); + video_driver_context_unlock(); + + return is_hw_context; +} + +void video_driver_free_hw_context(void) +{ + video_driver_context_lock(); + + if (hw_render.context_destroy) + hw_render.context_destroy(); + + memset(&hw_render, 0, sizeof(hw_render)); + + video_driver_context_unlock(); + + hw_render_context_negotiation = NULL; +} + +struct retro_hw_render_callback *video_driver_get_hw_context(void) +{ + return &hw_render; +} + +const struct retro_hw_render_context_negotiation_interface * + video_driver_get_context_negotiation_interface(void) +{ + return hw_render_context_negotiation; +} + +void video_driver_set_context_negotiation_interface( + const struct retro_hw_render_context_negotiation_interface *iface) +{ + hw_render_context_negotiation = iface; +} + +bool video_driver_is_video_cache_context(void) +{ + return video_driver_cache_context; +} + +void video_driver_set_video_cache_context_ack(void) +{ + video_driver_cache_context_ack = true; +} + +void video_driver_unset_video_cache_context_ack(void) +{ + video_driver_cache_context_ack = false; +} + +bool video_driver_is_video_cache_context_ack(void) +{ + return video_driver_cache_context_ack; +} + +void video_driver_set_active(void) +{ + video_driver_active = true; +} + +void video_driver_unset_active(void) +{ + video_driver_active = false; +} + +bool video_driver_is_active(void) +{ + return video_driver_active; +} + +void video_driver_get_record_status( + bool *has_gpu_record, + uint8_t **gpu_buf) +{ + *gpu_buf = video_driver_record_gpu_buffer; + *has_gpu_record = video_driver_record_gpu_buffer != NULL; +} + +bool video_driver_gpu_record_init(unsigned size) +{ + video_driver_record_gpu_buffer = (uint8_t*)malloc(size); + if (!video_driver_record_gpu_buffer) + return false; + return true; +} + +void video_driver_gpu_record_deinit(void) +{ + free(video_driver_record_gpu_buffer); + video_driver_record_gpu_buffer = NULL; +} + +bool video_driver_get_current_software_framebuffer( + struct retro_framebuffer *fb) +{ + if ( + video_driver_poke + && video_driver_poke->get_current_software_framebuffer + && video_driver_poke->get_current_software_framebuffer( + video_driver_data, fb)) + return true; + + return false; +} + +bool video_driver_get_hw_render_interface( + const struct retro_hw_render_interface **iface) +{ + if ( + video_driver_poke + && video_driver_poke->get_hw_render_interface + && video_driver_poke->get_hw_render_interface( + video_driver_data, iface)) + return true; + + return false; +} + +bool video_driver_get_viewport_info(struct video_viewport *viewport) +{ + if (!current_video || !current_video->viewport_info) + return false; + current_video->viewport_info(video_driver_data, viewport); + return true; +} + +void video_driver_set_title_buf(void) +{ + struct retro_system_info info; + core_get_system_info(&info); + + fill_pathname_join_concat_noext( + video_driver_title_buf, + msg_hash_to_str(MSG_PROGRAM), + " ", + info.library_name, + sizeof(video_driver_title_buf)); + strlcat(video_driver_title_buf, + " ", sizeof(video_driver_title_buf)); + strlcat(video_driver_title_buf, + info.library_version, + sizeof(video_driver_title_buf)); +} + +/** + * video_viewport_get_scaled_integer: + * @vp : Viewport handle + * @width : Width. + * @height : Height. + * @aspect_ratio : Aspect ratio (in float). + * @keep_aspect : Preserve aspect ratio? + * + * Gets viewport scaling dimensions based on + * scaled integer aspect ratio. + **/ +void video_viewport_get_scaled_integer(struct video_viewport *vp, + unsigned width, unsigned height, + float aspect_ratio, bool keep_aspect) +{ + int padding_x = 0; + int padding_y = 0; + settings_t *settings = config_get_ptr(); + + if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM) + { + struct video_viewport *custom = video_viewport_get_custom(); + + if (custom) + { + padding_x = width - custom->width; + padding_y = height - custom->height; + width = custom->width; + height = custom->height; + } + } + else + { + unsigned base_width; + /* Use system reported sizes as these define the + * geometry for the "normal" case. */ + unsigned base_height = + video_driver_av_info.geometry.base_height; + + if (base_height == 0) + base_height = 1; + + /* Account for non-square pixels. + * This is sort of contradictory with the goal of integer scale, + * but it is desirable in some cases. + * + * If square pixels are used, base_height will be equal to + * system->av_info.base_height. */ + base_width = (unsigned)roundf(base_height * aspect_ratio); + + /* Make sure that we don't get 0x scale ... */ + if (width >= base_width && height >= base_height) + { + if (keep_aspect) + { + /* X/Y scale must be same. */ + unsigned max_scale = MIN(width / base_width, + height / base_height); + padding_x = width - base_width * max_scale; + padding_y = height - base_height * max_scale; + } + else + { + /* X/Y can be independent, each scaled as much as possible. */ + padding_x = width % base_width; + padding_y = height % base_height; + } + } + + width -= padding_x; + height -= padding_y; + } + + vp->width = width; + vp->height = height; + vp->x = padding_x / 2; + vp->y = padding_y / 2; +} + +struct retro_system_av_info *video_viewport_get_system_av_info(void) +{ + return &video_driver_av_info; +} + +struct video_viewport *video_viewport_get_custom(void) +{ + settings_t *settings = config_get_ptr(); + return &settings->video_viewport_custom; +} + +unsigned video_pixel_get_alignment(unsigned pitch) +{ + if (pitch & 1) + return 1; + if (pitch & 2) + return 2; + if (pitch & 4) + return 4; + return 8; +} + +/** + * video_driver_frame: + * @data : pointer to data of the video frame. + * @width : width of the video frame. + * @height : height of the video frame. + * @pitch : pitch of the video frame. + * + * Video frame render callback function. + **/ +void video_driver_frame(const void *data, unsigned width, + unsigned height, size_t pitch) +{ + static char video_driver_msg[256]; + static char title[256]; + video_frame_info_t video_info; + static retro_time_t curr_time; + static retro_time_t fps_time; + static float last_fps, frame_time; + unsigned output_width = 0; + unsigned output_height = 0; + unsigned output_pitch = 0; + const char *msg = NULL; + retro_time_t new_time = + cpu_features_get_time_usec(); + + if (!video_driver_active) + return; + + if (video_driver_scaler_ptr && data && + (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_0RGB1555) && + (data != RETRO_HW_FRAME_BUFFER_VALID)) + { + if (video_pixel_frame_scale( + video_driver_scaler_ptr->scaler, + video_driver_scaler_ptr->scaler_out, + data, width, height, pitch)) + { + data = video_driver_scaler_ptr->scaler_out; + pitch = video_driver_scaler_ptr->scaler->out_stride; + } + } + + if (data) + frame_cache_data = data; + frame_cache_width = width; + frame_cache_height = height; + frame_cache_pitch = pitch; + + video_driver_build_info(&video_info); + + /* Get the amount of frames per seconds. */ + if (video_driver_frame_count) + { + unsigned write_index = + video_driver_frame_time_count++ & + (MEASURE_FRAME_TIME_SAMPLES_COUNT - 1); + frame_time = new_time - fps_time; + video_driver_frame_time_samples[write_index] = frame_time; + fps_time = new_time; + + if (video_driver_frame_count == 1) + strlcpy(title, video_driver_window_title, sizeof(title)); + + if ((video_driver_frame_count % FPS_UPDATE_INTERVAL) == 0) + { + char frames_text[64]; + last_fps = TIME_TO_FPS(curr_time, new_time, FPS_UPDATE_INTERVAL); + + if (video_info.fps_show || video_info.framecount_show) + { + if (video_info.fps_show) + { + snprintf(video_info.fps_text, sizeof(video_info.fps_text), + " || FPS: %6.1f ", last_fps); + } + if (video_info.framecount_show) + { + snprintf(frames_text, + sizeof(frames_text), + " || Frames: %" PRIu64, + (uint64_t)video_driver_frame_count); + } + snprintf(video_driver_window_title, sizeof(video_driver_window_title), + "%s%s%s", title, + video_info.fps_show ? video_info.fps_text : "", + video_info.framecount_show ? frames_text : ""); + } + else + { + if (!string_is_equal(video_driver_window_title, title)) + strlcpy(video_driver_window_title, title, sizeof(video_driver_window_title)); + } + + curr_time = new_time; + video_driver_window_title_update = true; + } + + if (video_info.fps_show) + { + if (video_info.framecount_show) + snprintf( + video_info.fps_text, + sizeof(video_info.fps_text), + "FPS: %6.1f || %s: %" PRIu64, + last_fps, + msg_hash_to_str(MSG_FRAMES), + (uint64_t)video_driver_frame_count); + else + snprintf( + video_info.fps_text, + sizeof(video_info.fps_text), + "FPS: %6.1f", + last_fps); + } + + if (video_info.fps_show && video_info.framecount_show) + snprintf( + video_info.fps_text, + sizeof(video_info.fps_text), + "FPS: %6.1f || %s: %" PRIu64, + last_fps, + msg_hash_to_str(MSG_FRAMES), + (uint64_t)video_driver_frame_count); + else if (video_info.framecount_show) + snprintf( + video_info.fps_text, + sizeof(video_info.fps_text), + "%s: %" PRIu64, + msg_hash_to_str(MSG_FRAMES), + (uint64_t)video_driver_frame_count); + else if (video_info.fps_show) + snprintf( + video_info.fps_text, + sizeof(video_info.fps_text), + "FPS: %6.1f", + last_fps); + } + else + { + + curr_time = fps_time = new_time; + + strlcpy(video_driver_window_title, + video_driver_title_buf, + sizeof(video_driver_window_title)); + + if (video_info.fps_show) + strlcpy(video_info.fps_text, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), + sizeof(video_info.fps_text)); + + video_driver_window_title_update = true; + } + + video_info.frame_rate = last_fps; + video_info.frame_time = frame_time / 1000.0f; + video_info.frame_count = (uint64_t) video_driver_frame_count; + + /* Slightly messy code, + * but we really need to do processing before blocking on VSync + * for best possible scheduling. + */ + if ( + ( + !video_driver_state_filter + || !video_info.post_filter_record + || !data + || video_driver_record_gpu_buffer + ) && recording_data + ) + recording_dump_frame(data, width, height, + pitch, video_info.runloop_is_idle); + + if (data && video_driver_state_filter && + video_driver_frame_filter(data, &video_info, width, height, pitch, + &output_width, &output_height, &output_pitch)) + { + data = video_driver_state_buffer; + width = output_width; + height = output_height; + pitch = output_pitch; + } + + video_driver_msg[0] = '\0'; + + if ( video_info.font_enable + && runloop_msg_queue_pull((const char**)&msg) + && msg) + { +#ifdef HAVE_THREADS + /* the msg pointer may point to data modified by another thread */ + runloop_msg_queue_lock(); +#endif + strlcpy(video_driver_msg, msg, sizeof(video_driver_msg)); +#ifdef HAVE_THREADS + runloop_msg_queue_unlock(); +#endif + } + + if (video_info.statistics_show) + { + audio_statistics_t audio_stats = {0.0f}; + double stddev = 0.0; + struct retro_system_av_info *av_info = &video_driver_av_info; + unsigned red = 255; + unsigned green = 255; + unsigned blue = 255; + unsigned alpha = 255; + + video_monitor_fps_statistics(NULL, &stddev, NULL); + + video_info.osd_stat_params.x = 0.010f; + video_info.osd_stat_params.y = 0.950f; + video_info.osd_stat_params.scale = 1.0f; + video_info.osd_stat_params.full_screen = true; + video_info.osd_stat_params.drop_x = -2; + video_info.osd_stat_params.drop_y = -2; + video_info.osd_stat_params.drop_mod = 0.3f; + video_info.osd_stat_params.drop_alpha = 1.0f; + video_info.osd_stat_params.color = COLOR_ABGR( + red, green, blue, alpha); + + compute_audio_buffer_statistics(&audio_stats); + + snprintf(video_info.stat_text, + sizeof(video_info.stat_text), + "Video Statistics:\n -Frame rate: %6.2f fps\n -Frame time: %6.2f ms\n -Frame time deviation: %.3f %%\n" + " -Frame count: %" PRIu64"\n -Viewport: %d x %d x %3.2f\n" + "Audio Statistics:\n -Average buffer saturation: %.2f %%\n -Standard deviation: %.2f %%\n -Time spent close to underrun: %.2f %%\n -Time spent close to blocking: %.2f %%\n -Sample count: %d\n" + "Core Geometry:\n -Size: %u x %u\n -Max Size: %u x %u\n -Aspect: %3.2f\nCore Timing:\n -FPS: %3.2f\n -Sample Rate: %6.2f\n", + video_info.frame_rate, + video_info.frame_time, + 100.0 * stddev, + video_info.frame_count, + video_info.width, + video_info.height, + video_info.refresh_rate, + audio_stats.average_buffer_saturation, + audio_stats.std_deviation_percentage, + audio_stats.close_to_underrun, + audio_stats.close_to_blocking, + audio_stats.samples, + av_info->geometry.base_width, + av_info->geometry.base_height, + av_info->geometry.max_width, + av_info->geometry.max_height, + av_info->geometry.aspect_ratio, + av_info->timing.fps, + av_info->timing.sample_rate); + + /* TODO/FIXME - add OSD chat text here */ +#if 0 + snprintf(video_info.chat_text, sizeof(video_info.chat_text), + "anon: does retroarch netplay have in-game chat?\nradius: I don't know \u2605"); +#endif + } + + video_driver_active = current_video->frame( + video_driver_data, data, width, height, + video_driver_frame_count, + (unsigned)pitch, video_driver_msg, &video_info); + + video_driver_frame_count++; + + /* Display the FPS, with a higher priority. */ + if (video_info.fps_show || video_info.framecount_show) + runloop_msg_queue_push(video_info.fps_text, 2, 1, true); + + /* trigger set resolution*/ + if (video_info.crt_switch_resolution) + { + video_driver_crt_switching_active = true; + + if (video_info.crt_switch_resolution_super == 2560) + width = 2560; + if (video_info.crt_switch_resolution_super == 3840) + width = 3840; + if (video_info.crt_switch_resolution_super == 1920) + width = 1920; + crt_switch_res_core(width, height, video_driver_core_hz, video_info.crt_switch_resolution, video_info.crt_switch_center_adjust, video_info.monitor_index); + } + else if (!video_info.crt_switch_resolution) + video_driver_crt_switching_active = false; + + /* trigger set resolution*/ +} + +void crt_switch_driver_reinit(void) +{ + video_driver_reinit(); +} + +void video_driver_display_type_set(enum rarch_display_type type) +{ + video_driver_display_type = type; +} + +uintptr_t video_driver_display_get(void) +{ + return video_driver_display; +} + +void video_driver_display_set(uintptr_t idx) +{ + video_driver_display = idx; +} + +enum rarch_display_type video_driver_display_type_get(void) +{ + return video_driver_display_type; +} + +void video_driver_window_set(uintptr_t idx) +{ + video_driver_window = idx; +} + +uintptr_t video_driver_window_get(void) +{ + return video_driver_window; +} + +bool video_driver_texture_load(void *data, + enum texture_filter_type filter_type, + uintptr_t *id) +{ + if (!id || !video_driver_poke || !video_driver_poke->load_texture) + return false; + + *id = video_driver_poke->load_texture(video_driver_data, data, + video_driver_is_threaded_internal(), + filter_type); + + return true; +} + +bool video_driver_texture_unload(uintptr_t *id) +{ + if (!video_driver_poke || !video_driver_poke->unload_texture) + return false; + + video_driver_poke->unload_texture(video_driver_data, *id); + *id = 0; + return true; +} + +static bool video_driver_cb_set_coords(void *handle_data, + void *shader_data, const struct video_coords *coords) +{ + video_shader_ctx_coords_t ctx_coords; + ctx_coords.handle_data = handle_data; + ctx_coords.data = coords; + + video_driver_set_coords(&ctx_coords); + return true; +} + +void video_driver_build_info(video_frame_info_t *video_info) +{ + bool is_perfcnt_enable = false; + bool is_paused = false; + bool is_idle = false; + bool is_slowmotion = false; + settings_t *settings = NULL; + video_viewport_t *custom_vp = NULL; + struct retro_hw_render_callback *hwr = + video_driver_get_hw_context(); +#ifdef HAVE_THREADS + bool is_threaded = video_driver_is_threaded_internal(); + video_driver_threaded_lock(is_threaded); +#endif + settings = config_get_ptr(); + custom_vp = &settings->video_viewport_custom; + video_info->refresh_rate = settings->floats.video_refresh_rate; + video_info->crt_switch_resolution = settings->uints.crt_switch_resolution; + video_info->crt_switch_resolution_super = settings->uints.crt_switch_resolution_super; + video_info->crt_switch_center_adjust = settings->ints.crt_switch_center_adjust; + video_info->black_frame_insertion = settings->bools.video_black_frame_insertion; + video_info->hard_sync = settings->bools.video_hard_sync; + video_info->hard_sync_frames = settings->uints.video_hard_sync_frames; + video_info->fps_show = settings->bools.video_fps_show; + video_info->statistics_show = settings->bools.video_statistics_show; + video_info->framecount_show = settings->bools.video_framecount_show; + video_info->scale_integer = settings->bools.video_scale_integer; + video_info->aspect_ratio_idx = settings->uints.video_aspect_ratio_idx; + video_info->post_filter_record = settings->bools.video_post_filter_record; + video_info->input_menu_swap_ok_cancel_buttons = settings->bools.input_menu_swap_ok_cancel_buttons; + video_info->max_swapchain_images = settings->uints.video_max_swapchain_images; + video_info->windowed_fullscreen = settings->bools.video_windowed_fullscreen; + video_info->fullscreen = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen(); + video_info->monitor_index = settings->uints.video_monitor_index; + video_info->shared_context = settings->bools.video_shared_context; + + if (libretro_get_shared_context() && hwr && hwr->context_type != RETRO_HW_CONTEXT_NONE) + video_info->shared_context = true; + + video_info->font_enable = settings->bools.video_font_enable; + video_info->font_msg_pos_x = settings->floats.video_msg_pos_x; + video_info->font_msg_pos_y = settings->floats.video_msg_pos_y; + video_info->font_msg_color_r = settings->floats.video_msg_color_r; + video_info->font_msg_color_g = settings->floats.video_msg_color_g; + video_info->font_msg_color_b = settings->floats.video_msg_color_b; + video_info->custom_vp_x = custom_vp->x; + video_info->custom_vp_y = custom_vp->y; + video_info->custom_vp_width = custom_vp->width; + video_info->custom_vp_height = custom_vp->height; + video_info->custom_vp_full_width = custom_vp->full_width; + video_info->custom_vp_full_height = custom_vp->full_height; + + video_info->fps_text[0] = '\0'; + + video_info->width = video_driver_width; + video_info->height = video_driver_height; + + video_info->use_rgba = video_driver_use_rgba; + + video_info->libretro_running = false; + video_info->msg_bgcolor_enable = settings->bools.video_msg_bgcolor_enable; + +#ifdef HAVE_MENU + video_info->menu_is_alive = menu_driver_is_alive(); + video_info->menu_footer_opacity = settings->floats.menu_footer_opacity; + video_info->menu_header_opacity = settings->floats.menu_header_opacity; + video_info->materialui_color_theme = settings->uints.menu_materialui_color_theme; + video_info->ozone_color_theme = settings->uints.menu_ozone_color_theme; + video_info->menu_shader_pipeline = settings->uints.menu_xmb_shader_pipeline; + video_info->xmb_theme = settings->uints.menu_xmb_theme; + video_info->xmb_color_theme = settings->uints.menu_xmb_color_theme; + video_info->timedate_enable = settings->bools.menu_timedate_enable; + video_info->battery_level_enable = settings->bools.menu_battery_level_enable; + video_info->xmb_shadows_enable = settings->bools.menu_xmb_shadows_enable; + video_info->xmb_alpha_factor = settings->uints.menu_xmb_alpha_factor; + video_info->menu_wallpaper_opacity = settings->floats.menu_wallpaper_opacity; + video_info->menu_framebuffer_opacity = settings->floats.menu_framebuffer_opacity; + + video_info->libretro_running = core_is_game_loaded(); +#else + video_info->menu_is_alive = false; + video_info->menu_footer_opacity = 0.0f; + video_info->menu_header_opacity = 0.0f; + video_info->materialui_color_theme = 0; + video_info->menu_shader_pipeline = 0; + video_info->xmb_color_theme = 0; + video_info->xmb_theme = 0; + video_info->timedate_enable = false; + video_info->battery_level_enable = false; + video_info->xmb_shadows_enable = false; + video_info->xmb_alpha_factor = 0.0f; + video_info->menu_framebuffer_opacity = 0.0f; + video_info->menu_wallpaper_opacity = 0.0f; +#endif + + runloop_get_status(&is_paused, &is_idle, &is_slowmotion, &is_perfcnt_enable); + + video_info->is_perfcnt_enable = is_perfcnt_enable; + video_info->runloop_is_paused = is_paused; + video_info->runloop_is_idle = is_idle; + video_info->runloop_is_slowmotion = is_slowmotion; + + video_info->input_driver_nonblock_state = input_driver_is_nonblock_state(); + + video_info->context_data = video_context_data; + video_info->shader_driver = current_shader; + video_info->shader_data = current_shader_data; + + video_info->cb_update_window_title = current_video_context.update_window_title; + video_info->cb_swap_buffers = current_video_context.swap_buffers; + video_info->cb_get_metrics = current_video_context.get_metrics; + video_info->cb_set_resize = current_video_context.set_resize; + + video_info->cb_set_mvp = video_driver_cb_shader_set_mvp; + + video_info->userdata = video_driver_get_ptr(false); + +#ifdef HAVE_THREADS + video_driver_threaded_unlock(is_threaded); +#endif +} + +/** + * video_driver_translate_coord_viewport: + * @mouse_x : Pointer X coordinate. + * @mouse_y : Pointer Y coordinate. + * @res_x : Scaled X coordinate. + * @res_y : Scaled Y coordinate. + * @res_screen_x : Scaled screen X coordinate. + * @res_screen_y : Scaled screen Y coordinate. + * + * Translates pointer [X,Y] coordinates into scaled screen + * coordinates based on viewport info. + * + * Returns: true (1) if successful, false if video driver doesn't support + * viewport info. + **/ +bool video_driver_translate_coord_viewport( + struct video_viewport *vp, + int mouse_x, int mouse_y, + int16_t *res_x, int16_t *res_y, + int16_t *res_screen_x, int16_t *res_screen_y) +{ + int scaled_screen_x, scaled_screen_y, scaled_x, scaled_y; + int norm_vp_width = (int)vp->width; + int norm_vp_height = (int)vp->height; + int norm_full_vp_width = (int)vp->full_width; + int norm_full_vp_height = (int)vp->full_height; + + if (norm_full_vp_width <= 0 || norm_full_vp_height <= 0) + return false; + + if (mouse_x >= 0 && mouse_x <= norm_full_vp_width) + scaled_screen_x = ((2 * mouse_x * 0x7fff) + / norm_full_vp_width) - 0x7fff; + else + scaled_screen_x = -0x8000; /* OOB */ + + if (mouse_y >= 0 && mouse_y <= norm_full_vp_height) + scaled_screen_y = ((2 * mouse_y * 0x7fff) + / norm_full_vp_height) - 0x7fff; + else + scaled_screen_y = -0x8000; /* OOB */ + + mouse_x -= vp->x; + mouse_y -= vp->y; + + if (mouse_x >= 0 && mouse_x <= norm_vp_width) + scaled_x = ((2 * mouse_x * 0x7fff) + / norm_vp_width) - 0x7fff; + else + scaled_x = -0x8000; /* OOB */ + + if (mouse_y >= 0 && mouse_y <= norm_vp_height) + scaled_y = ((2 * mouse_y * 0x7fff) + / norm_vp_height) - 0x7fff; + else + scaled_y = -0x8000; /* OOB */ + + *res_x = scaled_x; + *res_y = scaled_y; + *res_screen_x = scaled_screen_x; + *res_screen_y = scaled_screen_y; + + return true; +} + +void video_driver_get_window_title(char *buf, unsigned len) +{ + if (buf && video_driver_window_title_update) + { + strlcpy(buf, video_driver_window_title, len); + video_driver_window_title_update = false; + } +} + +void video_driver_get_status(uint64_t *frame_count, bool * is_alive, + bool *is_focused) +{ + *frame_count = video_driver_frame_count; + *is_alive = current_video ? + current_video->alive(video_driver_data) : true; + *is_focused = video_driver_cb_has_focus(); +} + +/** + * find_video_context_driver_driver_index: + * @ident : Identifier of resampler driver to find. + * + * Finds graphics context driver index by @ident name. + * + * Returns: graphics context driver index if driver was found, otherwise + * -1. + **/ +static int find_video_context_driver_index(const char *ident) +{ + unsigned i; + for (i = 0; gfx_ctx_drivers[i]; i++) + if (string_is_equal_noncase(ident, gfx_ctx_drivers[i]->ident)) + return i; + return -1; +} + +/** + * find_prev_context_driver: + * + * Finds previous driver in graphics context driver array. + **/ +bool video_context_driver_find_prev_driver(void) +{ + settings_t *settings = config_get_ptr(); + int i = find_video_context_driver_index( + settings->arrays.video_context_driver); + + if (i > 0) + { + strlcpy(settings->arrays.video_context_driver, + gfx_ctx_drivers[i - 1]->ident, + sizeof(settings->arrays.video_context_driver)); + return true; + } + + RARCH_WARN("Couldn't find any previous video context driver.\n"); + return false; +} + +/** + * find_next_context_driver: + * + * Finds next driver in graphics context driver array. + **/ +bool video_context_driver_find_next_driver(void) +{ + settings_t *settings = config_get_ptr(); + int i = find_video_context_driver_index( + settings->arrays.video_context_driver); + + if (i >= 0 && gfx_ctx_drivers[i + 1]) + { + strlcpy(settings->arrays.video_context_driver, + gfx_ctx_drivers[i + 1]->ident, + sizeof(settings->arrays.video_context_driver)); + return true; + } + + RARCH_WARN("Couldn't find any next video context driver.\n"); + return false; +} + +/** + * video_context_driver_init: + * @data : Input data. + * @ctx : Graphics context driver to initialize. + * @ident : Identifier of graphics context driver to find. + * @api : API of higher-level graphics API. + * @major : Major version number of higher-level graphics API. + * @minor : Minor version number of higher-level graphics API. + * @hw_render_ctx : Request a graphics context driver capable of + * hardware rendering? + * + * Initialize graphics context driver. + * + * Returns: graphics context driver if successfully initialized, + * otherwise NULL. + **/ +static const gfx_ctx_driver_t *video_context_driver_init( + void *data, + const gfx_ctx_driver_t *ctx, + const char *ident, + enum gfx_ctx_api api, unsigned major, + unsigned minor, bool hw_render_ctx, + void **ctx_data) +{ + video_frame_info_t video_info; + + if (!ctx->bind_api(data, api, major, minor)) + { + RARCH_WARN("Failed to bind API (#%u, version %u.%u)" + " on context driver \"%s\".\n", + (unsigned)api, major, minor, ctx->ident); + + return NULL; + } + + video_driver_build_info(&video_info); + + if (!(*ctx_data = ctx->init(&video_info, data))) + return NULL; + + if (ctx->bind_hw_render) + ctx->bind_hw_render(*ctx_data, + video_info.shared_context && hw_render_ctx); + + return ctx; +} + +/** + * video_context_driver_init_first: + * @data : Input data. + * @ident : Identifier of graphics context driver to find. + * @api : API of higher-level graphics API. + * @major : Major version number of higher-level graphics API. + * @minor : Minor version number of higher-level graphics API. + * @hw_render_ctx : Request a graphics context driver capable of + * hardware rendering? + * + * Finds first suitable graphics context driver and initializes. + * + * Returns: graphics context driver if found, otherwise NULL. + **/ +const gfx_ctx_driver_t *video_context_driver_init_first(void *data, + const char *ident, enum gfx_ctx_api api, unsigned major, + unsigned minor, bool hw_render_ctx, void **ctx_data) +{ + int i = find_video_context_driver_index(ident); + + if (i >= 0) + { + const gfx_ctx_driver_t *ctx = video_context_driver_init(data, gfx_ctx_drivers[i], ident, + api, major, minor, hw_render_ctx, ctx_data); + if (ctx) + { + video_context_data = *ctx_data; + return ctx; + } + } + + for (i = 0; gfx_ctx_drivers[i]; i++) + { + const gfx_ctx_driver_t *ctx = + video_context_driver_init(data, gfx_ctx_drivers[i], ident, + api, major, minor, hw_render_ctx, ctx_data); + + if (ctx) + { + video_context_data = *ctx_data; + return ctx; + } + } + + return NULL; +} + +bool video_context_driver_init_image_buffer(const video_info_t *data) +{ + if ( + current_video_context.image_buffer_init + && current_video_context.image_buffer_init( + video_context_data, data)) + return true; + return false; +} + +bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img) +{ + if ( + current_video_context.image_buffer_write + && current_video_context.image_buffer_write(video_context_data, + img->frame, img->width, img->height, img->pitch, + img->rgb32, img->index, img->handle)) + return true; + return false; +} + +bool video_context_driver_get_video_output_prev(void) +{ + if (!current_video_context.get_video_output_prev) + return false; + current_video_context.get_video_output_prev(video_context_data); + return true; +} + +bool video_context_driver_get_video_output_next(void) +{ + if (!current_video_context.get_video_output_next) + return false; + current_video_context.get_video_output_next(video_context_data); + return true; +} + +void video_context_driver_make_current(bool release) +{ + if (current_video_context.make_current) + current_video_context.make_current(release); +} + +bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect) +{ + if (!video_context_data || !aspect) + return false; + if (!current_video_context.translate_aspect) + return false; + *aspect->aspect = current_video_context.translate_aspect( + video_context_data, aspect->width, aspect->height); + return true; +} + +void video_context_driver_free(void) +{ + if (current_video_context.destroy) + current_video_context.destroy(video_context_data); + video_context_driver_destroy(); + video_context_data = NULL; +} + +bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data) +{ + if (!size_data) + return false; + if (!current_video_context.get_video_output_size) + return false; + current_video_context.get_video_output_size(video_context_data, + size_data->width, size_data->height); + return true; +} + +bool video_context_driver_swap_interval(int *interval) +{ + gfx_ctx_flags_t flags; + int current_interval = *interval; + settings_t *settings = config_get_ptr(); + bool adaptive_vsync_enabled = video_driver_get_all_flags(&flags, GFX_CTX_FLAGS_ADAPTIVE_VSYNC) && settings->bools.video_adaptive_vsync; + + if (!current_video_context.swap_interval) + return false; + if (adaptive_vsync_enabled && current_interval == 1) + current_interval = -1; + current_video_context.swap_interval(video_context_data, current_interval); + return true; +} + +bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc) +{ + if (!current_video_context.get_proc_address) + return false; + + proc->addr = current_video_context.get_proc_address(proc->sym); + + return true; +} + +bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics) +{ + if ( + current_video_context.get_metrics(video_context_data, + metrics->type, + metrics->value)) + return true; + return false; +} + +bool video_context_driver_get_refresh_rate(float *refresh_rate) +{ + float refresh_holder = 0; + + if (!current_video_context.get_refresh_rate || !refresh_rate) + return false; + if (!video_context_data) + return false; + + if (!video_driver_crt_switching_active) + if (refresh_rate) + *refresh_rate = + current_video_context.get_refresh_rate(video_context_data); + + if (video_driver_crt_switching_active) + { + if (refresh_rate) + refresh_holder = + current_video_context.get_refresh_rate(video_context_data); + if (refresh_holder != video_driver_core_hz) /* Fix for incorrect interlace detsction -- HARD SET VSNC TO REQUIRED REFRESH FOR CRT*/ + *refresh_rate = video_driver_core_hz; + } + + return true; +} + +bool video_context_driver_input_driver(gfx_ctx_input_t *inp) +{ + settings_t *settings = config_get_ptr(); + const char *joypad_name = settings ? + settings->arrays.input_joypad_driver : NULL; + + if (!current_video_context.input_driver) + return false; + current_video_context.input_driver( + video_context_data, joypad_name, + inp->input, inp->input_data); + return true; +} + +bool video_context_driver_suppress_screensaver(bool *bool_data) +{ + if ( video_context_data + && current_video_context.suppress_screensaver( + video_context_data, *bool_data)) + return true; + return false; +} + +bool video_context_driver_get_ident(gfx_ctx_ident_t *ident) +{ + if (!ident) + return false; + ident->ident = current_video_context.ident; + return true; +} + +bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info) +{ + video_frame_info_t video_info; + + if (!current_video_context.set_video_mode) + return false; + + video_driver_build_info(&video_info); + + if (!current_video_context.set_video_mode( + video_context_data, &video_info, mode_info->width, + mode_info->height, mode_info->fullscreen)) + return false; + return true; +} + +bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info) +{ + if (!current_video_context.get_video_size) + return false; + current_video_context.get_video_size(video_context_data, + &mode_info->width, &mode_info->height); + return true; +} + +bool video_context_driver_show_mouse(bool *bool_data) +{ + if (!current_video_context.show_mouse) + return false; + current_video_context.show_mouse(video_context_data, *bool_data); + return true; +} + +static bool video_context_driver_get_flags(gfx_ctx_flags_t *flags) +{ + if (!current_video_context.get_flags) + return false; + + if (deferred_video_context_driver_set_flags) + { + flags->flags = deferred_flag_data.flags; + deferred_video_context_driver_set_flags = false; + return true; + } + + flags->flags = current_video_context.get_flags(video_context_data); + return true; +} + +static bool video_driver_get_flags(gfx_ctx_flags_t *flags) +{ + if (!video_driver_poke || !video_driver_poke->get_flags) + return false; + flags->flags = video_driver_poke->get_flags(video_driver_data); + return true; +} + +bool video_driver_get_all_flags(gfx_ctx_flags_t *flags, enum display_flags flag) +{ + if (!flags) + return false; + + if (video_driver_get_flags(flags)) + if (BIT32_GET(flags->flags, flag)) + return true; + + flags->flags = 0; + + if (video_context_driver_get_flags(flags)) + if (BIT32_GET(flags->flags, flag)) + return true; + + return false; +} + +bool video_context_driver_set_flags(gfx_ctx_flags_t *flags) +{ + if (!flags) + return false; + if (!current_video_context.set_flags) + { + deferred_flag_data.flags = flags->flags; + deferred_video_context_driver_set_flags = true; + return false; + } + + current_video_context.set_flags(video_context_data, flags->flags); + return true; +} + +enum gfx_ctx_api video_context_driver_get_api(void) +{ + enum gfx_ctx_api ctx_api = video_context_data ? + current_video_context.get_api(video_context_data) : GFX_CTX_NONE; + + if (ctx_api == GFX_CTX_NONE) + { + const char *video_driver = video_driver_get_ident(); + if (string_is_equal(video_driver, "d3d9")) + return GFX_CTX_DIRECT3D9_API; + else if (string_is_equal(video_driver, "d3d10")) + return GFX_CTX_DIRECT3D10_API; + else if (string_is_equal(video_driver, "d3d11")) + return GFX_CTX_DIRECT3D11_API; + else if (string_is_equal(video_driver, "d3d12")) + return GFX_CTX_DIRECT3D12_API; + else if (string_is_equal(video_driver, "gx2")) + return GFX_CTX_GX2_API; + else if (string_is_equal(video_driver, "gx")) + return GFX_CTX_GX_API; + else if (string_is_equal(video_driver, "gl")) + return GFX_CTX_OPENGL_API; + else if (string_is_equal(video_driver, "vulkan")) + return GFX_CTX_VULKAN_API; + else if (string_is_equal(video_driver, "metal")) + return GFX_CTX_METAL_API; + + return GFX_CTX_NONE; + } + + return ctx_api; +} + +bool video_driver_has_windowed(void) +{ +#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)) + if (video_driver_data && current_video->has_windowed) + return current_video->has_windowed(video_driver_data); + else if (video_context_data && current_video_context.has_windowed) + return current_video_context.has_windowed(video_context_data); +#endif + return false; +} + +bool video_driver_cached_frame_has_valid_framebuffer(void) +{ + if (frame_cache_data) + return (frame_cache_data == RETRO_HW_FRAME_BUFFER_VALID); + return false; +} + +static const shader_backend_t *video_shader_set_backend( + enum rarch_shader_type type) +{ + switch (type) + { + case RARCH_SHADER_CG: + { +#ifdef HAVE_CG + gfx_ctx_flags_t flags; + flags.flags = 0; + video_context_driver_get_flags(&flags); + + if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT)) + { + RARCH_ERR("[Shader driver]: Cg cannot be used with core" + " GL context. Trying to fall back to GLSL...\n"); + return video_shader_set_backend(RARCH_SHADER_GLSL); + } + + RARCH_LOG("[Shader driver]: Using Cg shader backend.\n"); + return &gl_cg_backend; +#else + break; +#endif + } + case RARCH_SHADER_GLSL: +#ifdef HAVE_GLSL + RARCH_LOG("[Shader driver]: Using GLSL shader backend.\n"); + return &gl_glsl_backend; +#else + break; +#endif + case RARCH_SHADER_HLSL: + case RARCH_SHADER_NONE: + default: + break; + } + + return NULL; +} + +bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident) +{ + if (!ident || !current_shader) + return false; + ident->ident = current_shader->ident; + return true; +} + +bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader) +{ + void *video_driver = video_driver_get_ptr(true); + const video_poke_interface_t *video_poke = video_driver_get_poke(); + + shader->data = NULL; + if (!video_poke || !video_driver || !video_poke->get_current_shader) + return false; + shader->data = video_poke->get_current_shader(video_driver); + return true; +} + +bool video_shader_driver_deinit(void) +{ + if (!current_shader) + return false; + + if (current_shader->deinit) + current_shader->deinit(current_shader_data); + + current_shader_data = NULL; + current_shader = NULL; + return true; +} + +static bool video_driver_cb_set_mvp(void *data, + void *shader_data, const void *mat_data) +{ + video_shader_ctx_mvp_t mvp; + mvp.data = data; + mvp.matrix = mat_data; + + video_driver_set_mvp(&mvp); + return true; +} + +static void video_shader_driver_scale_null(void *data, + unsigned idx, struct gfx_fbo_scale *scale) +{ + (void)idx; + (void)scale; +} + +static void video_shader_driver_reset_to_defaults(void) +{ + if (!current_shader) + return; + + if (current_shader->set_mvp) + video_driver_cb_shader_set_mvp = current_shader->set_mvp; + else + { + current_shader->set_mvp = video_driver_cb_set_mvp; + video_driver_cb_shader_set_mvp = video_driver_cb_set_mvp; + } + if (!current_shader->set_coords) + current_shader->set_coords = video_driver_cb_set_coords; + + if (!current_shader->shader_scale) + current_shader->shader_scale = video_shader_driver_scale_null; +} + +/* Finds first suitable shader context driver. */ +bool video_shader_driver_init_first(void) +{ + current_shader = (shader_backend_t*)shader_ctx_drivers[0]; + video_shader_driver_reset_to_defaults(); + return true; +} + +bool video_shader_driver_init(video_shader_ctx_init_t *init) +{ + void *tmp = NULL; + settings_t *settings = config_get_ptr(); + + if (!init->shader || !init->shader->init) + { + init->shader = video_shader_set_backend(init->shader_type); + + if (!init->shader) + return false; + } + + tmp = init->shader->init(init->data, init->path); + + if (!tmp) + return false; + + if (string_is_equal(settings->arrays.menu_driver, "xmb") + && init->shader->init_menu_shaders) + { + RARCH_LOG("Setting up menu pipeline shaders for XMB ... \n"); + init->shader->init_menu_shaders(tmp); + } + + init->shader_data = tmp; + current_shader_data = tmp; + + RARCH_LOG("Resetting shader to defaults ... \n"); + + current_shader = (shader_backend_t*)init->shader; + video_shader_driver_reset_to_defaults(); + + return true; +} + +bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler) +{ + if (!scaler || !scaler->scale) + return false; + + scaler->scale->valid = false; + + current_shader->shader_scale(current_shader_data, + scaler->idx, scaler->scale); + return true; +} + +bool video_shader_driver_info(video_shader_ctx_info_t *shader_info) +{ + if (!shader_info) + return false; + + shader_info->num = current_shader->num_shaders(current_shader_data); + + return true; +} + +void video_driver_set_coords(video_shader_ctx_coords_t *coords) +{ + if (current_shader && current_shader->set_coords) + current_shader->set_coords(coords->handle_data, + current_shader_data, + (const struct video_coords*)coords->data); + else + { + if (video_driver_poke && video_driver_poke->set_coords) + video_driver_poke->set_coords(coords->handle_data, + current_shader_data, + (const struct video_coords*)coords->data); + } +} + +void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp) +{ + if (!mvp || !mvp->matrix) + return; + + if (current_shader && current_shader->set_mvp) + current_shader->set_mvp(mvp->data, + current_shader_data, mvp->matrix); + else + { + if (video_driver_poke && video_driver_poke->set_mvp) + video_driver_poke->set_mvp(mvp->data, + current_shader_data, mvp->matrix); + } +} + +float video_driver_get_refresh_rate(void) +{ + if (video_driver_poke && video_driver_poke->get_refresh_rate) + return video_driver_poke->get_refresh_rate(video_driver_data); + + return 0.0f; +} diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 0221aabb6d..5b65e83b8f 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -1,1274 +1,1274 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef __VIDEO_DRIVER__H -#define __VIDEO_DRIVER__H - -#include -#include -#include - -#include -#include -#include - -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif - -#ifdef HAVE_OVERLAY -#include "../input/input_overlay.h" -#endif - -#include "video_defines.h" -#include "video_coord_array.h" -#include "video_filter.h" -#include "video_shader_parse.h" - -#include "../input/input_types.h" - -#define RARCH_SCALE_BASE 256 - -#include "video_shader_parse.h" - -#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1) -#define VIDEO_SHADER_MENU (GFX_MAX_SHADERS - 2) -#define VIDEO_SHADER_MENU_2 (GFX_MAX_SHADERS - 3) -#define VIDEO_SHADER_MENU_3 (GFX_MAX_SHADERS - 4) -#define VIDEO_SHADER_MENU_4 (GFX_MAX_SHADERS - 5) -#define VIDEO_SHADER_MENU_5 (GFX_MAX_SHADERS - 6) -#define VIDEO_SHADER_MENU_6 (GFX_MAX_SHADERS - 7) - -#if defined(_XBOX360) -#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL -#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL) -#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL -#elif defined(__CELLOS_LV2__) || defined(HAVE_CG) -#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG -#else -#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE -#endif - -RETRO_BEGIN_DECLS - -#ifndef MAX_EGLIMAGE_TEXTURES -#define MAX_EGLIMAGE_TEXTURES 32 -#endif - -#define MAX_VARIABLES 64 - -enum -{ - TEXTURES = 8, - TEXTURESMASK = TEXTURES - 1 -}; - -struct LinkInfo -{ - unsigned tex_w, tex_h; - struct video_shader_pass *pass; -}; - -enum gfx_ctx_api -{ - GFX_CTX_NONE = 0, - GFX_CTX_OPENGL_API, - GFX_CTX_OPENGL_ES_API, - GFX_CTX_DIRECT3D8_API, - GFX_CTX_DIRECT3D9_API, - GFX_CTX_DIRECT3D10_API, - GFX_CTX_DIRECT3D11_API, - GFX_CTX_DIRECT3D12_API, - GFX_CTX_OPENVG_API, - GFX_CTX_VULKAN_API, - GFX_CTX_SIXEL_API, - GFX_CTX_METAL_API, - GFX_CTX_GDI_API, - GFX_CTX_GX_API, - GFX_CTX_GX2_API -}; - -enum display_metric_types -{ - DISPLAY_METRIC_NONE = 0, - DISPLAY_METRIC_MM_WIDTH, - DISPLAY_METRIC_MM_HEIGHT, - DISPLAY_METRIC_DPI -}; - -enum display_flags -{ - GFX_CTX_FLAGS_NONE = 0, - GFX_CTX_FLAGS_GL_CORE_CONTEXT, - GFX_CTX_FLAGS_MULTISAMPLING, - GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES, - GFX_CTX_FLAGS_HARD_SYNC, - GFX_CTX_FLAGS_BLACK_FRAME_INSERTION, - GFX_CTX_FLAGS_MENU_FRAME_FILTERING, - GFX_CTX_FLAGS_ADAPTIVE_VSYNC -}; - -enum shader_uniform_type -{ - UNIFORM_1F = 0, - UNIFORM_2F, - UNIFORM_3F, - UNIFORM_4F, - UNIFORM_1FV, - UNIFORM_2FV, - UNIFORM_3FV, - UNIFORM_4FV, - UNIFORM_1I -}; - -enum shader_program_type -{ - SHADER_PROGRAM_VERTEX = 0, - SHADER_PROGRAM_FRAGMENT, - SHADER_PROGRAM_COMBINED -}; - -struct shader_program_info -{ - bool is_file; - const char *vertex; - const char *fragment; - const char *combined; - unsigned idx; - void *data; -}; - -struct uniform_info -{ - bool enabled; - - int32_t location; - int32_t count; - unsigned type; /* shader uniform type */ - - struct - { - enum shader_program_type type; - const char *ident; - uint32_t idx; - bool add_prefix; - bool enable; - } lookup; - - struct - { - struct - { - intptr_t v0; - intptr_t v1; - intptr_t v2; - intptr_t v3; - } integer; - - intptr_t *integerv; - - struct - { - uintptr_t v0; - uintptr_t v1; - uintptr_t v2; - uintptr_t v3; - } unsigned_integer; - - uintptr_t *unsigned_integerv; - - struct - { - float v0; - float v1; - float v2; - float v3; - } f; - - float *floatv; - } result; -}; - -typedef struct shader_backend -{ - void *(*init)(void *data, const char *path); - void (*init_menu_shaders)(void *data); - void (*deinit)(void *data); - - /* Set shader parameters. */ - void (*set_params)(void *data, void *shader_data); - - void (*set_uniform_parameter)(void *data, struct uniform_info *param, - void *uniform_data); - - /* Compile a shader program. */ - bool (*compile_program)(void *data, unsigned idx, - void *program_data, struct shader_program_info *program_info); - - /* Use a shader program specified by variable 'index'. */ - void (*use)(void *data, void *shader_data, unsigned index, bool set_active); - - /* Returns the number of currently loaded shaders. */ - unsigned (*num_shaders)(void *data); - - bool (*filter_type)(void *data, unsigned index, bool *smooth); - enum gfx_wrap_type (*wrap_type)(void *data, unsigned index); - void (*shader_scale)(void *data, - unsigned index, struct gfx_fbo_scale *scale); - bool (*set_coords)(void *handle_data, - void *shader_data, const struct video_coords *coords); - bool (*set_mvp)(void *data, void *shader_data, - const void *mat_data); - unsigned (*get_prev_textures)(void *data); - bool (*get_feedback_pass)(void *data, unsigned *pass); - bool (*mipmap_input)(void *data, unsigned index); - - struct video_shader *(*get_current_shader)(void *data); - - enum rarch_shader_type type; - - /* Human readable string. */ - const char *ident; -} shader_backend_t; - -typedef struct video_shader_ctx_init -{ - enum rarch_shader_type shader_type; - const char *path; - const shader_backend_t *shader; - void *data; - void *shader_data; - struct - { - bool core_context_enabled; - } gl; -} video_shader_ctx_init_t; - -typedef struct video_shader_ctx_params -{ - unsigned width; - unsigned height; - unsigned tex_width; - unsigned tex_height; - unsigned out_width; - unsigned out_height; - unsigned frame_counter; - unsigned fbo_info_cnt; - void *data; - const void *info; - const void *prev_info; - const void *feedback_info; - const void *fbo_info; -} video_shader_ctx_params_t; - -typedef struct video_shader_ctx_coords -{ - void *handle_data; - const void *data; -} video_shader_ctx_coords_t; - -typedef struct video_shader_ctx_scale -{ - unsigned idx; - struct gfx_fbo_scale *scale; -} video_shader_ctx_scale_t; - -typedef struct video_shader_ctx_info -{ - bool set_active; - unsigned num; - unsigned idx; - void *data; -} video_shader_ctx_info_t; - -typedef struct video_shader_ctx_mvp -{ - void *data; - const void *matrix; -} video_shader_ctx_mvp_t; - -typedef struct video_shader_ctx_filter -{ - unsigned index; - bool *smooth; -} video_shader_ctx_filter_t; - -typedef struct video_shader_ctx -{ - struct video_shader *data; -} video_shader_ctx_t; - -typedef struct video_shader_ctx_ident -{ - const char *ident; -} video_shader_ctx_ident_t; - -typedef struct video_shader_ctx_texture -{ - unsigned id; -} video_shader_ctx_texture_t; - -typedef void (*gfx_ctx_proc_t)(void); - -typedef struct video_info -{ - /* Launch in fullscreen mode instead of windowed mode. */ - bool fullscreen; - - /* Start with V-Sync enabled. */ - bool vsync; - - /* If true, the output image should have the aspect ratio - * as set in aspect_ratio. */ - bool force_aspect; - - bool font_enable; - - /* Width of window. - * If fullscreen mode is requested, - * a width of 0 means the resolution of the - * desktop should be used. */ - unsigned width; - - /* Height of window. - * If fullscreen mode is requested, - * a height of 0 means the resolutiof the desktop should be used. - */ - unsigned height; - - int swap_interval; - -#ifdef GEKKO - bool vfilter; -#endif - - /* If true, applies bilinear filtering to the image, - * otherwise nearest filtering. */ - bool smooth; - - bool is_threaded; - - /* Use 32bit RGBA rather than native RGB565/XBGR1555. - * - * XRGB1555 format is 16-bit and has byte ordering: 0RRRRRGGGGGBBBBB, - * in native endian. - * - * ARGB8888 is AAAAAAAARRRRRRRRGGGGGGGGBBBBBBBB, native endian. - * Alpha channel should be disregarded. - * */ - bool rgb32; - -#ifdef GEKKO - /* TODO - we can't really have driver system-specific - * variables in here. There should be some - * kind of publicly accessible driver implementation - * video struct for specific things like this. - */ - - /* Wii-specific settings. Ignored for everything else. */ - unsigned viwidth; -#endif - - /* - * input_scale defines the maximum size of the picture that will - * ever be used with the frame callback. - * - * The maximum resolution is a multiple of 256x256 size (RARCH_SCALE_BASE), - * so an input scale of 2 means you should allocate a texture or of 512x512. - * - * Maximum input size: RARCH_SCALE_BASE * input_scale - */ - unsigned input_scale; - - uintptr_t parent; -} video_info_t; - -typedef struct video_frame_info -{ - bool input_menu_swap_ok_cancel_buttons; - bool input_driver_nonblock_state; - bool shared_context; - bool black_frame_insertion; - bool hard_sync; - bool fps_show; - bool statistics_show; - bool framecount_show; - bool scale_integer; - bool post_filter_record; - bool windowed_fullscreen; - bool fullscreen; - bool font_enable; - bool use_rgba; - bool libretro_running; - bool xmb_shadows_enable; - bool battery_level_enable; - bool timedate_enable; - bool runloop_is_slowmotion; - bool runloop_is_idle; - bool runloop_is_paused; - bool is_perfcnt_enable; - bool menu_is_alive; - bool msg_bgcolor_enable; - - int custom_vp_x; - int custom_vp_y; - int crt_switch_center_adjust; - - unsigned hard_sync_frames; - unsigned aspect_ratio_idx; - unsigned max_swapchain_images; - unsigned monitor_index; - unsigned crt_switch_resolution; - unsigned crt_switch_resolution_super; - unsigned width; - unsigned height; - unsigned xmb_theme; - unsigned xmb_color_theme; - unsigned menu_shader_pipeline; - unsigned materialui_color_theme; - unsigned ozone_color_theme; - unsigned custom_vp_width; - unsigned custom_vp_height; - unsigned custom_vp_full_width; - unsigned custom_vp_full_height; - - float menu_wallpaper_opacity; - float menu_framebuffer_opacity; - float menu_header_opacity; - float menu_footer_opacity; - float refresh_rate; - float font_msg_pos_x; - float font_msg_pos_y; - float font_msg_color_r; - float font_msg_color_g; - float font_msg_color_b; - float xmb_alpha_factor; - - char fps_text[128]; - char stat_text[512]; - char chat_text[256]; - - uint64_t frame_count; - float frame_time; - float frame_rate; - - struct - { - float x; - float y; - float scale; - /* Drop shadow color multiplier. */ - float drop_mod; - /* Drop shadow offset. - * If both are 0, no drop shadow will be rendered. */ - int drop_x, drop_y; - /* Drop shadow alpha */ - float drop_alpha; - /* ABGR. Use the macros. */ - uint32_t color; - bool full_screen; - enum text_alignment text_align; - } osd_stat_params; - - void (*cb_update_window_title)(void*, void *); - void (*cb_swap_buffers)(void*, void *); - bool (*cb_get_metrics)(void *data, enum display_metric_types type, - float *value); - bool (*cb_set_resize)(void*, unsigned, unsigned); - - bool (*cb_set_mvp)(void *data, void *shader_data, - const void *mat_data); - - void *context_data; - void *shader_data; - void *userdata; - const shader_backend_t *shader_driver; -} video_frame_info_t; - -typedef void (*update_window_title_cb)(void*, void*); -typedef bool (*get_metrics_cb)(void *data, enum display_metric_types type, - float *value); -typedef bool (*set_resize_cb)(void*, unsigned, unsigned); - -typedef struct gfx_ctx_driver -{ - /* The opaque pointer is the underlying video driver data (e.g. gl_t for - * OpenGL contexts). Although not advised, the context driver is allowed - * to hold a pointer to it as the context never outlives the video driver. - * - * The context driver is responsible for it's own data.*/ - void* (*init)(video_frame_info_t *video_info, void *video_driver); - void (*destroy)(void *data); - - enum gfx_ctx_api (*get_api)(void *data); - - /* Which API to bind to. */ - bool (*bind_api)(void *video_driver, enum gfx_ctx_api, - unsigned major, unsigned minor); - - /* Sets the swap interval. */ - void (*swap_interval)(void *data, int); - - /* Sets video mode. Creates a window, etc. */ - bool (*set_video_mode)(void*, video_frame_info_t *video_info, unsigned, unsigned, bool); - - /* Gets current window size. - * If not initialized yet, it returns current screen size. */ - void (*get_video_size)(void*, unsigned*, unsigned*); - - float (*get_refresh_rate)(void*); - - void (*get_video_output_size)(void*, unsigned*, unsigned*); - - void (*get_video_output_prev)(void*); - - void (*get_video_output_next)(void*); - - get_metrics_cb get_metrics; - - /* Translates a window size to an aspect ratio. - * In most cases this will be just width / height, but - * some contexts will better know which actual aspect ratio is used. - * This can be NULL to assume the default behavior. - */ - float (*translate_aspect)(void*, unsigned, unsigned); - - /* Asks driver to update window title (FPS, etc). */ - update_window_title_cb update_window_title; - - /* Queries for resize and quit events. - * Also processes events. */ - void (*check_window)(void*, bool*, bool*, - unsigned*, unsigned*, bool); - - /* Acknowledge a resize event. This is needed for some APIs. - * Most backends will ignore this. */ - set_resize_cb set_resize; - - /* Checks if window has input focus. */ - bool (*has_focus)(void*); - - /* Should the screensaver be suppressed? */ - bool (*suppress_screensaver)(void *data, bool enable); - - /* Checks if context driver has windowed support. */ - bool (*has_windowed)(void*); - - /* Swaps buffers. VBlank sync depends on - * earlier calls to swap_interval. */ - void (*swap_buffers)(void*, void *); - - /* Most video backends will want to use a certain input driver. - * Checks for it here. */ - void (*input_driver)(void*, const char *, const input_driver_t**, void**); - - /* Wraps whatever gl_proc_address() there is. - * Does not take opaque, to avoid lots of ugly wrapper code. */ - gfx_ctx_proc_t (*get_proc_address)(const char*); - - /* Returns true if this context supports EGLImage buffers for - * screen drawing and was initalized correctly. */ - bool (*image_buffer_init)(void*, const video_info_t*); - - /* Writes the frame to the EGLImage and sets image_handle to it. - * Returns true if a new image handle is created. - * Always returns true the first time it's called for a new index. - * The graphics core must handle a change in the handle correctly. */ - bool (*image_buffer_write)(void*, const void *frame, unsigned width, - unsigned height, unsigned pitch, bool rgb32, - unsigned index, void **image_handle); - - /* Shows or hides mouse. Can be NULL if context doesn't - * have a concept of mouse pointer. */ - void (*show_mouse)(void *data, bool state); - - /* Human readable string. */ - const char *ident; - - uint32_t (*get_flags)(void *data); - - void (*set_flags)(void *data, uint32_t flags); - - /* Optional. Binds HW-render offscreen context. */ - void (*bind_hw_render)(void *data, bool enable); - - /* Optional. Gets base data for the context which is used by the driver. - * This is mostly relevant for graphics APIs such as Vulkan - * which do not have global context state. */ - void *(*get_context_data)(void *data); - - /* Optional. Makes driver context (only GLX right now) - * active for this thread. */ - void (*make_current)(bool release); -} gfx_ctx_driver_t; - -typedef struct gfx_ctx_flags -{ - uint32_t flags; -} gfx_ctx_flags_t; - -typedef struct gfx_ctx_size -{ - bool *quit; - bool *resize; - unsigned *width; - unsigned *height; -} gfx_ctx_size_t; - -typedef struct gfx_ctx_mode -{ - unsigned width; - unsigned height; - bool fullscreen; -} gfx_ctx_mode_t; - -typedef struct gfx_ctx_metrics -{ - enum display_metric_types type; - float *value; -} gfx_ctx_metrics_t; - -typedef struct gfx_ctx_aspect -{ - float *aspect; - unsigned width; - unsigned height; -} gfx_ctx_aspect_t; - -typedef struct gfx_ctx_image -{ - const void *frame; - unsigned width; - unsigned height; - unsigned pitch; - unsigned index; - bool rgb32; - void **handle; -} gfx_ctx_image_t; - -typedef struct gfx_ctx_input -{ - const input_driver_t **input; - void **input_data; -} gfx_ctx_input_t; - -typedef struct gfx_ctx_proc_address -{ - const char *sym; - retro_proc_address_t addr; -} gfx_ctx_proc_address_t; - -typedef struct gfx_ctx_ident -{ - const char *ident; -} gfx_ctx_ident_t; - -struct aspect_ratio_elem -{ - char name[64]; - float value; -}; - -/* Optionally implemented interface to poke more - * deeply into video driver. */ - -typedef struct video_poke_interface -{ - uint32_t (*get_flags)(void *data); - void (*set_coords)(void *handle_data, void *shader_data, - const struct video_coords *coords); - void (*set_mvp)(void *data, void *shader_data, - const void *mat_data); - uintptr_t (*load_texture)(void *video_data, void *data, - bool threaded, enum texture_filter_type filter_type); - void (*unload_texture)(void *data, uintptr_t id); - void (*set_video_mode)(void *data, unsigned width, - unsigned height, bool fullscreen); - float (*get_refresh_rate)(void *data); - void (*set_filtering)(void *data, unsigned index, bool smooth); - void (*get_video_output_size)(void *data, - unsigned *width, unsigned *height); - - /* Move index to previous resolution */ - void (*get_video_output_prev)(void *data); - - /* Move index to next resolution */ - void (*get_video_output_next)(void *data); - - uintptr_t (*get_current_framebuffer)(void *data); - retro_proc_address_t (*get_proc_address)(void *data, const char *sym); - void (*set_aspect_ratio)(void *data, unsigned aspectratio_index); - void (*apply_state_changes)(void *data); - - /* Update texture. */ - void (*set_texture_frame)(void *data, const void *frame, bool rgb32, - unsigned width, unsigned height, float alpha); - /* Enable or disable rendering. */ - void (*set_texture_enable)(void *data, bool enable, bool full_screen); - void (*set_osd_msg)(void *data, video_frame_info_t *video_info, - const char *msg, - const void *params, void *font); - - void (*show_mouse)(void *data, bool state); - void (*grab_mouse_toggle)(void *data); - - struct video_shader *(*get_current_shader)(void *data); - bool (*get_current_software_framebuffer)(void *data, - struct retro_framebuffer *framebuffer); - bool (*get_hw_render_interface)(void *data, - const struct retro_hw_render_interface **iface); -} video_poke_interface_t; - -/* msg is for showing a message on the screen - * along with the video frame. */ -typedef bool (*video_driver_frame_t)(void *data, - const void *frame, unsigned width, - unsigned height, uint64_t frame_count, - unsigned pitch, const char *msg, video_frame_info_t *video_info); - -typedef struct video_driver -{ - /* Should the video driver act as an input driver as well? - * The video initialization might preinitialize an input driver - * to override the settings in case the video driver relies on - * input driver for event handling. */ - void *(*init)(const video_info_t *video, - const input_driver_t **input, - void **input_data); - - /* Updates frame on the screen. - * Frame can be either XRGB1555, RGB565 or ARGB32 format - * depending on rgb32 setting in video_info_t. - * Pitch is the distance in bytes between two scanlines in memory. - * - * When msg is non-NULL, - * it's a message that should be displayed to the user. */ - video_driver_frame_t frame; - - /* Should we care about syncing to vblank? Fast forwarding. - * - * Requests nonblocking operation. - * - * True = VSync is turned off. - * False = VSync is turned on. - * */ - void (*set_nonblock_state)(void *data, bool toggle); - - /* Is the window still active? */ - bool (*alive)(void *data); - - /* Does the window have focus? */ - bool (*focus)(void *data); - - /* Should the screensaver be suppressed? */ - bool (*suppress_screensaver)(void *data, bool enable); - - /* Does the graphics context support windowed mode? */ - bool (*has_windowed)(void *data); - - /* Sets shader. Might not be implemented. Will be moved to - * poke_interface later. */ - bool (*set_shader)(void *data, enum rarch_shader_type type, - const char *path); - - /* Frees driver. */ - void (*free)(void *data); - - /* Human-readable identifier. */ - const char *ident; - - void (*set_viewport)(void *data, unsigned width, unsigned height, - bool force_full, bool allow_rotate); - - void (*set_rotation)(void *data, unsigned rotation); - void (*viewport_info)(void *data, struct video_viewport *vp); - - /* Reads out in BGR byte order (24bpp). */ - bool (*read_viewport)(void *data, uint8_t *buffer, bool is_idle); - - /* Returns a pointer to a newly allocated buffer that can - * (and must) be passed to free() by the caller, containing a - * copy of the current raw frame in the active pixel format - * and sets width, height and pitch to the correct values. */ - void* (*read_frame_raw)(void *data, unsigned *width, - unsigned *height, size_t *pitch); - -#ifdef HAVE_OVERLAY - void (*overlay_interface)(void *data, - const video_overlay_interface_t **iface); -#endif - void (*poke_interface)(void *data, const video_poke_interface_t **iface); - unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type); -} video_driver_t; - -extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END]; - -bool video_driver_has_windowed(void); - -bool video_driver_cached_frame_has_valid_framebuffer(void); - -void video_driver_destroy(void); -void video_driver_set_cached_frame_ptr(const void *data); -void video_driver_set_stub_frame(void); -void video_driver_unset_stub_frame(void); -bool video_driver_is_stub_frame(void); -bool video_driver_supports_recording(void); -bool video_driver_supports_viewport_read(void); -bool video_driver_supports_read_frame_raw(void); -void video_driver_set_viewport_config(void); -void video_driver_set_viewport_square_pixel(void); -void video_driver_set_viewport_core(void); -void video_driver_reset_custom_viewport(void); -void video_driver_set_rgba(void); -void video_driver_unset_rgba(void); -bool video_driver_supports_rgba(void); -bool video_driver_get_next_video_out(void); -bool video_driver_get_prev_video_out(void); -bool video_driver_init(bool *video_is_threaded); -void video_driver_destroy_data(void); -void video_driver_free(void); -void video_driver_free_hw_context(void); -void video_driver_monitor_reset(void); -void video_driver_set_aspect_ratio(void); -void video_driver_update_viewport(struct video_viewport* vp, bool force_full, bool keep_aspect); -void video_driver_show_mouse(void); -void video_driver_hide_mouse(void); -void video_driver_set_nonblock_state(bool toggle); -bool video_driver_find_driver(void); -void video_driver_apply_state_changes(void); -bool video_driver_read_viewport(uint8_t *buffer, bool is_idle); -bool video_driver_cached_frame(void); -bool video_driver_frame_filter_alive(void); -bool video_driver_frame_filter_is_32bit(void); -void video_driver_default_settings(void); -void video_driver_load_settings(config_file_t *conf); -void video_driver_save_settings(config_file_t *conf); -void video_driver_set_own_driver(void); -void video_driver_unset_own_driver(void); -bool video_driver_owns_driver(void); -bool video_driver_is_hw_context(void); -struct retro_hw_render_callback *video_driver_get_hw_context(void); -const struct retro_hw_render_context_negotiation_interface -*video_driver_get_context_negotiation_interface(void); -void video_driver_set_context_negotiation_interface(const struct - retro_hw_render_context_negotiation_interface *iface); -bool video_driver_is_video_cache_context(void); -void video_driver_set_video_cache_context_ack(void); -bool video_driver_is_video_cache_context_ack(void); -void video_driver_set_active(void); -void video_driver_unset_active(void); -bool video_driver_is_active(void); -bool video_driver_gpu_record_init(unsigned size); -void video_driver_gpu_record_deinit(void); -bool video_driver_get_current_software_framebuffer(struct - retro_framebuffer *fb); -bool video_driver_get_hw_render_interface(const struct - retro_hw_render_interface **iface); -bool video_driver_get_viewport_info(struct video_viewport *viewport); -void video_driver_set_title_buf(void); -void video_driver_monitor_adjust_system_rates(void); - -/** - * video_driver_find_handle: - * @index : index of driver to get handle to. - * - * Returns: handle to video driver at index. Can be NULL - * if nothing found. - **/ -const void *video_driver_find_handle(int index); - -/** - * video_driver_find_ident: - * @index : index of driver to get handle to. - * - * Returns: Human-readable identifier of video driver at index. - * Can be NULL if nothing found. - **/ -const char *video_driver_find_ident(int index); - -/** - * config_get_video_driver_options: - * - * Get an enumerated list of all video driver names, separated by '|'. - * - * Returns: string listing of all video driver names, separated by '|'. - **/ -const char* config_get_video_driver_options(void); - -/** - * video_driver_get_ptr: - * - * Use this if you need the real video driver - * and driver data pointers. - * - * Returns: video driver's userdata. - **/ -void *video_driver_get_ptr(bool force_nonthreaded_data); - -/** - * video_driver_get_current_framebuffer: - * - * Gets pointer to current hardware renderer framebuffer object. - * Used by RETRO_ENVIRONMENT_SET_HW_RENDER. - * - * Returns: pointer to hardware framebuffer object, otherwise 0. - **/ -uintptr_t video_driver_get_current_framebuffer(void); - -retro_proc_address_t video_driver_get_proc_address(const char *sym); - -bool video_driver_set_shader(enum rarch_shader_type type, - const char *shader); - -bool video_driver_set_rotation(unsigned rotation); - -bool video_driver_set_video_mode(unsigned width, - unsigned height, bool fullscreen); - -bool video_driver_get_video_output_size( - unsigned *width, unsigned *height); - -void video_driver_set_osd_msg(const char *msg, - const void *params, void *font); - -void video_driver_set_texture_enable(bool enable, bool full_screen); - -void video_driver_set_texture_frame(const void *frame, bool rgb32, - unsigned width, unsigned height, float alpha); - -#ifdef HAVE_OVERLAY -bool video_driver_overlay_interface( - const video_overlay_interface_t **iface); -#endif - -void * video_driver_read_frame_raw(unsigned *width, - unsigned *height, size_t *pitch); - -void video_driver_set_filtering(unsigned index, bool smooth); - -const char *video_driver_get_ident(void); - -bool video_driver_set_viewport(unsigned width, unsigned height, - bool force_fullscreen, bool allow_rotate); - -void video_driver_get_size(unsigned *width, unsigned *height); - -void video_driver_set_size(unsigned *width, unsigned *height); - -void video_driver_unset_video_cache_context_ack(void); - -float video_driver_get_aspect_ratio(void); - -void video_driver_set_aspect_ratio_value(float value); - -rarch_softfilter_t *video_driver_frame_filter_get_ptr(void); - -enum retro_pixel_format video_driver_get_pixel_format(void); - -void video_driver_set_pixel_format(enum retro_pixel_format fmt); - -void video_driver_cached_frame_set(const void *data, unsigned width, - unsigned height, size_t pitch); - -void video_driver_cached_frame_get(const void **data, unsigned *width, - unsigned *height, size_t *pitch); - -void video_driver_menu_settings(void **list_data, void *list_info_data, - void *group_data, void *subgroup_data, const char *parent_group); - -/** - * video_viewport_get_scaled_integer: - * @vp : Viewport handle - * @width : Width. - * @height : Height. - * @aspect_ratio : Aspect ratio (in float). - * @keep_aspect : Preserve aspect ratio? - * - * Gets viewport scaling dimensions based on - * scaled integer aspect ratio. - **/ -void video_viewport_get_scaled_integer(struct video_viewport *vp, - unsigned width, unsigned height, - float aspect_ratio, bool keep_aspect); - -struct retro_system_av_info *video_viewport_get_system_av_info(void); - -struct video_viewport *video_viewport_get_custom(void); - -/** - * video_monitor_set_refresh_rate: - * @hz : New refresh rate for monitor. - * - * Sets monitor refresh rate to new value. - **/ -void video_monitor_set_refresh_rate(float hz); - -/** - * video_monitor_fps_statistics - * @refresh_rate : Monitor refresh rate. - * @deviation : Deviation from measured refresh rate. - * @sample_points : Amount of sampled points. - * - * Gets the monitor FPS statistics based on the current - * runtime. - * - * Returns: true (1) on success. - * false (0) if: - * a) threaded video mode is enabled - * b) less than 2 frame time samples. - * c) FPS monitor enable is off. - **/ -bool video_monitor_fps_statistics(double *refresh_rate, - double *deviation, unsigned *sample_points); - -unsigned video_pixel_get_alignment(unsigned pitch); - -const video_poke_interface_t *video_driver_get_poke(void); - -/** - * video_driver_frame: - * @data : pointer to data of the video frame. - * @width : width of the video frame. - * @height : height of the video frame. - * @pitch : pitch of the video frame. - * - * Video frame render callback function. - **/ -void video_driver_frame(const void *data, unsigned width, - unsigned height, size_t pitch); - -void crt_switch_driver_reinit(void); - -#define video_driver_translate_coord_viewport_wrap(vp, mouse_x, mouse_y, res_x, res_y, res_screen_x, res_screen_y) \ - (video_driver_get_viewport_info(vp) ? video_driver_translate_coord_viewport(vp, mouse_x, mouse_y, res_x, res_y, res_screen_x, res_screen_y) : false) - -/** - * video_driver_translate_coord_viewport: - * @mouse_x : Pointer X coordinate. - * @mouse_y : Pointer Y coordinate. - * @res_x : Scaled X coordinate. - * @res_y : Scaled Y coordinate. - * @res_screen_x : Scaled screen X coordinate. - * @res_screen_y : Scaled screen Y coordinate. - * - * Translates pointer [X,Y] coordinates into scaled screen - * coordinates based on viewport info. - * - * Returns: true (1) if successful, false if video driver doesn't support - * viewport info. - **/ -bool video_driver_translate_coord_viewport( - struct video_viewport *vp, - int mouse_x, int mouse_y, - int16_t *res_x, int16_t *res_y, int16_t *res_screen_x, - int16_t *res_screen_y); - -uintptr_t video_driver_display_get(void); - -enum rarch_display_type video_driver_display_type_get(void); - -uintptr_t video_driver_window_get(void); - -void video_driver_display_type_set(enum rarch_display_type type); - -void video_driver_display_set(uintptr_t idx); - -void video_driver_window_set(uintptr_t idx); - -bool video_driver_texture_load(void *data, - enum texture_filter_type filter_type, - uintptr_t *id); - -bool video_driver_texture_unload(uintptr_t *id); - -void video_driver_build_info(video_frame_info_t *video_info); - -void video_driver_reinit(void); - -void video_driver_get_window_title(char *buf, unsigned len); - -void video_driver_get_record_status( - bool *has_gpu_record, - uint8_t **gpu_buf); - -bool *video_driver_get_threaded(void); - -void video_driver_set_threaded(bool val); - -void video_driver_get_status(uint64_t *frame_count, bool * is_alive, - bool *is_focused); - -/** - * video_context_driver_init_first: - * @data : Input data. - * @ident : Identifier of graphics context driver to find. - * @api : API of higher-level graphics API. - * @major : Major version number of higher-level graphics API. - * @minor : Minor version number of higher-level graphics API. - * @hw_render_ctx : Request a graphics context driver capable of - * hardware rendering? - * - * Finds first suitable graphics context driver and initializes. - * - * Returns: graphics context driver if found, otherwise NULL. - **/ -const gfx_ctx_driver_t *video_context_driver_init_first( - void *data, const char *ident, - enum gfx_ctx_api api, unsigned major, unsigned minor, - bool hw_render_ctx, void **ctx_data); - -bool video_context_driver_find_prev_driver(void); - -bool video_context_driver_find_next_driver(void); - -bool video_context_driver_init_image_buffer(const video_info_t *data); - -bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img); - -bool video_context_driver_get_video_output_prev(void); - -bool video_context_driver_get_video_output_next(void); - -bool video_context_driver_bind_hw_render(bool *enable); - -void video_context_driver_make_current(bool restore); - -bool video_context_driver_set(const gfx_ctx_driver_t *data); - -void video_context_driver_destroy(void); - -bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data); - -bool video_context_driver_swap_interval(int *interval); - -bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc); - -bool video_context_driver_suppress_screensaver(bool *bool_data); - -bool video_context_driver_get_ident(gfx_ctx_ident_t *ident); - -bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info); - -bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info); - -bool video_context_driver_get_refresh_rate(float *refresh_rate); - -bool video_context_driver_show_mouse(bool *bool_data); - -bool video_context_driver_set_flags(gfx_ctx_flags_t *flags); - -bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics); - -bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect); - -bool video_context_driver_input_driver(gfx_ctx_input_t *inp); - -enum gfx_ctx_api video_context_driver_get_api(void); - -void video_context_driver_free(void); - -bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident); - -bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader); - -bool video_shader_driver_deinit(void); - -bool video_shader_driver_init_first(void); - -bool video_shader_driver_init(video_shader_ctx_init_t *init); - -void video_driver_set_coords(video_shader_ctx_coords_t *coords); - -bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler); - -bool video_shader_driver_info(video_shader_ctx_info_t *shader_info); - -void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp); - -float video_driver_get_refresh_rate(void); - -extern bool (*video_driver_cb_has_focus)(void); - -bool video_driver_started_fullscreen(void); - -bool video_driver_is_threaded(void); - -bool video_driver_get_all_flags(gfx_ctx_flags_t *flags, - enum display_flags flag); - -extern video_driver_t video_gl; -extern video_driver_t video_vulkan; -extern video_driver_t video_metal; -extern video_driver_t video_psp1; -extern video_driver_t video_vita2d; -extern video_driver_t video_ps2; -extern video_driver_t video_ctr; -extern video_driver_t video_switch; -extern video_driver_t video_d3d8; -extern video_driver_t video_d3d9; -extern video_driver_t video_d3d10; -extern video_driver_t video_d3d11; -extern video_driver_t video_d3d12; -extern video_driver_t video_gx; -extern video_driver_t video_wiiu; -extern video_driver_t video_xenon360; -extern video_driver_t video_xvideo; -extern video_driver_t video_sdl; -extern video_driver_t video_sdl2; -extern video_driver_t video_vg; -extern video_driver_t video_omap; -extern video_driver_t video_exynos; -extern video_driver_t video_dispmanx; -extern video_driver_t video_sunxi; -extern video_driver_t video_drm; -extern video_driver_t video_xshm; -extern video_driver_t video_caca; -extern video_driver_t video_gdi; -extern video_driver_t video_vga; -extern video_driver_t video_sixel; -extern video_driver_t video_null; - -extern const gfx_ctx_driver_t gfx_ctx_osmesa; -extern const gfx_ctx_driver_t gfx_ctx_sdl_gl; -extern const gfx_ctx_driver_t gfx_ctx_x_egl; -extern const gfx_ctx_driver_t gfx_ctx_wayland; -extern const gfx_ctx_driver_t gfx_ctx_x; -extern const gfx_ctx_driver_t gfx_ctx_drm; -extern const gfx_ctx_driver_t gfx_ctx_mali_fbdev; -extern const gfx_ctx_driver_t gfx_ctx_vivante_fbdev; -extern const gfx_ctx_driver_t gfx_ctx_android; -extern const gfx_ctx_driver_t gfx_ctx_ps3; -extern const gfx_ctx_driver_t gfx_ctx_wgl; -extern const gfx_ctx_driver_t gfx_ctx_videocore; -extern const gfx_ctx_driver_t gfx_ctx_qnx; -extern const gfx_ctx_driver_t gfx_ctx_cgl; -extern const gfx_ctx_driver_t gfx_ctx_cocoagl; -extern const gfx_ctx_driver_t gfx_ctx_emscripten; -extern const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev; -extern const gfx_ctx_driver_t gfx_ctx_khr_display; -extern const gfx_ctx_driver_t gfx_ctx_gdi; -extern const gfx_ctx_driver_t gfx_ctx_sixel; -extern const gfx_ctx_driver_t switch_ctx; -extern const gfx_ctx_driver_t orbis_ctx; -extern const gfx_ctx_driver_t gfx_ctx_null; - -extern const shader_backend_t gl_glsl_backend; -extern const shader_backend_t gl_cg_backend; -extern const shader_backend_t shader_null_backend; - -RETRO_END_DECLS - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef __VIDEO_DRIVER__H +#define __VIDEO_DRIVER__H + +#include +#include +#include + +#include +#include +#include + +#ifdef HAVE_CONFIG_H +#include "../config.h" +#endif + +#ifdef HAVE_OVERLAY +#include "../input/input_overlay.h" +#endif + +#include "video_defines.h" +#include "video_coord_array.h" +#include "video_filter.h" +#include "video_shader_parse.h" + +#include "../input/input_types.h" + +#define RARCH_SCALE_BASE 256 + +#include "video_shader_parse.h" + +#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1) +#define VIDEO_SHADER_MENU (GFX_MAX_SHADERS - 2) +#define VIDEO_SHADER_MENU_2 (GFX_MAX_SHADERS - 3) +#define VIDEO_SHADER_MENU_3 (GFX_MAX_SHADERS - 4) +#define VIDEO_SHADER_MENU_4 (GFX_MAX_SHADERS - 5) +#define VIDEO_SHADER_MENU_5 (GFX_MAX_SHADERS - 6) +#define VIDEO_SHADER_MENU_6 (GFX_MAX_SHADERS - 7) + +#if defined(_XBOX360) +#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL +#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL) +#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL +#elif defined(__CELLOS_LV2__) || defined(HAVE_CG) +#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG +#else +#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE +#endif + +RETRO_BEGIN_DECLS + +#ifndef MAX_EGLIMAGE_TEXTURES +#define MAX_EGLIMAGE_TEXTURES 32 +#endif + +#define MAX_VARIABLES 64 + +enum +{ + TEXTURES = 8, + TEXTURESMASK = TEXTURES - 1 +}; + +struct LinkInfo +{ + unsigned tex_w, tex_h; + struct video_shader_pass *pass; +}; + +enum gfx_ctx_api +{ + GFX_CTX_NONE = 0, + GFX_CTX_OPENGL_API, + GFX_CTX_OPENGL_ES_API, + GFX_CTX_DIRECT3D8_API, + GFX_CTX_DIRECT3D9_API, + GFX_CTX_DIRECT3D10_API, + GFX_CTX_DIRECT3D11_API, + GFX_CTX_DIRECT3D12_API, + GFX_CTX_OPENVG_API, + GFX_CTX_VULKAN_API, + GFX_CTX_SIXEL_API, + GFX_CTX_METAL_API, + GFX_CTX_GDI_API, + GFX_CTX_GX_API, + GFX_CTX_GX2_API +}; + +enum display_metric_types +{ + DISPLAY_METRIC_NONE = 0, + DISPLAY_METRIC_MM_WIDTH, + DISPLAY_METRIC_MM_HEIGHT, + DISPLAY_METRIC_DPI +}; + +enum display_flags +{ + GFX_CTX_FLAGS_NONE = 0, + GFX_CTX_FLAGS_GL_CORE_CONTEXT, + GFX_CTX_FLAGS_MULTISAMPLING, + GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES, + GFX_CTX_FLAGS_HARD_SYNC, + GFX_CTX_FLAGS_BLACK_FRAME_INSERTION, + GFX_CTX_FLAGS_MENU_FRAME_FILTERING, + GFX_CTX_FLAGS_ADAPTIVE_VSYNC +}; + +enum shader_uniform_type +{ + UNIFORM_1F = 0, + UNIFORM_2F, + UNIFORM_3F, + UNIFORM_4F, + UNIFORM_1FV, + UNIFORM_2FV, + UNIFORM_3FV, + UNIFORM_4FV, + UNIFORM_1I +}; + +enum shader_program_type +{ + SHADER_PROGRAM_VERTEX = 0, + SHADER_PROGRAM_FRAGMENT, + SHADER_PROGRAM_COMBINED +}; + +struct shader_program_info +{ + bool is_file; + const char *vertex; + const char *fragment; + const char *combined; + unsigned idx; + void *data; +}; + +struct uniform_info +{ + bool enabled; + + int32_t location; + int32_t count; + unsigned type; /* shader uniform type */ + + struct + { + enum shader_program_type type; + const char *ident; + uint32_t idx; + bool add_prefix; + bool enable; + } lookup; + + struct + { + struct + { + intptr_t v0; + intptr_t v1; + intptr_t v2; + intptr_t v3; + } integer; + + intptr_t *integerv; + + struct + { + uintptr_t v0; + uintptr_t v1; + uintptr_t v2; + uintptr_t v3; + } unsigned_integer; + + uintptr_t *unsigned_integerv; + + struct + { + float v0; + float v1; + float v2; + float v3; + } f; + + float *floatv; + } result; +}; + +typedef struct shader_backend +{ + void *(*init)(void *data, const char *path); + void (*init_menu_shaders)(void *data); + void (*deinit)(void *data); + + /* Set shader parameters. */ + void (*set_params)(void *data, void *shader_data); + + void (*set_uniform_parameter)(void *data, struct uniform_info *param, + void *uniform_data); + + /* Compile a shader program. */ + bool (*compile_program)(void *data, unsigned idx, + void *program_data, struct shader_program_info *program_info); + + /* Use a shader program specified by variable 'index'. */ + void (*use)(void *data, void *shader_data, unsigned index, bool set_active); + + /* Returns the number of currently loaded shaders. */ + unsigned (*num_shaders)(void *data); + + bool (*filter_type)(void *data, unsigned index, bool *smooth); + enum gfx_wrap_type (*wrap_type)(void *data, unsigned index); + void (*shader_scale)(void *data, + unsigned index, struct gfx_fbo_scale *scale); + bool (*set_coords)(void *handle_data, + void *shader_data, const struct video_coords *coords); + bool (*set_mvp)(void *data, void *shader_data, + const void *mat_data); + unsigned (*get_prev_textures)(void *data); + bool (*get_feedback_pass)(void *data, unsigned *pass); + bool (*mipmap_input)(void *data, unsigned index); + + struct video_shader *(*get_current_shader)(void *data); + + enum rarch_shader_type type; + + /* Human readable string. */ + const char *ident; +} shader_backend_t; + +typedef struct video_shader_ctx_init +{ + enum rarch_shader_type shader_type; + const char *path; + const shader_backend_t *shader; + void *data; + void *shader_data; + struct + { + bool core_context_enabled; + } gl; +} video_shader_ctx_init_t; + +typedef struct video_shader_ctx_params +{ + unsigned width; + unsigned height; + unsigned tex_width; + unsigned tex_height; + unsigned out_width; + unsigned out_height; + unsigned frame_counter; + unsigned fbo_info_cnt; + void *data; + const void *info; + const void *prev_info; + const void *feedback_info; + const void *fbo_info; +} video_shader_ctx_params_t; + +typedef struct video_shader_ctx_coords +{ + void *handle_data; + const void *data; +} video_shader_ctx_coords_t; + +typedef struct video_shader_ctx_scale +{ + unsigned idx; + struct gfx_fbo_scale *scale; +} video_shader_ctx_scale_t; + +typedef struct video_shader_ctx_info +{ + bool set_active; + unsigned num; + unsigned idx; + void *data; +} video_shader_ctx_info_t; + +typedef struct video_shader_ctx_mvp +{ + void *data; + const void *matrix; +} video_shader_ctx_mvp_t; + +typedef struct video_shader_ctx_filter +{ + unsigned index; + bool *smooth; +} video_shader_ctx_filter_t; + +typedef struct video_shader_ctx +{ + struct video_shader *data; +} video_shader_ctx_t; + +typedef struct video_shader_ctx_ident +{ + const char *ident; +} video_shader_ctx_ident_t; + +typedef struct video_shader_ctx_texture +{ + unsigned id; +} video_shader_ctx_texture_t; + +typedef void (*gfx_ctx_proc_t)(void); + +typedef struct video_info +{ + /* Launch in fullscreen mode instead of windowed mode. */ + bool fullscreen; + + /* Start with V-Sync enabled. */ + bool vsync; + + /* If true, the output image should have the aspect ratio + * as set in aspect_ratio. */ + bool force_aspect; + + bool font_enable; + + /* Width of window. + * If fullscreen mode is requested, + * a width of 0 means the resolution of the + * desktop should be used. */ + unsigned width; + + /* Height of window. + * If fullscreen mode is requested, + * a height of 0 means the resolutiof the desktop should be used. + */ + unsigned height; + + int swap_interval; + +#ifdef GEKKO + bool vfilter; +#endif + + /* If true, applies bilinear filtering to the image, + * otherwise nearest filtering. */ + bool smooth; + + bool is_threaded; + + /* Use 32bit RGBA rather than native RGB565/XBGR1555. + * + * XRGB1555 format is 16-bit and has byte ordering: 0RRRRRGGGGGBBBBB, + * in native endian. + * + * ARGB8888 is AAAAAAAARRRRRRRRGGGGGGGGBBBBBBBB, native endian. + * Alpha channel should be disregarded. + * */ + bool rgb32; + +#ifdef GEKKO + /* TODO - we can't really have driver system-specific + * variables in here. There should be some + * kind of publicly accessible driver implementation + * video struct for specific things like this. + */ + + /* Wii-specific settings. Ignored for everything else. */ + unsigned viwidth; +#endif + + /* + * input_scale defines the maximum size of the picture that will + * ever be used with the frame callback. + * + * The maximum resolution is a multiple of 256x256 size (RARCH_SCALE_BASE), + * so an input scale of 2 means you should allocate a texture or of 512x512. + * + * Maximum input size: RARCH_SCALE_BASE * input_scale + */ + unsigned input_scale; + + uintptr_t parent; +} video_info_t; + +typedef struct video_frame_info +{ + bool input_menu_swap_ok_cancel_buttons; + bool input_driver_nonblock_state; + bool shared_context; + bool black_frame_insertion; + bool hard_sync; + bool fps_show; + bool statistics_show; + bool framecount_show; + bool scale_integer; + bool post_filter_record; + bool windowed_fullscreen; + bool fullscreen; + bool font_enable; + bool use_rgba; + bool libretro_running; + bool xmb_shadows_enable; + bool battery_level_enable; + bool timedate_enable; + bool runloop_is_slowmotion; + bool runloop_is_idle; + bool runloop_is_paused; + bool is_perfcnt_enable; + bool menu_is_alive; + bool msg_bgcolor_enable; + + int custom_vp_x; + int custom_vp_y; + int crt_switch_center_adjust; + + unsigned hard_sync_frames; + unsigned aspect_ratio_idx; + unsigned max_swapchain_images; + unsigned monitor_index; + unsigned crt_switch_resolution; + unsigned crt_switch_resolution_super; + unsigned width; + unsigned height; + unsigned xmb_theme; + unsigned xmb_color_theme; + unsigned menu_shader_pipeline; + unsigned materialui_color_theme; + unsigned ozone_color_theme; + unsigned custom_vp_width; + unsigned custom_vp_height; + unsigned custom_vp_full_width; + unsigned custom_vp_full_height; + + float menu_wallpaper_opacity; + float menu_framebuffer_opacity; + float menu_header_opacity; + float menu_footer_opacity; + float refresh_rate; + float font_msg_pos_x; + float font_msg_pos_y; + float font_msg_color_r; + float font_msg_color_g; + float font_msg_color_b; + float xmb_alpha_factor; + + char fps_text[128]; + char stat_text[512]; + char chat_text[256]; + + uint64_t frame_count; + float frame_time; + float frame_rate; + + struct + { + float x; + float y; + float scale; + /* Drop shadow color multiplier. */ + float drop_mod; + /* Drop shadow offset. + * If both are 0, no drop shadow will be rendered. */ + int drop_x, drop_y; + /* Drop shadow alpha */ + float drop_alpha; + /* ABGR. Use the macros. */ + uint32_t color; + bool full_screen; + enum text_alignment text_align; + } osd_stat_params; + + void (*cb_update_window_title)(void*, void *); + void (*cb_swap_buffers)(void*, void *); + bool (*cb_get_metrics)(void *data, enum display_metric_types type, + float *value); + bool (*cb_set_resize)(void*, unsigned, unsigned); + + bool (*cb_set_mvp)(void *data, void *shader_data, + const void *mat_data); + + void *context_data; + void *shader_data; + void *userdata; + const shader_backend_t *shader_driver; +} video_frame_info_t; + +typedef void (*update_window_title_cb)(void*, void*); +typedef bool (*get_metrics_cb)(void *data, enum display_metric_types type, + float *value); +typedef bool (*set_resize_cb)(void*, unsigned, unsigned); + +typedef struct gfx_ctx_driver +{ + /* The opaque pointer is the underlying video driver data (e.g. gl_t for + * OpenGL contexts). Although not advised, the context driver is allowed + * to hold a pointer to it as the context never outlives the video driver. + * + * The context driver is responsible for it's own data.*/ + void* (*init)(video_frame_info_t *video_info, void *video_driver); + void (*destroy)(void *data); + + enum gfx_ctx_api (*get_api)(void *data); + + /* Which API to bind to. */ + bool (*bind_api)(void *video_driver, enum gfx_ctx_api, + unsigned major, unsigned minor); + + /* Sets the swap interval. */ + void (*swap_interval)(void *data, int); + + /* Sets video mode. Creates a window, etc. */ + bool (*set_video_mode)(void*, video_frame_info_t *video_info, unsigned, unsigned, bool); + + /* Gets current window size. + * If not initialized yet, it returns current screen size. */ + void (*get_video_size)(void*, unsigned*, unsigned*); + + float (*get_refresh_rate)(void*); + + void (*get_video_output_size)(void*, unsigned*, unsigned*); + + void (*get_video_output_prev)(void*); + + void (*get_video_output_next)(void*); + + get_metrics_cb get_metrics; + + /* Translates a window size to an aspect ratio. + * In most cases this will be just width / height, but + * some contexts will better know which actual aspect ratio is used. + * This can be NULL to assume the default behavior. + */ + float (*translate_aspect)(void*, unsigned, unsigned); + + /* Asks driver to update window title (FPS, etc). */ + update_window_title_cb update_window_title; + + /* Queries for resize and quit events. + * Also processes events. */ + void (*check_window)(void*, bool*, bool*, + unsigned*, unsigned*, bool); + + /* Acknowledge a resize event. This is needed for some APIs. + * Most backends will ignore this. */ + set_resize_cb set_resize; + + /* Checks if window has input focus. */ + bool (*has_focus)(void*); + + /* Should the screensaver be suppressed? */ + bool (*suppress_screensaver)(void *data, bool enable); + + /* Checks if context driver has windowed support. */ + bool (*has_windowed)(void*); + + /* Swaps buffers. VBlank sync depends on + * earlier calls to swap_interval. */ + void (*swap_buffers)(void*, void *); + + /* Most video backends will want to use a certain input driver. + * Checks for it here. */ + void (*input_driver)(void*, const char *, const input_driver_t**, void**); + + /* Wraps whatever gl_proc_address() there is. + * Does not take opaque, to avoid lots of ugly wrapper code. */ + gfx_ctx_proc_t (*get_proc_address)(const char*); + + /* Returns true if this context supports EGLImage buffers for + * screen drawing and was initalized correctly. */ + bool (*image_buffer_init)(void*, const video_info_t*); + + /* Writes the frame to the EGLImage and sets image_handle to it. + * Returns true if a new image handle is created. + * Always returns true the first time it's called for a new index. + * The graphics core must handle a change in the handle correctly. */ + bool (*image_buffer_write)(void*, const void *frame, unsigned width, + unsigned height, unsigned pitch, bool rgb32, + unsigned index, void **image_handle); + + /* Shows or hides mouse. Can be NULL if context doesn't + * have a concept of mouse pointer. */ + void (*show_mouse)(void *data, bool state); + + /* Human readable string. */ + const char *ident; + + uint32_t (*get_flags)(void *data); + + void (*set_flags)(void *data, uint32_t flags); + + /* Optional. Binds HW-render offscreen context. */ + void (*bind_hw_render)(void *data, bool enable); + + /* Optional. Gets base data for the context which is used by the driver. + * This is mostly relevant for graphics APIs such as Vulkan + * which do not have global context state. */ + void *(*get_context_data)(void *data); + + /* Optional. Makes driver context (only GLX right now) + * active for this thread. */ + void (*make_current)(bool release); +} gfx_ctx_driver_t; + +typedef struct gfx_ctx_flags +{ + uint32_t flags; +} gfx_ctx_flags_t; + +typedef struct gfx_ctx_size +{ + bool *quit; + bool *resize; + unsigned *width; + unsigned *height; +} gfx_ctx_size_t; + +typedef struct gfx_ctx_mode +{ + unsigned width; + unsigned height; + bool fullscreen; +} gfx_ctx_mode_t; + +typedef struct gfx_ctx_metrics +{ + enum display_metric_types type; + float *value; +} gfx_ctx_metrics_t; + +typedef struct gfx_ctx_aspect +{ + float *aspect; + unsigned width; + unsigned height; +} gfx_ctx_aspect_t; + +typedef struct gfx_ctx_image +{ + const void *frame; + unsigned width; + unsigned height; + unsigned pitch; + unsigned index; + bool rgb32; + void **handle; +} gfx_ctx_image_t; + +typedef struct gfx_ctx_input +{ + const input_driver_t **input; + void **input_data; +} gfx_ctx_input_t; + +typedef struct gfx_ctx_proc_address +{ + const char *sym; + retro_proc_address_t addr; +} gfx_ctx_proc_address_t; + +typedef struct gfx_ctx_ident +{ + const char *ident; +} gfx_ctx_ident_t; + +struct aspect_ratio_elem +{ + char name[64]; + float value; +}; + +/* Optionally implemented interface to poke more + * deeply into video driver. */ + +typedef struct video_poke_interface +{ + uint32_t (*get_flags)(void *data); + void (*set_coords)(void *handle_data, void *shader_data, + const struct video_coords *coords); + void (*set_mvp)(void *data, void *shader_data, + const void *mat_data); + uintptr_t (*load_texture)(void *video_data, void *data, + bool threaded, enum texture_filter_type filter_type); + void (*unload_texture)(void *data, uintptr_t id); + void (*set_video_mode)(void *data, unsigned width, + unsigned height, bool fullscreen); + float (*get_refresh_rate)(void *data); + void (*set_filtering)(void *data, unsigned index, bool smooth); + void (*get_video_output_size)(void *data, + unsigned *width, unsigned *height); + + /* Move index to previous resolution */ + void (*get_video_output_prev)(void *data); + + /* Move index to next resolution */ + void (*get_video_output_next)(void *data); + + uintptr_t (*get_current_framebuffer)(void *data); + retro_proc_address_t (*get_proc_address)(void *data, const char *sym); + void (*set_aspect_ratio)(void *data, unsigned aspectratio_index); + void (*apply_state_changes)(void *data); + + /* Update texture. */ + void (*set_texture_frame)(void *data, const void *frame, bool rgb32, + unsigned width, unsigned height, float alpha); + /* Enable or disable rendering. */ + void (*set_texture_enable)(void *data, bool enable, bool full_screen); + void (*set_osd_msg)(void *data, video_frame_info_t *video_info, + const char *msg, + const void *params, void *font); + + void (*show_mouse)(void *data, bool state); + void (*grab_mouse_toggle)(void *data); + + struct video_shader *(*get_current_shader)(void *data); + bool (*get_current_software_framebuffer)(void *data, + struct retro_framebuffer *framebuffer); + bool (*get_hw_render_interface)(void *data, + const struct retro_hw_render_interface **iface); +} video_poke_interface_t; + +/* msg is for showing a message on the screen + * along with the video frame. */ +typedef bool (*video_driver_frame_t)(void *data, + const void *frame, unsigned width, + unsigned height, uint64_t frame_count, + unsigned pitch, const char *msg, video_frame_info_t *video_info); + +typedef struct video_driver +{ + /* Should the video driver act as an input driver as well? + * The video initialization might preinitialize an input driver + * to override the settings in case the video driver relies on + * input driver for event handling. */ + void *(*init)(const video_info_t *video, + const input_driver_t **input, + void **input_data); + + /* Updates frame on the screen. + * Frame can be either XRGB1555, RGB565 or ARGB32 format + * depending on rgb32 setting in video_info_t. + * Pitch is the distance in bytes between two scanlines in memory. + * + * When msg is non-NULL, + * it's a message that should be displayed to the user. */ + video_driver_frame_t frame; + + /* Should we care about syncing to vblank? Fast forwarding. + * + * Requests nonblocking operation. + * + * True = VSync is turned off. + * False = VSync is turned on. + * */ + void (*set_nonblock_state)(void *data, bool toggle); + + /* Is the window still active? */ + bool (*alive)(void *data); + + /* Does the window have focus? */ + bool (*focus)(void *data); + + /* Should the screensaver be suppressed? */ + bool (*suppress_screensaver)(void *data, bool enable); + + /* Does the graphics context support windowed mode? */ + bool (*has_windowed)(void *data); + + /* Sets shader. Might not be implemented. Will be moved to + * poke_interface later. */ + bool (*set_shader)(void *data, enum rarch_shader_type type, + const char *path); + + /* Frees driver. */ + void (*free)(void *data); + + /* Human-readable identifier. */ + const char *ident; + + void (*set_viewport)(void *data, unsigned width, unsigned height, + bool force_full, bool allow_rotate); + + void (*set_rotation)(void *data, unsigned rotation); + void (*viewport_info)(void *data, struct video_viewport *vp); + + /* Reads out in BGR byte order (24bpp). */ + bool (*read_viewport)(void *data, uint8_t *buffer, bool is_idle); + + /* Returns a pointer to a newly allocated buffer that can + * (and must) be passed to free() by the caller, containing a + * copy of the current raw frame in the active pixel format + * and sets width, height and pitch to the correct values. */ + void* (*read_frame_raw)(void *data, unsigned *width, + unsigned *height, size_t *pitch); + +#ifdef HAVE_OVERLAY + void (*overlay_interface)(void *data, + const video_overlay_interface_t **iface); +#endif + void (*poke_interface)(void *data, const video_poke_interface_t **iface); + unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type); +} video_driver_t; + +extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END]; + +bool video_driver_has_windowed(void); + +bool video_driver_cached_frame_has_valid_framebuffer(void); + +void video_driver_destroy(void); +void video_driver_set_cached_frame_ptr(const void *data); +void video_driver_set_stub_frame(void); +void video_driver_unset_stub_frame(void); +bool video_driver_is_stub_frame(void); +bool video_driver_supports_recording(void); +bool video_driver_supports_viewport_read(void); +bool video_driver_supports_read_frame_raw(void); +void video_driver_set_viewport_config(void); +void video_driver_set_viewport_square_pixel(void); +void video_driver_set_viewport_core(void); +void video_driver_reset_custom_viewport(void); +void video_driver_set_rgba(void); +void video_driver_unset_rgba(void); +bool video_driver_supports_rgba(void); +bool video_driver_get_next_video_out(void); +bool video_driver_get_prev_video_out(void); +bool video_driver_init(bool *video_is_threaded); +void video_driver_destroy_data(void); +void video_driver_free(void); +void video_driver_free_hw_context(void); +void video_driver_monitor_reset(void); +void video_driver_set_aspect_ratio(void); +void video_driver_update_viewport(struct video_viewport* vp, bool force_full, bool keep_aspect); +void video_driver_show_mouse(void); +void video_driver_hide_mouse(void); +void video_driver_set_nonblock_state(bool toggle); +bool video_driver_find_driver(void); +void video_driver_apply_state_changes(void); +bool video_driver_read_viewport(uint8_t *buffer, bool is_idle); +bool video_driver_cached_frame(void); +bool video_driver_frame_filter_alive(void); +bool video_driver_frame_filter_is_32bit(void); +void video_driver_default_settings(void); +void video_driver_load_settings(config_file_t *conf); +void video_driver_save_settings(config_file_t *conf); +void video_driver_set_own_driver(void); +void video_driver_unset_own_driver(void); +bool video_driver_owns_driver(void); +bool video_driver_is_hw_context(void); +struct retro_hw_render_callback *video_driver_get_hw_context(void); +const struct retro_hw_render_context_negotiation_interface +*video_driver_get_context_negotiation_interface(void); +void video_driver_set_context_negotiation_interface(const struct + retro_hw_render_context_negotiation_interface *iface); +bool video_driver_is_video_cache_context(void); +void video_driver_set_video_cache_context_ack(void); +bool video_driver_is_video_cache_context_ack(void); +void video_driver_set_active(void); +void video_driver_unset_active(void); +bool video_driver_is_active(void); +bool video_driver_gpu_record_init(unsigned size); +void video_driver_gpu_record_deinit(void); +bool video_driver_get_current_software_framebuffer(struct + retro_framebuffer *fb); +bool video_driver_get_hw_render_interface(const struct + retro_hw_render_interface **iface); +bool video_driver_get_viewport_info(struct video_viewport *viewport); +void video_driver_set_title_buf(void); +void video_driver_monitor_adjust_system_rates(void); + +/** + * video_driver_find_handle: + * @index : index of driver to get handle to. + * + * Returns: handle to video driver at index. Can be NULL + * if nothing found. + **/ +const void *video_driver_find_handle(int index); + +/** + * video_driver_find_ident: + * @index : index of driver to get handle to. + * + * Returns: Human-readable identifier of video driver at index. + * Can be NULL if nothing found. + **/ +const char *video_driver_find_ident(int index); + +/** + * config_get_video_driver_options: + * + * Get an enumerated list of all video driver names, separated by '|'. + * + * Returns: string listing of all video driver names, separated by '|'. + **/ +const char* config_get_video_driver_options(void); + +/** + * video_driver_get_ptr: + * + * Use this if you need the real video driver + * and driver data pointers. + * + * Returns: video driver's userdata. + **/ +void *video_driver_get_ptr(bool force_nonthreaded_data); + +/** + * video_driver_get_current_framebuffer: + * + * Gets pointer to current hardware renderer framebuffer object. + * Used by RETRO_ENVIRONMENT_SET_HW_RENDER. + * + * Returns: pointer to hardware framebuffer object, otherwise 0. + **/ +uintptr_t video_driver_get_current_framebuffer(void); + +retro_proc_address_t video_driver_get_proc_address(const char *sym); + +bool video_driver_set_shader(enum rarch_shader_type type, + const char *shader); + +bool video_driver_set_rotation(unsigned rotation); + +bool video_driver_set_video_mode(unsigned width, + unsigned height, bool fullscreen); + +bool video_driver_get_video_output_size( + unsigned *width, unsigned *height); + +void video_driver_set_osd_msg(const char *msg, + const void *params, void *font); + +void video_driver_set_texture_enable(bool enable, bool full_screen); + +void video_driver_set_texture_frame(const void *frame, bool rgb32, + unsigned width, unsigned height, float alpha); + +#ifdef HAVE_OVERLAY +bool video_driver_overlay_interface( + const video_overlay_interface_t **iface); +#endif + +void * video_driver_read_frame_raw(unsigned *width, + unsigned *height, size_t *pitch); + +void video_driver_set_filtering(unsigned index, bool smooth); + +const char *video_driver_get_ident(void); + +bool video_driver_set_viewport(unsigned width, unsigned height, + bool force_fullscreen, bool allow_rotate); + +void video_driver_get_size(unsigned *width, unsigned *height); + +void video_driver_set_size(unsigned *width, unsigned *height); + +void video_driver_unset_video_cache_context_ack(void); + +float video_driver_get_aspect_ratio(void); + +void video_driver_set_aspect_ratio_value(float value); + +rarch_softfilter_t *video_driver_frame_filter_get_ptr(void); + +enum retro_pixel_format video_driver_get_pixel_format(void); + +void video_driver_set_pixel_format(enum retro_pixel_format fmt); + +void video_driver_cached_frame_set(const void *data, unsigned width, + unsigned height, size_t pitch); + +void video_driver_cached_frame_get(const void **data, unsigned *width, + unsigned *height, size_t *pitch); + +void video_driver_menu_settings(void **list_data, void *list_info_data, + void *group_data, void *subgroup_data, const char *parent_group); + +/** + * video_viewport_get_scaled_integer: + * @vp : Viewport handle + * @width : Width. + * @height : Height. + * @aspect_ratio : Aspect ratio (in float). + * @keep_aspect : Preserve aspect ratio? + * + * Gets viewport scaling dimensions based on + * scaled integer aspect ratio. + **/ +void video_viewport_get_scaled_integer(struct video_viewport *vp, + unsigned width, unsigned height, + float aspect_ratio, bool keep_aspect); + +struct retro_system_av_info *video_viewport_get_system_av_info(void); + +struct video_viewport *video_viewport_get_custom(void); + +/** + * video_monitor_set_refresh_rate: + * @hz : New refresh rate for monitor. + * + * Sets monitor refresh rate to new value. + **/ +void video_monitor_set_refresh_rate(float hz); + +/** + * video_monitor_fps_statistics + * @refresh_rate : Monitor refresh rate. + * @deviation : Deviation from measured refresh rate. + * @sample_points : Amount of sampled points. + * + * Gets the monitor FPS statistics based on the current + * runtime. + * + * Returns: true (1) on success. + * false (0) if: + * a) threaded video mode is enabled + * b) less than 2 frame time samples. + * c) FPS monitor enable is off. + **/ +bool video_monitor_fps_statistics(double *refresh_rate, + double *deviation, unsigned *sample_points); + +unsigned video_pixel_get_alignment(unsigned pitch); + +const video_poke_interface_t *video_driver_get_poke(void); + +/** + * video_driver_frame: + * @data : pointer to data of the video frame. + * @width : width of the video frame. + * @height : height of the video frame. + * @pitch : pitch of the video frame. + * + * Video frame render callback function. + **/ +void video_driver_frame(const void *data, unsigned width, + unsigned height, size_t pitch); + +void crt_switch_driver_reinit(void); + +#define video_driver_translate_coord_viewport_wrap(vp, mouse_x, mouse_y, res_x, res_y, res_screen_x, res_screen_y) \ + (video_driver_get_viewport_info(vp) ? video_driver_translate_coord_viewport(vp, mouse_x, mouse_y, res_x, res_y, res_screen_x, res_screen_y) : false) + +/** + * video_driver_translate_coord_viewport: + * @mouse_x : Pointer X coordinate. + * @mouse_y : Pointer Y coordinate. + * @res_x : Scaled X coordinate. + * @res_y : Scaled Y coordinate. + * @res_screen_x : Scaled screen X coordinate. + * @res_screen_y : Scaled screen Y coordinate. + * + * Translates pointer [X,Y] coordinates into scaled screen + * coordinates based on viewport info. + * + * Returns: true (1) if successful, false if video driver doesn't support + * viewport info. + **/ +bool video_driver_translate_coord_viewport( + struct video_viewport *vp, + int mouse_x, int mouse_y, + int16_t *res_x, int16_t *res_y, int16_t *res_screen_x, + int16_t *res_screen_y); + +uintptr_t video_driver_display_get(void); + +enum rarch_display_type video_driver_display_type_get(void); + +uintptr_t video_driver_window_get(void); + +void video_driver_display_type_set(enum rarch_display_type type); + +void video_driver_display_set(uintptr_t idx); + +void video_driver_window_set(uintptr_t idx); + +bool video_driver_texture_load(void *data, + enum texture_filter_type filter_type, + uintptr_t *id); + +bool video_driver_texture_unload(uintptr_t *id); + +void video_driver_build_info(video_frame_info_t *video_info); + +void video_driver_reinit(void); + +void video_driver_get_window_title(char *buf, unsigned len); + +void video_driver_get_record_status( + bool *has_gpu_record, + uint8_t **gpu_buf); + +bool *video_driver_get_threaded(void); + +void video_driver_set_threaded(bool val); + +void video_driver_get_status(uint64_t *frame_count, bool * is_alive, + bool *is_focused); + +/** + * video_context_driver_init_first: + * @data : Input data. + * @ident : Identifier of graphics context driver to find. + * @api : API of higher-level graphics API. + * @major : Major version number of higher-level graphics API. + * @minor : Minor version number of higher-level graphics API. + * @hw_render_ctx : Request a graphics context driver capable of + * hardware rendering? + * + * Finds first suitable graphics context driver and initializes. + * + * Returns: graphics context driver if found, otherwise NULL. + **/ +const gfx_ctx_driver_t *video_context_driver_init_first( + void *data, const char *ident, + enum gfx_ctx_api api, unsigned major, unsigned minor, + bool hw_render_ctx, void **ctx_data); + +bool video_context_driver_find_prev_driver(void); + +bool video_context_driver_find_next_driver(void); + +bool video_context_driver_init_image_buffer(const video_info_t *data); + +bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img); + +bool video_context_driver_get_video_output_prev(void); + +bool video_context_driver_get_video_output_next(void); + +bool video_context_driver_bind_hw_render(bool *enable); + +void video_context_driver_make_current(bool restore); + +bool video_context_driver_set(const gfx_ctx_driver_t *data); + +void video_context_driver_destroy(void); + +bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data); + +bool video_context_driver_swap_interval(int *interval); + +bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc); + +bool video_context_driver_suppress_screensaver(bool *bool_data); + +bool video_context_driver_get_ident(gfx_ctx_ident_t *ident); + +bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info); + +bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info); + +bool video_context_driver_get_refresh_rate(float *refresh_rate); + +bool video_context_driver_show_mouse(bool *bool_data); + +bool video_context_driver_set_flags(gfx_ctx_flags_t *flags); + +bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics); + +bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect); + +bool video_context_driver_input_driver(gfx_ctx_input_t *inp); + +enum gfx_ctx_api video_context_driver_get_api(void); + +void video_context_driver_free(void); + +bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident); + +bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader); + +bool video_shader_driver_deinit(void); + +bool video_shader_driver_init_first(void); + +bool video_shader_driver_init(video_shader_ctx_init_t *init); + +void video_driver_set_coords(video_shader_ctx_coords_t *coords); + +bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler); + +bool video_shader_driver_info(video_shader_ctx_info_t *shader_info); + +void video_driver_set_mvp(video_shader_ctx_mvp_t *mvp); + +float video_driver_get_refresh_rate(void); + +extern bool (*video_driver_cb_has_focus)(void); + +bool video_driver_started_fullscreen(void); + +bool video_driver_is_threaded(void); + +bool video_driver_get_all_flags(gfx_ctx_flags_t *flags, + enum display_flags flag); + +extern video_driver_t video_gl; +extern video_driver_t video_vulkan; +extern video_driver_t video_metal; +extern video_driver_t video_psp1; +extern video_driver_t video_vita2d; +extern video_driver_t video_ps2; +extern video_driver_t video_ctr; +extern video_driver_t video_switch; +extern video_driver_t video_d3d8; +extern video_driver_t video_d3d9; +extern video_driver_t video_d3d10; +extern video_driver_t video_d3d11; +extern video_driver_t video_d3d12; +extern video_driver_t video_gx; +extern video_driver_t video_wiiu; +extern video_driver_t video_xenon360; +extern video_driver_t video_xvideo; +extern video_driver_t video_sdl; +extern video_driver_t video_sdl2; +extern video_driver_t video_vg; +extern video_driver_t video_omap; +extern video_driver_t video_exynos; +extern video_driver_t video_dispmanx; +extern video_driver_t video_sunxi; +extern video_driver_t video_drm; +extern video_driver_t video_xshm; +extern video_driver_t video_caca; +extern video_driver_t video_gdi; +extern video_driver_t video_vga; +extern video_driver_t video_sixel; +extern video_driver_t video_null; + +extern const gfx_ctx_driver_t gfx_ctx_osmesa; +extern const gfx_ctx_driver_t gfx_ctx_sdl_gl; +extern const gfx_ctx_driver_t gfx_ctx_x_egl; +extern const gfx_ctx_driver_t gfx_ctx_wayland; +extern const gfx_ctx_driver_t gfx_ctx_x; +extern const gfx_ctx_driver_t gfx_ctx_drm; +extern const gfx_ctx_driver_t gfx_ctx_mali_fbdev; +extern const gfx_ctx_driver_t gfx_ctx_vivante_fbdev; +extern const gfx_ctx_driver_t gfx_ctx_android; +extern const gfx_ctx_driver_t gfx_ctx_ps3; +extern const gfx_ctx_driver_t gfx_ctx_wgl; +extern const gfx_ctx_driver_t gfx_ctx_videocore; +extern const gfx_ctx_driver_t gfx_ctx_qnx; +extern const gfx_ctx_driver_t gfx_ctx_cgl; +extern const gfx_ctx_driver_t gfx_ctx_cocoagl; +extern const gfx_ctx_driver_t gfx_ctx_emscripten; +extern const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev; +extern const gfx_ctx_driver_t gfx_ctx_khr_display; +extern const gfx_ctx_driver_t gfx_ctx_gdi; +extern const gfx_ctx_driver_t gfx_ctx_sixel; +extern const gfx_ctx_driver_t switch_ctx; +extern const gfx_ctx_driver_t orbis_ctx; +extern const gfx_ctx_driver_t gfx_ctx_null; + +extern const shader_backend_t gl_glsl_backend; +extern const shader_backend_t gl_cg_backend; +extern const shader_backend_t shader_null_backend; + +RETRO_END_DECLS + +#endif diff --git a/gfx/video_filters/Makefile b/gfx/video_filters/Makefile index de2df86955..5b92f6e8d8 100644 --- a/gfx/video_filters/Makefile +++ b/gfx/video_filters/Makefile @@ -68,7 +68,7 @@ ifeq (1,$(use_neon)) ASMFLAGS := -INEON/asm asflags += -mfpu=neon endif - + objects += blargg_ntsc_snes.$(DYLIB) phosphor2x.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB) normal2x.$(DYLIB) all: build; diff --git a/gfx/video_filters/Normal2x.filt b/gfx/video_filters/Normal2x.filt index 500574af11..5ebb1da547 100644 --- a/gfx/video_filters/Normal2x.filt +++ b/gfx/video_filters/Normal2x.filt @@ -1 +1 @@ -filter = normal2x +filter = normal2x diff --git a/gfx/video_filters/normal2x.c b/gfx/video_filters/normal2x.c index d39159b436..98069beb93 100644 --- a/gfx/video_filters/normal2x.c +++ b/gfx/video_filters/normal2x.c @@ -70,7 +70,7 @@ static void *normal2x_generic_create(const struct softfilter_config *config, (void)simd; (void)config; (void)userdata; - + if (!filt) { return NULL; } @@ -112,7 +112,7 @@ static void normal2x_work_cb_xrgb8888(void *data, void *thread_data) unsigned in_stride = (unsigned)(thr->in_pitch >> 2); unsigned out_stride = (unsigned)(thr->out_pitch >> 2); unsigned x, y; - + for (y = 0; y < thr->height; ++y) { uint32_t *out_ptr = output; @@ -120,13 +120,13 @@ static void normal2x_work_cb_xrgb8888(void *data, void *thread_data) { uint64_t colour = (uint64_t)*(input + x); colour |= colour << 32; - + *(uint64_t *)(out_ptr) = colour; *(uint64_t *)(out_ptr + out_stride) = colour; - + out_ptr += 2; } - + input += in_stride; output += out_stride << 1; } @@ -140,7 +140,7 @@ static void normal2x_work_cb_rgb565(void *data, void *thread_data) unsigned in_stride = (unsigned)(thr->in_pitch >> 1); unsigned out_stride = (unsigned)(thr->out_pitch >> 1); unsigned x, y; - + for (y = 0; y < thr->height; ++y) { uint16_t * out_ptr = output; @@ -148,13 +148,13 @@ static void normal2x_work_cb_rgb565(void *data, void *thread_data) { uint32_t colour = (uint32_t)*(input + x); colour |= colour << 16; - + *(uint32_t *)(out_ptr) = colour; *(uint32_t *)(out_ptr + out_stride) = colour; - + out_ptr += 2; } - + input += in_stride; output += out_stride << 1; } @@ -172,14 +172,14 @@ static void normal2x_generic_packets(void *data, * every little helps when running on an o3DS... */ struct filter_data *filt = (struct filter_data*)data; struct softfilter_thread_data *thr = (struct softfilter_thread_data*)&filt->workers[0]; - + thr->out_data = (uint8_t*)output; thr->in_data = (const uint8_t*)input; thr->out_pitch = output_stride; thr->in_pitch = input_stride; thr->width = width; thr->height = height; - + if (filt->in_fmt == SOFTFILTER_FMT_XRGB8888) { packets[0].work = normal2x_work_cb_xrgb8888; } else if (filt->in_fmt == SOFTFILTER_FMT_RGB565) { @@ -191,14 +191,14 @@ static void normal2x_generic_packets(void *data, static const struct softfilter_implementation normal2x_generic = { normal2x_generic_input_fmts, normal2x_generic_output_fmts, - + normal2x_generic_create, normal2x_generic_destroy, - + normal2x_generic_threads, normal2x_generic_output, normal2x_generic_packets, - + SOFTFILTER_API_VERSION, "Normal2x", "normal2x", diff --git a/griffin/griffin.c b/griffin/griffin.c index d99aa68ee9..9b6d1e089b 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -1382,7 +1382,6 @@ DEPENDENCIES #include "../libretro-common/formats/libchdr/libchdr_flac_codec.c" #endif - #ifdef HAVE_7ZIP #include "../libretro-common/formats/libchdr/libchdr_lzma.c" #endif diff --git a/griffin/griffin_glslang.cpp b/griffin/griffin_glslang.cpp index 98dd96f55a..2cdc37f22d 100644 --- a/griffin/griffin_glslang.cpp +++ b/griffin/griffin_glslang.cpp @@ -1,68 +1,68 @@ - -#ifdef WANT_GLSLANG - -#ifdef _MSC_VER -#include -#ifdef strtoull -#undef strtoull -#endif -#endif - -#include "../deps/glslang/glslang.cpp" -#include "../deps/glslang/glslang/SPIRV/disassemble.cpp" -#include "../deps/glslang/glslang/SPIRV/doc.cpp" -#include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp" -#include "../deps/glslang/glslang/SPIRV/InReadableOrder.cpp" -#include "../deps/glslang/glslang/SPIRV/Logger.cpp" -#include "../deps/glslang/glslang/SPIRV/SpvBuilder.cpp" -#include "../deps/glslang/glslang/SPIRV/SPVRemapper.cpp" - -#include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp" -#include "../deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp" - -#include "../deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp" - -#include "../deps/glslang/glslang/glslang/MachineIndependent/attribute.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/Constant.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/glslang_tab.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/InfoSink.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/Initialize.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/intermOut.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/IntermTraverse.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/iomapper.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/parseConst.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/ParseContextBase.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/ParseHelper.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/PoolAlloc.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/propagateNoContraction.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/reflection.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/Scan.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/ShaderLang.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/SymbolTable.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp" - -#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp" -#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp" - -#ifdef __APPLE__ -#include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp" -#endif - -#if defined(ENABLE_HLSL) -#include "../deps/glslang/glslang/hlsl/hlslAttributes.cpp" -#include "../deps/glslang/glslang/hlsl/hlslGrammar.cpp" -#include "../deps/glslang/glslang/hlsl/hlslOpMap.cpp" -#include "../deps/glslang/glslang/hlsl/hlslParseables.cpp" -#include "../deps/glslang/glslang/hlsl/hlslParseHelper.cpp" -#include "../deps/glslang/glslang/hlsl/hlslScanContext.cpp" -#include "../deps/glslang/glslang/hlsl/hlslTokenStream.cpp" -#endif - -#endif + +#ifdef WANT_GLSLANG + +#ifdef _MSC_VER +#include +#ifdef strtoull +#undef strtoull +#endif +#endif + +#include "../deps/glslang/glslang.cpp" +#include "../deps/glslang/glslang/SPIRV/disassemble.cpp" +#include "../deps/glslang/glslang/SPIRV/doc.cpp" +#include "../deps/glslang/glslang/SPIRV/GlslangToSpv.cpp" +#include "../deps/glslang/glslang/SPIRV/InReadableOrder.cpp" +#include "../deps/glslang/glslang/SPIRV/Logger.cpp" +#include "../deps/glslang/glslang/SPIRV/SpvBuilder.cpp" +#include "../deps/glslang/glslang/SPIRV/SPVRemapper.cpp" + +#include "../deps/glslang/glslang/glslang/GenericCodeGen/CodeGen.cpp" +#include "../deps/glslang/glslang/glslang/GenericCodeGen/Link.cpp" + +#include "../deps/glslang/glslang/OGLCompilersDLL/InitializeDll.cpp" + +#include "../deps/glslang/glslang/glslang/MachineIndependent/attribute.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/Constant.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/glslang_tab.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/InfoSink.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/Initialize.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/Intermediate.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/intermOut.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/IntermTraverse.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/iomapper.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/limits.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/linkValidate.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/parseConst.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/ParseContextBase.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/ParseHelper.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/PoolAlloc.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/propagateNoContraction.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/reflection.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/RemoveTree.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/Scan.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/ShaderLang.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/SymbolTable.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/Versions.cpp" + +#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/Pp.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp" +#include "../deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp" + +#ifdef __APPLE__ +#include "../deps/glslang/glslang/glslang/OSDependent/Unix/ossource.cpp" +#endif + +#if defined(ENABLE_HLSL) +#include "../deps/glslang/glslang/hlsl/hlslAttributes.cpp" +#include "../deps/glslang/glslang/hlsl/hlslGrammar.cpp" +#include "../deps/glslang/glslang/hlsl/hlslOpMap.cpp" +#include "../deps/glslang/glslang/hlsl/hlslParseables.cpp" +#include "../deps/glslang/glslang/hlsl/hlslParseHelper.cpp" +#include "../deps/glslang/glslang/hlsl/hlslScanContext.cpp" +#include "../deps/glslang/glslang/hlsl/hlslTokenStream.cpp" +#endif + +#endif diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 47a1c3fa42..51e7fda5d1 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -69,7 +69,7 @@ enum { /* Use this to enable/disable using the touch screen as mouse */ #define ENABLE_TOUCH_SCREEN_MOUSE 1 -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index b5dba8df36..f3ef0f0b96 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -33,7 +33,7 @@ #include "../drivers_keyboard/keyboard_event_apple.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ /* Forward declarations */ diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index 86446f3ec4..1e5a348cc2 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -29,7 +29,7 @@ #define MAX_PADS 1 -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct ctr_input diff --git a/input/drivers/dos_input.c b/input/drivers/dos_input.c index 2485b3b3fe..520d924dfd 100644 --- a/input/drivers/dos_input.c +++ b/input/drivers/dos_input.c @@ -21,7 +21,7 @@ #include "../input_keymaps.h" #include "../drivers_keyboard/keyboard_event_dos.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct dos_input diff --git a/input/drivers/gx_input.c b/input/drivers/gx_input.c index 5fd6801dca..e0ac119b18 100644 --- a/input/drivers/gx_input.c +++ b/input/drivers/gx_input.c @@ -31,7 +31,7 @@ #define MAX_PADS 4 #endif -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct gx_input diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index c3c3a1e21c..9366cbf140 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -32,7 +32,7 @@ #include "../input_keymaps.h" #include "../input_driver.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct linuxraw_input diff --git a/input/drivers/ps3_input.c b/input/drivers/ps3_input.c index fead6eefc8..107cf4864c 100644 --- a/input/drivers/ps3_input.c +++ b/input/drivers/ps3_input.c @@ -40,7 +40,7 @@ #define MAX_PADS 7 #endif -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct diff --git a/input/drivers/ps4_input.c b/input/drivers/ps4_input.c index a6a1e0b25b..a481828c7c 100644 --- a/input/drivers/ps4_input.c +++ b/input/drivers/ps4_input.c @@ -29,7 +29,7 @@ #include "../input_driver.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct ps4_input diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 1247a2c1f4..6ee849ec17 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -43,7 +43,7 @@ #include "../input_driver.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct psp_input diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index 3f42839bec..e58391dbd2 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -31,7 +31,7 @@ #include "../../verbosity.h" #include "../../tasks/tasks_internal.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct sdl_input diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c index 2c48642b2e..07993f0a17 100644 --- a/input/drivers/switch_input.c +++ b/input/drivers/switch_input.c @@ -20,7 +20,7 @@ #define MAX_PADS 10 -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct switch_input @@ -77,7 +77,7 @@ void calc_touch_scaling(switch_input_t *sw, uint32_t x, uint32_t y, uint32_t axi sw->touch_scale_y = axis_max / sw->touch_half_resolution_y; } -static int16_t switch_pointer_device_state(switch_input_t *sw, +static int16_t switch_pointer_device_state(switch_input_t *sw, unsigned id, unsigned idx) { if (idx >= MULTITOUCH_LIMIT) @@ -201,7 +201,7 @@ static bool switch_input_set_rumble(void *data, unsigned port, (void)port; (void)effect; (void)strength; - + return false; } diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 8e0b7d5d1d..653194e528 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -507,12 +507,11 @@ static bool udev_input_add_device(udev_input_t *udev, strlcpy(device->devnode, devnode, sizeof(device->devnode)); - /* UDEV_INPUT_MOUSE may report in absolute coords too */ if (type == UDEV_INPUT_MOUSE || type == UDEV_INPUT_TOUCHPAD ) { if (ioctl(fd, EVIOCGABS(ABS_X), &absinfo) >= 0) - { + { if (absinfo.minimum >= absinfo.maximum ) { device->mouse.x_min = -1; @@ -521,12 +520,12 @@ static bool udev_input_add_device(udev_input_t *udev, else { device->mouse.x_min = absinfo.minimum; - device->mouse.x_min = absinfo.maximum; - } + device->mouse.x_min = absinfo.maximum; + } } if (ioctl(fd, EVIOCGABS(ABS_Y), &absinfo) >= 0) - { + { if (absinfo.minimum >= absinfo.maximum ) { device->mouse.y_min = -1; @@ -535,12 +534,12 @@ static bool udev_input_add_device(udev_input_t *udev, else { device->mouse.y_min = absinfo.minimum; - device->mouse.y_min = absinfo.maximum; - } + device->mouse.y_min = absinfo.maximum; + } } } - tmp = ( udev_input_device_t**)realloc(udev->devices, + tmp = ( udev_input_device_t**)realloc(udev->devices, (udev->num_devices + 1) * sizeof(*udev->devices)); if (!tmp) diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c index e9f8c63c7b..ca051459f1 100644 --- a/input/drivers/wayland_input.c +++ b/input/drivers/wayland_input.c @@ -47,7 +47,7 @@ #include "../../verbosity.h" -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ /* Forward declaration */ @@ -99,7 +99,7 @@ static int16_t input_wl_lightgun_state(input_ctx_wayland_data_t *wl, unsigned id } /* forward declaration */ -bool wayland_context_gettouchpos(void *data, unsigned id, +bool wayland_context_gettouchpos(void *data, unsigned id, unsigned* touch_x, unsigned* touch_y); static void input_wl_touch_pool(void *data) @@ -108,7 +108,7 @@ static void input_wl_touch_pool(void *data) unsigned touch_x = 0; unsigned touch_y = 0; input_ctx_wayland_data_t *wl = (input_ctx_wayland_data_t*)data; - + if (!wl) return; diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c index 0710c223d0..f43e4eb9b6 100644 --- a/input/drivers/xdk_xinput_input.c +++ b/input/drivers/xdk_xinput_input.c @@ -32,7 +32,7 @@ #define MAX_PADS 4 -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ typedef struct xdk_input diff --git a/input/drivers/xenon360_input.c b/input/drivers/xenon360_input.c index 2715055761..cd782a7a7a 100644 --- a/input/drivers/xenon360_input.c +++ b/input/drivers/xenon360_input.c @@ -27,7 +27,7 @@ #define MAX_PADS 4 -/* TODO/FIXME - +/* TODO/FIXME - * fix game focus toggle */ static uint64_t state[MAX_PADS]; diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c index 9a52f08f7e..656b94a83f 100644 --- a/input/drivers_hid/iohidmanager_hid.c +++ b/input/drivers_hid/iohidmanager_hid.c @@ -591,7 +591,7 @@ static void iohidmanager_hid_device_add_device( kHIDUsage_Sim_Accelerator, kHIDUsage_Sim_Brake }; - + #if !(defined(__ppc__) || defined(__ppc64__)) /* check if pad was already registered previously (by deterministic method) * if so do not re-add the pad */ @@ -604,7 +604,7 @@ static void iohidmanager_hid_device_add_device( return; } #endif - + IOReturn ret; uint16_t dev_vid, dev_pid; CFArrayRef elements_raw; @@ -994,7 +994,7 @@ static int iohidmanager_hid_manager_set_device_matching( uint32_t lid; struct hid_list *next; } hid_list_t; - + hid_list_t* devList = NULL; for (long i=0; idevice, hid); #endif - + //printf("%d\n",ptr->lid); ptr = ptr->next; free(devList); diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index c58a5591f8..16ef15b214 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -150,7 +150,7 @@ static void dinput_create_rumble_effects(struct dinput_joypad_data *pad) pad->rumble_props.dwTriggerRepeatInterval = 0; pad->rumble_props.cbTypeSpecificParams = sizeof(DICONSTANTFORCE); pad->rumble_props.dwDuration = INFINITE; - pad->rumble_props.dwFlags = DIEFF_CARTESIAN | + pad->rumble_props.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; pad->rumble_props.dwGain = 0; pad->rumble_props.dwSize = sizeof(DIEFFECT); @@ -257,7 +257,7 @@ static bool guid_is_xinput_device(const GUID* product_guid) if ((raw_devs[i].dwType == RIM_TYPEHID) && (GetRawInputDeviceInfoA(raw_devs[i].hDevice, RIDI_DEVICEINFO, &rdi, &rdiSize) != ((UINT)-1)) && - (MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId) + (MAKELONG(rdi.hid.dwVendorId, rdi.hid.dwProductId) == ((LONG)product_guid->Data1)) && (GetRawInputDeviceInfoA(raw_devs[i].hDevice, RIDI_DEVICENAME, devName, &nameSize) != ((UINT)-1)) && (strstr(devName, "IG_") != NULL) ) diff --git a/input/drivers_joypad/mfi_joypad.m b/input/drivers_joypad/mfi_joypad.m index b1b515a9d2..95a3024595 100644 --- a/input/drivers_joypad/mfi_joypad.m +++ b/input/drivers_joypad/mfi_joypad.m @@ -194,7 +194,7 @@ static void apple_gamecontroller_joypad_connect(GCController *controller) { /* find a new slot for this controller that's unused */ unsigned i; - + for (i = 0; i < MAX_MFI_CONTROLLERS; ++i) { if (mfi_controllers[i]) @@ -355,7 +355,7 @@ static const char *apple_gamecontroller_joypad_name(unsigned pad) { if (pad >= MAX_USERS) return NULL; - + return "mFi Controller"; } diff --git a/input/drivers_joypad/ps2_joypad.c b/input/drivers_joypad/ps2_joypad.c index 8ba07273c6..8db0abf905 100644 --- a/input/drivers_joypad/ps2_joypad.c +++ b/input/drivers_joypad/ps2_joypad.c @@ -112,7 +112,7 @@ static void ps2_joypad_poll(void) pad_state[player] |= (state_tmp & PAD_L2) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L2) : 0; pad_state[player] |= (state_tmp & PAD_R3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R3) : 0; pad_state[player] |= (state_tmp & PAD_L3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0; - + } } } diff --git a/input/drivers_joypad/ps4_joypad.c b/input/drivers_joypad/ps4_joypad.c index d9a65c88a2..aeb49062b1 100644 --- a/input/drivers_joypad/ps4_joypad.c +++ b/input/drivers_joypad/ps4_joypad.c @@ -70,7 +70,6 @@ static uint64_t pad_state[PS4_MAX_ORBISPADS]; static int16_t analog_state[PS4_MAX_ORBISPADS][2][2]; static int16_t num_players = 0; - static const char *ps4_joypad_name(unsigned pad) { return "PS4 Controller"; @@ -165,7 +164,7 @@ static void ps4_joypad_poll(void) unsigned j, k; unsigned i = player; unsigned p = player; - + int ret = scePadReadState(ds_joypad_states[player].handle,&buttons); if (ret == 0) { @@ -204,7 +203,6 @@ static bool ps4_joypad_rumble(unsigned pad, return false; } - static void ps4_joypad_destroy(void) { } diff --git a/input/drivers_joypad/switch_joypad.c b/input/drivers_joypad/switch_joypad.c index c40745af31..247a8baa6c 100644 --- a/input/drivers_joypad/switch_joypad.c +++ b/input/drivers_joypad/switch_joypad.c @@ -233,7 +233,7 @@ static void switch_joypad_poll(void) rsx = ent8.right_stick_x; rsy = ent8.right_stick_y; } - + analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_X] = lsx; analog_state[0][RETRO_DEVICE_INDEX_ANALOG_LEFT][RETRO_DEVICE_ID_ANALOG_Y] = -lsy; analog_state[0][RETRO_DEVICE_INDEX_ANALOG_RIGHT][RETRO_DEVICE_ID_ANALOG_X] = rsx; diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c index c420d2b18b..415b3b7599 100644 --- a/input/drivers_joypad/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -224,7 +224,7 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char by testing if the axis initial value is negative, allowing for for some slop (1300 =~ 4%)in an axis centred around 0. The actual work is done in udev_joypad_axis. - All bets are off if you're sitting on it. Reinitailise it by unpluging + All bets are off if you're sitting on it. Reinitailise it by unpluging and plugging back in. */ if (udev_compute_axis(abs, abs->value) < -1300) pad->neg_trigger[i] = true; diff --git a/input/drivers_joypad/xdk_joypad.c b/input/drivers_joypad/xdk_joypad.c index 0a5a1633a4..000540b4e1 100644 --- a/input/drivers_joypad/xdk_joypad.c +++ b/input/drivers_joypad/xdk_joypad.c @@ -285,7 +285,7 @@ static void xdk_joypad_poll(void) if (XInputPoll(gamepads[port]) != ERROR_SUCCESS) continue; #endif - + memset(&g_xinput_states[port], 0, sizeof(xinput_joypad_state)); g_xinput_states[port].connected = ! diff --git a/input/include/xfree86_keycodes.h b/input/include/xfree86_keycodes.h index 827088f2ae..7d92c0a50e 100644 --- a/input/include/xfree86_keycodes.h +++ b/input/include/xfree86_keycodes.h @@ -23,7 +23,7 @@ enum xfvk_key { XFVK_UNKNOWN = 0, XFVK_FIRST = 0, - + XFVK_ESC = 9, XFVK_FK01 = 67, XFVK_FK02 = 68, @@ -103,7 +103,7 @@ enum xfvk_key XFVK_SPCE = 65, XFVK_RCTL = 105, XFVK_RALT = 108, - + XFVK_PRSC = 107, // SYRQ = 107, XFVK_SCLK = 78, @@ -145,7 +145,6 @@ enum xfvk_key XFVK_KPDL = 91, XFVK_KPEQ = 125, - // Microsoft keyboard extra keys XFVK_LWIN = 133, XFVK_RWIN = 134, @@ -171,6 +170,5 @@ enum xfvk_key XFVK_LAST, XFVK_DUMMY = 255 }; - -#endif /* __XFREE86_KEYCODES__H */ +#endif /* __XFREE86_KEYCODES__H */ diff --git a/input/input_overlay.c b/input/input_overlay.c index 29f9512843..fcf39cff5b 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -343,7 +343,7 @@ static void input_overlay_enable(input_overlay_t *ol, bool enable) * Check whether the given @x and @y coordinates of the overlay * descriptor @desc is inside the overlay descriptor's hitbox. * - * Returns: true (1) if X, Y coordinates are inside a hitbox, + * Returns: true (1) if X, Y coordinates are inside a hitbox, * otherwise false (0). **/ static bool inside_hitbox(const struct overlay_desc *desc, float x, float y) @@ -434,13 +434,13 @@ static void input_overlay_poll( float x_val_sat = x_val / desc->analog_saturate_pct; float y_val_sat = y_val / desc->analog_saturate_pct; - unsigned int base = - (desc->type == OVERLAY_TYPE_ANALOG_RIGHT) + unsigned int base = + (desc->type == OVERLAY_TYPE_ANALOG_RIGHT) ? 2 : 0; - out->analog[base + 0] = clamp_float(x_val_sat, -1.0f, 1.0f) + out->analog[base + 0] = clamp_float(x_val_sat, -1.0f, 1.0f) * 32767.0f; - out->analog[base + 1] = clamp_float(y_val_sat, -1.0f, 1.0f) + out->analog[base + 1] = clamp_float(y_val_sat, -1.0f, 1.0f) * 32767.0f; } break; @@ -614,8 +614,8 @@ void input_overlay_loaded(void *task_data, void *user_data, const char *err) } #endif - if ( !data->overlay_enable || - !video_driver_overlay_interface(&iface) || + if ( !data->overlay_enable || + !video_driver_overlay_interface(&iface) || !iface) { RARCH_ERR("Overlay interface is not present in video driver," @@ -655,7 +655,7 @@ void input_overlay_set_visibility(int overlay_idx, enum overlay_visibility vis) { input_overlay_t *ol = overlay_ptr; - + if (!visibility) { unsigned i; @@ -685,7 +685,7 @@ static enum overlay_visibility input_overlay_get_visibility(int overlay_idx) static bool input_overlay_is_hidden(int overlay_idx) { - return (input_overlay_get_visibility(overlay_idx) + return (input_overlay_get_visibility(overlay_idx) == OVERLAY_VISIBILITY_HIDDEN); } diff --git a/input/input_remapping.c b/input/input_remapping.c index b187756954..ba231c2a11 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -209,17 +209,17 @@ bool input_remapping_save_file(const char *path) key_strings[j], '_', sizeof(btn_ident[j])); /* only save values that have been modified */ - if(settings->uints.input_remap_ids[i][j] != j && + if(settings->uints.input_remap_ids[i][j] != j && settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED) config_set_int(conf, btn_ident[j], settings->uints.input_remap_ids[i][j]); - else if (settings->uints.input_remap_ids[i][j] != j && + else if (settings->uints.input_remap_ids[i][j] != j && settings->uints.input_remap_ids[i][j] == RARCH_UNMAPPED) config_set_int(conf, btn_ident[j], -1); else config_unset(conf,btn_ident[j]); if (settings->uints.input_keymapper_ids[i][j] != RETROK_UNKNOWN) - config_set_int(conf, key_ident[j], + config_set_int(conf, key_ident[j], settings->uints.input_keymapper_ids[i][j]); } else @@ -227,13 +227,13 @@ bool input_remapping_save_file(const char *path) k = j - RARCH_FIRST_CUSTOM_BIND; fill_pathname_join_delim(stk_ident[k], s3, key_strings[j], '_', sizeof(stk_ident[k])); - if(settings->uints.input_remap_ids[i][j] != j && + if(settings->uints.input_remap_ids[i][j] != j && settings->uints.input_remap_ids[i][j] != RARCH_UNMAPPED) - config_set_int(conf, stk_ident[k], + config_set_int(conf, stk_ident[k], settings->uints.input_remap_ids[i][j]); - else if(settings->uints.input_remap_ids[i][j] != j && + else if(settings->uints.input_remap_ids[i][j] != j && settings->uints.input_remap_ids[i][j] == RARCH_UNMAPPED) - config_set_int(conf, stk_ident[k], + config_set_int(conf, stk_ident[k], -1); else config_unset(conf, stk_ident[k]); diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index c6a99ce1c7..18cdfc12db 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -16,7 +16,7 @@ MSG_HASH( "调整 Switch 的屏幕亮度" ) #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) MSG_HASH( MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, "CPU 超频" @@ -915,7 +915,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU, MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS, "在图层上显示控制器") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT, - "显示控制器所在图层编号") + "显示控制器所在图层编号") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR, "轮询类型行为") MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY, @@ -1079,7 +1079,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES, MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN, "输入延迟帧") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE, - "输入延迟帧范围") + "输入延迟帧范围") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES, "在线游戏延迟帧数") MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT, @@ -1988,7 +1988,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_BADGES_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_VERBOSE_ENABLE, "启用或禁用屏显消息（OSD）显示成就获取情况。") MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_AUTO_SCREENSHOT, - "当完成一个成就时，自动截图。") + "当完成一个成就时，自动截图。") MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, "修改驱动设置。") MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS, @@ -2013,7 +2013,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, "修改你的隐私设置。") MSG_HASH( MENU_ENUM_SUBLABEL_MIDI_SETTINGS, - "更改 MIDI 设置。") + "更改 MIDI 设置。") MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, "修改此系统的默认文件夹。") MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS, @@ -2832,7 +2832,7 @@ MSG_HASH( MSG_HASH( MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE, "After each 'Number of Iterations' the Value will be increased by this amount." - ) + ) MSG_HASH( MENU_ENUM_SUBLABEL_REWIND_GRANULARITY, "每次回溯时回退的帧数。数值越高，回溯越快。" @@ -3338,7 +3338,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE, MSG_HASH(MENU_ENUM_SUBLABEL_XMB_FONT, "设置菜单中使用的自定义字体文件。") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES, - "在主菜单中显示收藏页。") + "在主菜单中显示收藏页。") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES, "在主菜单中显示图像页。") MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC, diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index b78379bb90..1be3956bfc 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -16,7 +16,7 @@ MSG_HASH( "Anpassen der Switch Bildschirmhelligkeit" ) #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) MSG_HASH( MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, "CPU Übertakten" diff --git a/intl/msg_hash_el.c b/intl/msg_hash_el.c index 54e449bbc4..b4dac8c249 100644 --- a/intl/msg_hash_el.c +++ b/intl/msg_hash_el.c @@ -117,7 +117,7 @@ int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len) "Εάν αυτό το πλήκτρο είναι συνδεδεμένο είτε με\n" "ένα πληκτρολόγιο ή κάποιο κουμπί χειριστιερίου, \n" "όλα τα υπόλοιπα κουμπιά εντολών θα ενεργοποιηθούν μόνο \n"; - const char *u = + const char *u = "εάν και αυτό είναι πατημένο την ίδια στιγμή. \n" " \n" "Διαφορετικά, όλα τα κουμπιά εντολών πληκτρολογίου \n" @@ -253,7 +253,7 @@ int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len) " \n" "Χρειάζεται επανεκκίνηση για να ενεργοποιηθούν \n" "οι αλλαγές. \n"; - const char *u = + const char *u = " \n" "Σημείωση: πιθανόν να μην έχουν εφαρμοστεί \n" "όλες οι γλώσσες. \n" diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c index d074e1ef24..1b0842119f 100644 --- a/intl/msg_hash_es.c +++ b/intl/msg_hash_es.c @@ -319,7 +319,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len) const char *lbl = settings ? settings->arrays.audio_resampler : NULL; if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC))) - strlcpy(s, + strlcpy(s, "Implementación windowed SINC.", len); else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) strlcpy(s, diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 8a3adf4730..bbfe18ff73 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -16,7 +16,7 @@ MSG_HASH( "Ajusta el brillo de la pantalla" ) #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) MSG_HASH( MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, "CPU Overclock" @@ -7678,7 +7678,7 @@ MSG_HASH( MSG_HASH( MENU_ENUM_SUBLABEL_VIDEO_ADAPTIVE_VSYNC, "V-Sync está activado hasta que el rendimiento sea inferior al necesario para mantener el refresco de pantalla.\n" - "Puede minimizar los tirones cuando hay caidas de fps y es més eficiente energeticamente." + "Puede minimizar los tirones cuando hay caidas de fps y es més eficiente energeticamente." ) MSG_HASH( MENU_ENUM_LABEL_VALUE_CRT_SWITCHRES_SETTINGS, diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c index 067b38c31f..c81047efa0 100644 --- a/intl/msg_hash_it.c +++ b/intl/msg_hash_it.c @@ -285,7 +285,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len) strlcpy(s, "Implementazione SINC in modalità finestra.", len); else if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC))) - strlcpy(s, + strlcpy(s, "Implementazione coseno complesso.", len); } break; diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c index ea3aa929e0..cce4a0efe1 100644 --- a/intl/msg_hash_ko.c +++ b/intl/msg_hash_ko.c @@ -65,7 +65,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) snprintf(s, len, "일시정지/해제 상태를 전환합니다."); break; - + case RARCH_FRAMEADVANCE: snprintf(s, len, "컨텐츠 일시정지시 프레임을 진행합니다."); diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 750c693151..3b4071576b 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -4,7 +4,7 @@ MSG_HASH(MENU_ENUM_LABEL_SWITCH_GPU_PROFILE, MSG_HASH(MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL, "switch_backlight_control") #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) MSG_HASH(MENU_ENUM_LABEL_SWITCH_CPU_PROFILE, "switch_cpu_profile") #endif diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index 51efefbdea..19f22420c0 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -16,7 +16,7 @@ MSG_HASH( "Aumentar ou diminuir o brilho da tela do Switch" ) #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) MSG_HASH( MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE, "Overclock da CPU" diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c index 6905970494..68737a3c04 100644 --- a/intl/msg_hash_us.c +++ b/intl/msg_hash_us.c @@ -914,13 +914,13 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len); } break; - - case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION: snprintf(s, len, "SET CRT"); + + case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION: snprintf(s, len, "SET CRT"); break; - - case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER: snprintf(s, len, "SET CRT SUPER"); + + case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER: snprintf(s, len, "SET CRT SUPER"); break; - + case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET: snprintf(s, len, "Load Shader Preset. \n" diff --git a/led/drivers/led_overlay.c b/led/drivers/led_overlay.c index f8f7bcd21b..2023e43142 100644 --- a/led/drivers/led_overlay.c +++ b/led/drivers/led_overlay.c @@ -56,13 +56,13 @@ static void overlay_set(int led, int state) return; input_overlay_set_visibility(gpio, - state ? OVERLAY_VISIBILITY_VISIBLE + state ? OVERLAY_VISIBILITY_VISIBLE : OVERLAY_VISIBILITY_HIDDEN); RARCH_LOG("[LED]: set visibility %d %d\n", gpio, state); } -const led_driver_t overlay_led_driver = { +const led_driver_t overlay_led_driver = { overlay_init, overlay_free, overlay_set, diff --git a/led/drivers/led_rpi.c b/led/drivers/led_rpi.c index d6797fcb98..481e07a94c 100644 --- a/led/drivers/led_rpi.c +++ b/led/drivers/led_rpi.c @@ -89,7 +89,7 @@ static int setup_gpio(int gpio) fclose(fp); snprintf(buf, sizeof(buf), "/sys/class/gpio/gpio%d/direction", gpio); - fp = fopen(buf, "w"); + fp = fopen(buf, "w"); } if(!fp) diff --git a/led/led_driver.c b/led/led_driver.c index 185245c6de..54a42d1166 100644 --- a/led/led_driver.c +++ b/led/led_driver.c @@ -39,7 +39,7 @@ bool led_driver_init(void) #if HAVE_RPILED if(string_is_equal("rpi", drivername)) current_led_driver = &rpi_led_driver; -#endif +#endif RARCH_LOG("[LED]: LED driver = '%s' %p\n", drivername, current_led_driver); diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c index 03e1a4eabf..aa9a91010d 100644 --- a/libretro-common/audio/audio_mixer.c +++ b/libretro-common/audio/audio_mixer.c @@ -87,7 +87,7 @@ struct audio_mixer_sound const void* data; } ogg; #endif - + #ifdef HAVE_DR_FLAC struct { @@ -95,7 +95,7 @@ struct audio_mixer_sound unsigned size; const void* data; } flac; -#endif +#endif #ifdef HAVE_DR_MP3 struct @@ -104,7 +104,7 @@ struct audio_mixer_sound unsigned size; const void* data; } mp3; -#endif +#endif #ifdef HAVE_IBXM struct @@ -278,7 +278,7 @@ static bool one_shot_resample(const float* in, size_t samples_in, const retro_resampler_t* resampler = NULL; float ratio = (double)s_rate / (double)rate; - if (!retro_resampler_realloc(&data, &resampler, NULL, + if (!retro_resampler_realloc(&data, &resampler, NULL, RESAMPLER_QUALITY_DONTCARE, ratio)) return false; @@ -675,7 +675,6 @@ static bool audio_mixer_play_flac( void *resampler_data = NULL; const retro_resampler_t* resamp = NULL; drflac *dr_flac = drflac_open_memory((const unsigned char*)sound->types.flac.data,sound->types.flac.size); - if (!dr_flac) return false; @@ -1176,7 +1175,7 @@ static void audio_mixer_mix_mp3(float* buffer, size_t num_frames, { again: temp_samples = (unsigned)drmp3_read_f32(&voice->types.mp3.stream, AUDIO_MIXER_TEMP_BUFFER/2, temp_buffer) * 2; - + if (temp_samples == 0) { if (voice->repeat) diff --git a/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp b/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp index d45db3c586..41b2775f51 100644 --- a/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp +++ b/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp @@ -13,7 +13,7 @@ eq_gains = "6 9 12 7 6 5 7 9 11 6 0" reverb_damping = 0.8 reverb_roomwidth = 0.25 reverb_roomsize = 0.25 - + # IIR - filters out some harsh sounds on the upper end iir_type = RIAA_CD diff --git a/libretro-common/audio/dsp_filters/Makefile b/libretro-common/audio/dsp_filters/Makefile index ab0900fd9d..d3c228cd94 100644 --- a/libretro-common/audio/dsp_filters/Makefile +++ b/libretro-common/audio/dsp_filters/Makefile @@ -64,7 +64,7 @@ asflags := $(ASFLAGS) -fPIC $(extra_flags) objects := ifeq (1,$(use_neon)) - ASMFLAGS := -INEON/asm + ASMFLAGS := -INEON/asm asflags += -mfpu=neon endif diff --git a/libretro-common/audio/dsp_filters/tremolo.c b/libretro-common/audio/dsp_filters/tremolo.c index b717c6588f..8c5bb40a5a 100644 --- a/libretro-common/audio/dsp_filters/tremolo.c +++ b/libretro-common/audio/dsp_filters/tremolo.c @@ -58,14 +58,14 @@ static void tremolocore_init(struct tremolo_core *core,float depth,int samplerat unsigned i; double env; core->index = 0; - core->maxindex = samplerate/freq; + core->maxindex = samplerate/freq; core->wavetable = malloc(core->maxindex*sizeof(float)); memset(core->wavetable, 0, core->maxindex * sizeof(float)); for (i = 0; i < core->maxindex; i++) { env = freq * i / samplerate; env = sin((M_PI*2) * fmod(env + 0.25, 1.0)); core->wavetable[i] = env * (1 - fabs(offset)) + offset; - } + } } float tremolocore_core(struct tremolo_core *core,float in) diff --git a/libretro-common/audio/dsp_filters/vibrato.c b/libretro-common/audio/dsp_filters/vibrato.c index 9a5d3432ba..7752489f7c 100644 --- a/libretro-common/audio/dsp_filters/vibrato.c +++ b/libretro-common/audio/dsp_filters/vibrato.c @@ -79,7 +79,7 @@ static void vibratocore_init(struct vibrato_core *core,float depth,int samplerat core->freq = freq; core->depth = depth; core->phase = 0; - core->writeindex = 0; + core->writeindex = 0; } float vibratocore_core(struct vibrato_core *core,float in) diff --git a/libretro-common/audio/resampler/audio_resampler.c b/libretro-common/audio/resampler/audio_resampler.c index dc3df93d3a..306d325a8a 100644 --- a/libretro-common/audio/resampler/audio_resampler.c +++ b/libretro-common/audio/resampler/audio_resampler.c @@ -212,4 +212,3 @@ void audio_resampler_unlock(void) slock_unlock(s_resampler_lock); #endif } - diff --git a/libretro-common/audio/resampler/drivers/nearest_resampler.c b/libretro-common/audio/resampler/drivers/nearest_resampler.c index 982d4fe67d..5ef44c00a6 100644 --- a/libretro-common/audio/resampler/drivers/nearest_resampler.c +++ b/libretro-common/audio/resampler/drivers/nearest_resampler.c @@ -62,7 +62,7 @@ static void resampler_nearest_free(void *re_) } static void *resampler_nearest_init(const struct resampler_config *config, - double bandwidth_mod, + double bandwidth_mod, enum resampler_quality quality, resampler_simd_mask_t mask) { diff --git a/libretro-common/audio/resampler/drivers/null_resampler.c b/libretro-common/audio/resampler/drivers/null_resampler.c index b970dfe0f5..f69a3babb7 100644 --- a/libretro-common/audio/resampler/drivers/null_resampler.c +++ b/libretro-common/audio/resampler/drivers/null_resampler.c @@ -41,7 +41,7 @@ static void resampler_null_free(void *re_) } static void *resampler_null_init(const struct resampler_config *config, - double bandwidth_mod, + double bandwidth_mod, enum resampler_quality quality, resampler_simd_mask_t mask) { diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler.c b/libretro-common/audio/resampler/drivers/sinc_resampler.c index 4764c4b063..dd45a93411 100644 --- a/libretro-common/audio/resampler/drivers/sinc_resampler.c +++ b/libretro-common/audio/resampler/drivers/sinc_resampler.c @@ -564,7 +564,7 @@ static void sinc_init_table_lanczos(rarch_sinc_resampler_t *resamp, double cutof } static void *resampler_sinc_new(const struct resampler_config *config, - double bandwidth_mod, enum resampler_quality quality, + double bandwidth_mod, enum resampler_quality quality, resampler_simd_mask_t mask) { double cutoff = 0.0; diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S b/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S index 15a3773414..c31640f002 100644 --- a/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S +++ b/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S @@ -39,7 +39,7 @@ process_sinc_neon_asm: _process_sinc_neon_asm: - push {r4, lr} + push {r4, lr} vmov.f32 q0, #0.0 vmov.f32 q8, #0.0 @@ -68,7 +68,7 @@ _process_sinc_neon_asm: vadd.f32 d16, d16, d17 vpadd.f32 d0, d0, d16 vst1.f32 d0, [r0] - + pop {r4, pc} #endif diff --git a/libretro-common/compat/compat_snprintf.c b/libretro-common/compat/compat_snprintf.c index 7011644280..b69ad047a2 100644 --- a/libretro-common/compat/compat_snprintf.c +++ b/libretro-common/compat/compat_snprintf.c @@ -49,7 +49,7 @@ static int c89_vscprintf_retro__(const char *format, va_list pargs) int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap) { int count = -1; - + if (size != 0) { #if (_MSC_VER <= 1310) diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index b5fca018e8..09138819c2 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -509,13 +509,13 @@ unsigned cpu_features_get_core_amount(void) case 3: /*Old 3/2DS*/ return 2; - + case 2: case 4: case 5: /*New 3/2DS*/ return 4; - + default: /*Unknown Device Or Check Failed*/ break; diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 27f96f34bb..67cb6767c8 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -305,7 +305,7 @@ const char *path_get_archive_delim(const char *path) */ const char *path_get_extension(const char *path) { - const char *ext = !string_is_empty(path) + const char *ext = !string_is_empty(path) ? strrchr(path_basename(path), '.') : NULL; if (!ext) return ""; @@ -320,7 +320,7 @@ const char *path_get_extension(const char *path) * text after and including the last '.'. * Only '.'s after the last slash are considered. * - * Returns: + * Returns: * 1) If path has an extension, returns path with the * extension removed. * 2) If there is no extension, returns NULL. @@ -328,7 +328,7 @@ const char *path_get_extension(const char *path) */ char *path_remove_extension(char *path) { - char *last = !string_is_empty(path) + char *last = !string_is_empty(path) ? (char*)strrchr(path_basename(path), '.') : NULL; if (!last) return NULL; diff --git a/libretro-common/file/nbio/nbio_orbis.c b/libretro-common/file/nbio/nbio_orbis.c index 7005f6b8cf..b7fb445c55 100644 --- a/libretro-common/file/nbio/nbio_orbis.c +++ b/libretro-common/file/nbio/nbio_orbis.c @@ -60,7 +60,6 @@ static void *nbio_orbis_open(const char * filename, unsigned int mode) return NULL; handle = (struct nbio_orbis_t*)malloc(sizeof(struct nbio_orbis_t)); - if (!handle) goto error; @@ -163,7 +162,6 @@ static bool nbio_orbis_iterate(void *data) amount = handle->len; RARCH_LOG("[NBIO_ORBIS] iterate BIO_READ fd=%d readbytes=%d\n", handle->fd, orbisRead(handle->fd, (char*)handle->data, amount)); - } else { @@ -190,7 +188,6 @@ static bool nbio_orbis_iterate(void *data) { RARCH_LOG("[NBIO_ORBIS] iterate write fd=%d writebytes=%d\n", handle->fd, orbisWrite(handle->fd, (char*)handle->data + handle->progress, amount)); - } break; } @@ -291,6 +288,6 @@ nbio_intf_t nbio_orbis = { NULL, NULL, NULL, - "nbio_orbis", + "nbio_orbis", }; #endif diff --git a/libretro-common/formats/libchdr/libchdr_chd.c b/libretro-common/formats/libchdr/libchdr_chd.c index ddb951241e..7ac16a5e4b 100644 --- a/libretro-common/formats/libchdr/libchdr_chd.c +++ b/libretro-common/formats/libchdr/libchdr_chd.c @@ -952,7 +952,7 @@ chd_error chd_open(const char *filename, int mode, chd_file *parent, chd_file ** } /* open the file */ - file = filestream_open(filename, + file = filestream_open(filename, RETRO_VFS_FILE_ACCESS_READ, RETRO_VFS_FILE_ACCESS_HINT_NONE); diff --git a/libretro-common/formats/libchdr/libchdr_flac_codec.c b/libretro-common/formats/libchdr/libchdr_flac_codec.c index 83abadd3f2..3a6e669268 100644 --- a/libretro-common/formats/libchdr/libchdr_flac_codec.c +++ b/libretro-common/formats/libchdr/libchdr_flac_codec.c @@ -1,163 +1,163 @@ -/*************************************************************************** - - libchdr_flac_codec.c - - MAME Compressed Hunks of Data file format - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#define TRUE 1 -#define FALSE 0 - -/*************************************************************************** - * CD FLAC DECOMPRESSOR - *************************************************************************** - */ - -/*------------------------------------------------------ - * cdfl_codec_blocksize - return the optimal block size - *------------------------------------------------------ - */ - -static uint32_t cdfl_codec_blocksize(uint32_t bytes) -{ - /* determine FLAC block size, which must be 16-65535 - * clamp to 2k since that's supposed to be the sweet spot */ - uint32_t hunkbytes = bytes / 4; - while (hunkbytes > 2048) - hunkbytes /= 2; - return hunkbytes; -} - -chd_error cdfl_codec_init(void *codec, uint32_t hunkbytes) -{ -#ifdef WANT_SUBCODE - chd_error ret; -#endif - uint16_t native_endian = 0; - cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; - - /* make sure the CHD's hunk size is an even multiple of the frame size */ - if (hunkbytes % CD_FRAME_SIZE != 0) - return CHDERR_CODEC_ERROR; - - cdfl->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); - if (cdfl->buffer == NULL) - return CHDERR_OUT_OF_MEMORY; - - /* determine whether we want native or swapped samples */ - *(uint8_t *)(&native_endian) = 1; - cdfl->swap_endian = (native_endian & 1); - -#ifdef WANT_SUBCODE - /* init zlib inflater */ - ret = zlib_codec_init(&cdfl->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); - if (ret != CHDERR_NONE) - return ret; -#endif - - /* flac decoder init */ - flac_decoder_init(&cdfl->decoder); - if (cdfl->decoder.decoder == NULL) - return CHDERR_OUT_OF_MEMORY; - - return CHDERR_NONE; -} - -void cdfl_codec_free(void *codec) -{ - cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; - flac_decoder_free(&cdfl->decoder); -#ifdef WANT_SUBCODE - zlib_codec_free(&cdfl->subcode_decompressor); -#endif - if (cdfl->buffer) - free(cdfl->buffer); -} - -chd_error cdfl_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) -{ - uint32_t framenum; - uint8_t *buffer; -#ifdef WANT_SUBCODE - uint32_t offset; - chd_error ret; -#endif - cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; - - /* reset and decode */ - uint32_t frames = destlen / CD_FRAME_SIZE; - - if (!flac_decoder_reset(&cdfl->decoder, 44100, 2, cdfl_codec_blocksize(frames * CD_MAX_SECTOR_DATA), src, complen)) - return CHDERR_DECOMPRESSION_ERROR; - buffer = &cdfl->buffer[0]; - if (!flac_decoder_decode_interleaved(&cdfl->decoder, (int16_t *)(buffer), frames * CD_MAX_SECTOR_DATA/4, cdfl->swap_endian)) - return CHDERR_DECOMPRESSION_ERROR; - -#ifdef WANT_SUBCODE - /* inflate the subcode data */ - offset = flac_decoder_finish(&cdfl->decoder); - ret = zlib_codec_decompress(&cdfl->subcode_decompressor, src + offset, complen - offset, &cdfl->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); - if (ret != CHDERR_NONE) - return ret; -#else - flac_decoder_finish(&cdfl->decoder); -#endif - - /* reassemble the data */ - for (framenum = 0; framenum < frames; framenum++) - { - memcpy(&dest[framenum * CD_FRAME_SIZE], &cdfl->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); -#ifdef WANT_SUBCODE - memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdfl->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); -#endif - } - - return CHDERR_NONE; -} +/*************************************************************************** + + libchdr_flac_codec.c + + MAME Compressed Hunks of Data file format + +**************************************************************************** + + Copyright Aaron Giles + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define TRUE 1 +#define FALSE 0 + +/*************************************************************************** + * CD FLAC DECOMPRESSOR + *************************************************************************** + */ + +/*------------------------------------------------------ + * cdfl_codec_blocksize - return the optimal block size + *------------------------------------------------------ + */ + +static uint32_t cdfl_codec_blocksize(uint32_t bytes) +{ + /* determine FLAC block size, which must be 16-65535 + * clamp to 2k since that's supposed to be the sweet spot */ + uint32_t hunkbytes = bytes / 4; + while (hunkbytes > 2048) + hunkbytes /= 2; + return hunkbytes; +} + +chd_error cdfl_codec_init(void *codec, uint32_t hunkbytes) +{ +#ifdef WANT_SUBCODE + chd_error ret; +#endif + uint16_t native_endian = 0; + cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; + + /* make sure the CHD's hunk size is an even multiple of the frame size */ + if (hunkbytes % CD_FRAME_SIZE != 0) + return CHDERR_CODEC_ERROR; + + cdfl->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); + if (cdfl->buffer == NULL) + return CHDERR_OUT_OF_MEMORY; + + /* determine whether we want native or swapped samples */ + *(uint8_t *)(&native_endian) = 1; + cdfl->swap_endian = (native_endian & 1); + +#ifdef WANT_SUBCODE + /* init zlib inflater */ + ret = zlib_codec_init(&cdfl->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); + if (ret != CHDERR_NONE) + return ret; +#endif + + /* flac decoder init */ + flac_decoder_init(&cdfl->decoder); + if (cdfl->decoder.decoder == NULL) + return CHDERR_OUT_OF_MEMORY; + + return CHDERR_NONE; +} + +void cdfl_codec_free(void *codec) +{ + cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; + flac_decoder_free(&cdfl->decoder); +#ifdef WANT_SUBCODE + zlib_codec_free(&cdfl->subcode_decompressor); +#endif + if (cdfl->buffer) + free(cdfl->buffer); +} + +chd_error cdfl_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) +{ + uint32_t framenum; + uint8_t *buffer; +#ifdef WANT_SUBCODE + uint32_t offset; + chd_error ret; +#endif + cdfl_codec_data *cdfl = (cdfl_codec_data*)codec; + + /* reset and decode */ + uint32_t frames = destlen / CD_FRAME_SIZE; + + if (!flac_decoder_reset(&cdfl->decoder, 44100, 2, cdfl_codec_blocksize(frames * CD_MAX_SECTOR_DATA), src, complen)) + return CHDERR_DECOMPRESSION_ERROR; + buffer = &cdfl->buffer[0]; + if (!flac_decoder_decode_interleaved(&cdfl->decoder, (int16_t *)(buffer), frames * CD_MAX_SECTOR_DATA/4, cdfl->swap_endian)) + return CHDERR_DECOMPRESSION_ERROR; + +#ifdef WANT_SUBCODE + /* inflate the subcode data */ + offset = flac_decoder_finish(&cdfl->decoder); + ret = zlib_codec_decompress(&cdfl->subcode_decompressor, src + offset, complen - offset, &cdfl->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); + if (ret != CHDERR_NONE) + return ret; +#else + flac_decoder_finish(&cdfl->decoder); +#endif + + /* reassemble the data */ + for (framenum = 0; framenum < frames; framenum++) + { + memcpy(&dest[framenum * CD_FRAME_SIZE], &cdfl->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); +#ifdef WANT_SUBCODE + memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdfl->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); +#endif + } + + return CHDERR_NONE; +} diff --git a/libretro-common/formats/libchdr/libchdr_lzma.c b/libretro-common/formats/libchdr/libchdr_lzma.c index 69bafbbff8..cf39b97838 100644 --- a/libretro-common/formats/libchdr/libchdr_lzma.c +++ b/libretro-common/formats/libchdr/libchdr_lzma.c @@ -1,354 +1,351 @@ -/*************************************************************************** - - libchdr_lzma_codec.c - - MAME Compressed Hunks of Data file format - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#define TRUE 1 -#define FALSE 0 - -/*************************************************************************** - * LZMA ALLOCATOR HELPER - *************************************************************************** - */ - -/*------------------------------------------------- - * lzma_fast_alloc - fast malloc for lzma, which - * allocates and frees memory frequently - *------------------------------------------------- - */ - -static void *lzma_fast_alloc(void *p, size_t size) -{ - int scan; - uint32_t *addr = NULL; - lzma_allocator *codec = (lzma_allocator *)(p); - - /* compute the size, rounding to the nearest 1k */ - size = (size + 0x3ff) & ~0x3ff; - - /* reuse a hunk if we can */ - for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) - { - uint32_t *ptr = codec->allocptr[scan]; - if (ptr != NULL && size == *ptr) - { - /* set the low bit of the size so we don't match next time */ - *ptr |= 1; - return ptr + 1; - } - } - - /* alloc a new one and put it into the list */ - addr = (uint32_t *)malloc(sizeof(uint32_t) * (size + sizeof(uint32_t))); - if (!addr) - return NULL; - - for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) - { - if (codec->allocptr[scan] == NULL) - { - codec->allocptr[scan] = addr; - break; - } - } - - /* set the low bit of the size so we don't match next time */ - *addr = size | 1; - return addr + 1; -} - -/*------------------------------------------------- - * lzma_fast_free - fast free for lzma, which - * allocates and frees memory frequently - *------------------------------------------------- - */ -static void lzma_fast_free(void *p, void *address) -{ - int scan; - uint32_t *ptr; - lzma_allocator *codec; - if (address == NULL) - return; - - codec = (lzma_allocator *)(p); - - /* find the hunk */ - ptr = (uint32_t *)(address) - 1; - for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) - { - if (ptr == codec->allocptr[scan]) - { - /* clear the low bit of the size to allow matches */ - *ptr &= ~1; - return; - } - } -} - - -/*------------------------------------------------- - * lzma_allocator_init - *------------------------------------------------- - */ - -void lzma_allocator_init(void* p) -{ - lzma_allocator *codec = (lzma_allocator *)(p); - - /* reset pointer list */ - memset(codec->allocptr, 0, sizeof(codec->allocptr)); - codec->Alloc = lzma_fast_alloc; - codec->Free = lzma_fast_free; -} - -/*------------------------------------------------- - * lzma_allocator_free - *------------------------------------------------- - */ - -void lzma_allocator_free(void* p ) -{ - lzma_allocator *codec = (lzma_allocator *)(p); - - /* free our memory */ - int i; - for (i = 0 ; i < MAX_LZMA_ALLOCS ; i++) - { - if (codec->allocptr[i] != NULL) - free(codec->allocptr[i]); - } -} - - - -/*************************************************************************** - * LZMA DECOMPRESSOR - *************************************************************************** - */ - -/*------------------------------------------------- - * lzma_codec_init - constructor - *------------------------------------------------- - */ - -chd_error lzma_codec_init(void* codec, uint32_t hunkbytes) -{ - CLzmaEncProps encoder_props; - CLzmaEncHandle enc; - uint8_t decoder_props[LZMA_PROPS_SIZE]; - lzma_allocator* alloc; - size_t props_size; - lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; - - /* construct the decoder */ - LzmaDec_Construct(&lzma_codec->decoder); - - /* FIXME: this code is written in a way that makes it impossible to safely upgrade the LZMA SDK - * This code assumes that the current version of the encoder imposes the same requirements on the - * decoder as the encoder used to produce the file. This is not necessarily true. The format - * needs to be changed so the encoder properties are written to the file. - - * configure the properties like the compressor did */ - LzmaEncProps_Init(&encoder_props); - encoder_props.level = 9; - encoder_props.reduceSize = hunkbytes; - LzmaEncProps_Normalize(&encoder_props); - - /* convert to decoder properties */ - alloc = &lzma_codec->allocator; - lzma_allocator_init(alloc); - enc = LzmaEnc_Create((ISzAlloc*)alloc); - if (!enc) - return CHDERR_DECOMPRESSION_ERROR; - if (LzmaEnc_SetProps(enc, &encoder_props) != SZ_OK) - { - LzmaEnc_Destroy(enc, (ISzAlloc*)&alloc, (ISzAlloc*)&alloc); - return CHDERR_DECOMPRESSION_ERROR; - } - props_size = sizeof(decoder_props); - if (LzmaEnc_WriteProperties(enc, decoder_props, &props_size) != SZ_OK) - { - LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc); - return CHDERR_DECOMPRESSION_ERROR; - } - LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc); - - /* do memory allocations */ - if (LzmaDec_Allocate(&lzma_codec->decoder, decoder_props, LZMA_PROPS_SIZE, (ISzAlloc*)alloc) != SZ_OK) - return CHDERR_DECOMPRESSION_ERROR; - - /* Okay */ - return CHDERR_NONE; -} - -/*------------------------------------------------- - * lzma_codec_free - *------------------------------------------------- - */ - -void lzma_codec_free(void* codec) -{ - lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; - lzma_allocator* alloc = &lzma_codec->allocator; - - /* free memory */ - lzma_allocator_free(alloc); - LzmaDec_Free(&lzma_codec->decoder, (ISzAlloc*)&lzma_codec->allocator); -} - -/*------------------------------------------------- - * decompress - decompress data using the LZMA - * codec - *------------------------------------------------- - */ - -chd_error lzma_codec_decompress(void* codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) -{ - ELzmaStatus status; - SRes res; - size_t consumedlen, decodedlen; - /* initialize */ - lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; - LzmaDec_Init(&lzma_codec->decoder); - - /* decode */ - consumedlen = complen; - decodedlen = destlen; - res = LzmaDec_DecodeToBuf(&lzma_codec->decoder, dest, &decodedlen, src, &consumedlen, LZMA_FINISH_END, &status); - if ((res != SZ_OK && res != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK) || consumedlen != complen || decodedlen != destlen) - return CHDERR_DECOMPRESSION_ERROR; - return CHDERR_NONE; -} - -/* cdlz */ -chd_error cdlz_codec_init(void* codec, uint32_t hunkbytes) -{ - chd_error ret; - cdlz_codec_data* cdlz = (cdlz_codec_data*) codec; - - /* allocate buffer */ - cdlz->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); - if (cdlz->buffer == NULL) - return CHDERR_OUT_OF_MEMORY; - - ret = lzma_codec_init(&cdlz->base_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); - if (ret != CHDERR_NONE) - return ret; - -#ifdef WANT_SUBCODE - ret = zlib_codec_init(&cdlz->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); - if (ret != CHDERR_NONE) - return ret; -#endif - - return CHDERR_NONE; -} - -void cdlz_codec_free(void* codec) -{ - cdlz_codec_data* cdlz = (cdlz_codec_data*) codec; - - lzma_codec_free(&cdlz->base_decompressor); -#ifdef WANT_SUBCODE - zlib_codec_free(&cdlz->subcode_decompressor); -#endif - if (cdlz->buffer) - free(cdlz->buffer); -} - -chd_error cdlz_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) -{ -#ifdef WANT_RAW_DATA_SECTOR - uint8_t *sector; -#endif - uint32_t framenum; - cdlz_codec_data* cdlz = (cdlz_codec_data*)codec; - - /* determine header bytes */ - uint32_t frames = destlen / CD_FRAME_SIZE; - uint32_t complen_bytes = (destlen < 65536) ? 2 : 3; - uint32_t ecc_bytes = (frames + 7) / 8; - uint32_t header_bytes = ecc_bytes + complen_bytes; - - /* extract compressed length of base */ - uint32_t complen_base = (src[ecc_bytes + 0] << 8) | src[ecc_bytes + 1]; - if (complen_bytes > 2) - complen_base = (complen_base << 8) | src[ecc_bytes + 2]; - - /* reset and decode */ - lzma_codec_decompress(&cdlz->base_decompressor, &src[header_bytes], complen_base, &cdlz->buffer[0], frames * CD_MAX_SECTOR_DATA); -#ifdef WANT_SUBCODE - if (header_bytes + complen_base >= complen) - return CHDERR_DECOMPRESSION_ERROR; - zlib_codec_decompress(&cdlz->subcode_decompressor, &src[header_bytes + complen_base], complen - complen_base - header_bytes, &cdlz->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); -#endif - - /* reassemble the data */ - for (framenum = 0; framenum < frames; framenum++) - { - memcpy(&dest[framenum * CD_FRAME_SIZE], &cdlz->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); -#ifdef WANT_SUBCODE - memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdlz->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); -#endif - -#ifdef WANT_RAW_DATA_SECTOR - /* reconstitute the ECC data and sync header */ - sector = (uint8_t *)&dest[framenum * CD_FRAME_SIZE]; - if ((src[framenum / 8] & (1 << (framenum % 8))) != 0) - { - memcpy(sector, s_cd_sync_header, sizeof(s_cd_sync_header)); - ecc_generate(sector); - } -#endif - } - return CHDERR_NONE; -} +/*************************************************************************** + + libchdr_lzma_codec.c + + MAME Compressed Hunks of Data file format + +**************************************************************************** + + Copyright Aaron Giles + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define TRUE 1 +#define FALSE 0 + +/*************************************************************************** + * LZMA ALLOCATOR HELPER + *************************************************************************** + */ + +/*------------------------------------------------- + * lzma_fast_alloc - fast malloc for lzma, which + * allocates and frees memory frequently + *------------------------------------------------- + */ + +static void *lzma_fast_alloc(void *p, size_t size) +{ + int scan; + uint32_t *addr = NULL; + lzma_allocator *codec = (lzma_allocator *)(p); + + /* compute the size, rounding to the nearest 1k */ + size = (size + 0x3ff) & ~0x3ff; + + /* reuse a hunk if we can */ + for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) + { + uint32_t *ptr = codec->allocptr[scan]; + if (ptr != NULL && size == *ptr) + { + /* set the low bit of the size so we don't match next time */ + *ptr |= 1; + return ptr + 1; + } + } + + /* alloc a new one and put it into the list */ + addr = (uint32_t *)malloc(sizeof(uint32_t) * (size + sizeof(uint32_t))); + if (!addr) + return NULL; + + for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) + { + if (codec->allocptr[scan] == NULL) + { + codec->allocptr[scan] = addr; + break; + } + } + + /* set the low bit of the size so we don't match next time */ + *addr = size | 1; + return addr + 1; +} + +/*------------------------------------------------- + * lzma_fast_free - fast free for lzma, which + * allocates and frees memory frequently + *------------------------------------------------- + */ +static void lzma_fast_free(void *p, void *address) +{ + int scan; + uint32_t *ptr; + lzma_allocator *codec; + if (address == NULL) + return; + + codec = (lzma_allocator *)(p); + + /* find the hunk */ + ptr = (uint32_t *)(address) - 1; + for (scan = 0; scan < MAX_LZMA_ALLOCS; scan++) + { + if (ptr == codec->allocptr[scan]) + { + /* clear the low bit of the size to allow matches */ + *ptr &= ~1; + return; + } + } +} + +/*------------------------------------------------- + * lzma_allocator_init + *------------------------------------------------- + */ + +void lzma_allocator_init(void* p) +{ + lzma_allocator *codec = (lzma_allocator *)(p); + + /* reset pointer list */ + memset(codec->allocptr, 0, sizeof(codec->allocptr)); + codec->Alloc = lzma_fast_alloc; + codec->Free = lzma_fast_free; +} + +/*------------------------------------------------- + * lzma_allocator_free + *------------------------------------------------- + */ + +void lzma_allocator_free(void* p ) +{ + lzma_allocator *codec = (lzma_allocator *)(p); + + /* free our memory */ + int i; + for (i = 0 ; i < MAX_LZMA_ALLOCS ; i++) + { + if (codec->allocptr[i] != NULL) + free(codec->allocptr[i]); + } +} + +/*************************************************************************** + * LZMA DECOMPRESSOR + *************************************************************************** + */ + +/*------------------------------------------------- + * lzma_codec_init - constructor + *------------------------------------------------- + */ + +chd_error lzma_codec_init(void* codec, uint32_t hunkbytes) +{ + CLzmaEncProps encoder_props; + CLzmaEncHandle enc; + uint8_t decoder_props[LZMA_PROPS_SIZE]; + lzma_allocator* alloc; + size_t props_size; + lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; + + /* construct the decoder */ + LzmaDec_Construct(&lzma_codec->decoder); + + /* FIXME: this code is written in a way that makes it impossible to safely upgrade the LZMA SDK + * This code assumes that the current version of the encoder imposes the same requirements on the + * decoder as the encoder used to produce the file. This is not necessarily true. The format + * needs to be changed so the encoder properties are written to the file. + + * configure the properties like the compressor did */ + LzmaEncProps_Init(&encoder_props); + encoder_props.level = 9; + encoder_props.reduceSize = hunkbytes; + LzmaEncProps_Normalize(&encoder_props); + + /* convert to decoder properties */ + alloc = &lzma_codec->allocator; + lzma_allocator_init(alloc); + enc = LzmaEnc_Create((ISzAlloc*)alloc); + if (!enc) + return CHDERR_DECOMPRESSION_ERROR; + if (LzmaEnc_SetProps(enc, &encoder_props) != SZ_OK) + { + LzmaEnc_Destroy(enc, (ISzAlloc*)&alloc, (ISzAlloc*)&alloc); + return CHDERR_DECOMPRESSION_ERROR; + } + props_size = sizeof(decoder_props); + if (LzmaEnc_WriteProperties(enc, decoder_props, &props_size) != SZ_OK) + { + LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc); + return CHDERR_DECOMPRESSION_ERROR; + } + LzmaEnc_Destroy(enc, (ISzAlloc*)alloc, (ISzAlloc*)alloc); + + /* do memory allocations */ + if (LzmaDec_Allocate(&lzma_codec->decoder, decoder_props, LZMA_PROPS_SIZE, (ISzAlloc*)alloc) != SZ_OK) + return CHDERR_DECOMPRESSION_ERROR; + + /* Okay */ + return CHDERR_NONE; +} + +/*------------------------------------------------- + * lzma_codec_free + *------------------------------------------------- + */ + +void lzma_codec_free(void* codec) +{ + lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; + lzma_allocator* alloc = &lzma_codec->allocator; + + /* free memory */ + lzma_allocator_free(alloc); + LzmaDec_Free(&lzma_codec->decoder, (ISzAlloc*)&lzma_codec->allocator); +} + +/*------------------------------------------------- + * decompress - decompress data using the LZMA + * codec + *------------------------------------------------- + */ + +chd_error lzma_codec_decompress(void* codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) +{ + ELzmaStatus status; + SRes res; + size_t consumedlen, decodedlen; + /* initialize */ + lzma_codec_data* lzma_codec = (lzma_codec_data*) codec; + LzmaDec_Init(&lzma_codec->decoder); + + /* decode */ + consumedlen = complen; + decodedlen = destlen; + res = LzmaDec_DecodeToBuf(&lzma_codec->decoder, dest, &decodedlen, src, &consumedlen, LZMA_FINISH_END, &status); + if ((res != SZ_OK && res != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK) || consumedlen != complen || decodedlen != destlen) + return CHDERR_DECOMPRESSION_ERROR; + return CHDERR_NONE; +} + +/* cdlz */ +chd_error cdlz_codec_init(void* codec, uint32_t hunkbytes) +{ + chd_error ret; + cdlz_codec_data* cdlz = (cdlz_codec_data*) codec; + + /* allocate buffer */ + cdlz->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); + if (cdlz->buffer == NULL) + return CHDERR_OUT_OF_MEMORY; + + ret = lzma_codec_init(&cdlz->base_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); + if (ret != CHDERR_NONE) + return ret; + +#ifdef WANT_SUBCODE + ret = zlib_codec_init(&cdlz->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); + if (ret != CHDERR_NONE) + return ret; +#endif + + return CHDERR_NONE; +} + +void cdlz_codec_free(void* codec) +{ + cdlz_codec_data* cdlz = (cdlz_codec_data*) codec; + + lzma_codec_free(&cdlz->base_decompressor); +#ifdef WANT_SUBCODE + zlib_codec_free(&cdlz->subcode_decompressor); +#endif + if (cdlz->buffer) + free(cdlz->buffer); +} + +chd_error cdlz_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) +{ +#ifdef WANT_RAW_DATA_SECTOR + uint8_t *sector; +#endif + uint32_t framenum; + cdlz_codec_data* cdlz = (cdlz_codec_data*)codec; + + /* determine header bytes */ + uint32_t frames = destlen / CD_FRAME_SIZE; + uint32_t complen_bytes = (destlen < 65536) ? 2 : 3; + uint32_t ecc_bytes = (frames + 7) / 8; + uint32_t header_bytes = ecc_bytes + complen_bytes; + + /* extract compressed length of base */ + uint32_t complen_base = (src[ecc_bytes + 0] << 8) | src[ecc_bytes + 1]; + if (complen_bytes > 2) + complen_base = (complen_base << 8) | src[ecc_bytes + 2]; + + /* reset and decode */ + lzma_codec_decompress(&cdlz->base_decompressor, &src[header_bytes], complen_base, &cdlz->buffer[0], frames * CD_MAX_SECTOR_DATA); +#ifdef WANT_SUBCODE + if (header_bytes + complen_base >= complen) + return CHDERR_DECOMPRESSION_ERROR; + zlib_codec_decompress(&cdlz->subcode_decompressor, &src[header_bytes + complen_base], complen - complen_base - header_bytes, &cdlz->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); +#endif + + /* reassemble the data */ + for (framenum = 0; framenum < frames; framenum++) + { + memcpy(&dest[framenum * CD_FRAME_SIZE], &cdlz->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); +#ifdef WANT_SUBCODE + memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdlz->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); +#endif + +#ifdef WANT_RAW_DATA_SECTOR + /* reconstitute the ECC data and sync header */ + sector = (uint8_t *)&dest[framenum * CD_FRAME_SIZE]; + if ((src[framenum / 8] & (1 << (framenum % 8))) != 0) + { + memcpy(sector, s_cd_sync_header, sizeof(s_cd_sync_header)); + ecc_generate(sector); + } +#endif + } + return CHDERR_NONE; +} diff --git a/libretro-common/formats/libchdr/libchdr_zlib.c b/libretro-common/formats/libchdr/libchdr_zlib.c index 44c642f81e..6aaae8d009 100644 --- a/libretro-common/formats/libchdr/libchdr_zlib.c +++ b/libretro-common/formats/libchdr/libchdr_zlib.c @@ -1,298 +1,298 @@ -/*************************************************************************** - - libchdr_zlib.c - - MAME Compressed Hunks of Data file format - -**************************************************************************** - - Copyright Aaron Giles - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name 'MAME' nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - -***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#define TRUE 1 -#define FALSE 0 - -/* cdzl */ - -chd_error cdzl_codec_init(void *codec, uint32_t hunkbytes) -{ - chd_error ret; - cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; - - /* make sure the CHD's hunk size is an even multiple of the frame size */ - if (hunkbytes % CD_FRAME_SIZE != 0) - return CHDERR_CODEC_ERROR; - - cdzl->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); - if (cdzl->buffer == NULL) - return CHDERR_OUT_OF_MEMORY; - - ret = zlib_codec_init(&cdzl->base_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); - if (ret != CHDERR_NONE) - return ret; - -#ifdef WANT_SUBCODE - ret = zlib_codec_init(&cdzl->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); - if (ret != CHDERR_NONE) - return ret; -#endif - - return CHDERR_NONE; -} - -void cdzl_codec_free(void *codec) -{ - cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; - - zlib_codec_free(&cdzl->base_decompressor); -#ifdef WANT_SUBCODE - zlib_codec_free(&cdzl->subcode_decompressor); -#endif - if (cdzl->buffer) - free(cdzl->buffer); -} - -chd_error cdzl_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) -{ -#ifdef WANT_RAW_DATA_SECTOR - uint8_t *sector; -#endif - uint32_t framenum; - cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; - - /* determine header bytes */ - uint32_t frames = destlen / CD_FRAME_SIZE; - uint32_t complen_bytes = (destlen < 65536) ? 2 : 3; - uint32_t ecc_bytes = (frames + 7) / 8; - uint32_t header_bytes = ecc_bytes + complen_bytes; - - /* extract compressed length of base */ - uint32_t complen_base = (src[ecc_bytes + 0] << 8) | src[ecc_bytes + 1]; - if (complen_bytes > 2) - complen_base = (complen_base << 8) | src[ecc_bytes + 2]; - - /* reset and decode */ - zlib_codec_decompress(&cdzl->base_decompressor, &src[header_bytes], complen_base, &cdzl->buffer[0], frames * CD_MAX_SECTOR_DATA); -#ifdef WANT_SUBCODE - zlib_codec_decompress(&cdzl->subcode_decompressor, &src[header_bytes + complen_base], complen - complen_base - header_bytes, &cdzl->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); -#endif - - /* reassemble the data */ - for (framenum = 0; framenum < frames; framenum++) - { - memcpy(&dest[framenum * CD_FRAME_SIZE], &cdzl->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); -#ifdef WANT_SUBCODE - memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdzl->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); -#endif - -#ifdef WANT_RAW_DATA_SECTOR - /* reconstitute the ECC data and sync header */ - sector = (uint8_t *)&dest[framenum * CD_FRAME_SIZE]; - if ((src[framenum / 8] & (1 << (framenum % 8))) != 0) - { - memcpy(sector, s_cd_sync_header, sizeof(s_cd_sync_header)); - ecc_generate(sector); - } -#endif - } - return CHDERR_NONE; -} - -/*************************************************************************** - ZLIB COMPRESSION CODEC -***************************************************************************/ - -/*------------------------------------------------- - zlib_codec_init - initialize the ZLIB codec --------------------------------------------------*/ - -chd_error zlib_codec_init(void *codec, uint32_t hunkbytes) -{ - int zerr; - chd_error err; - zlib_codec_data *data = (zlib_codec_data*)codec; - - /* clear the buffers */ - memset(data, 0, sizeof(zlib_codec_data)); - - /* init the inflater first */ - data->inflater.next_in = (Bytef *)data; /* bogus, but that's ok */ - data->inflater.avail_in = 0; - data->inflater.zalloc = zlib_fast_alloc; - data->inflater.zfree = zlib_fast_free; - data->inflater.opaque = &data->allocator; - zerr = inflateInit2(&data->inflater, -MAX_WBITS); - - /* convert errors */ - if (zerr == Z_MEM_ERROR) - err = CHDERR_OUT_OF_MEMORY; - else if (zerr != Z_OK) - err = CHDERR_CODEC_ERROR; - else - err = CHDERR_NONE; - - return err; -} - -/*------------------------------------------------- - zlib_codec_free - free data for the ZLIB - codec --------------------------------------------------*/ - -void zlib_codec_free(void *codec) -{ - zlib_codec_data *data = (zlib_codec_data *)codec; - - /* deinit the streams */ - if (data != NULL) - { - int i; - zlib_allocator alloc; - - inflateEnd(&data->inflater); - - /* free our fast memory */ - alloc = data->allocator; - for (i = 0; i < MAX_ZLIB_ALLOCS; i++) - if (alloc.allocptr[i]) - free(alloc.allocptr[i]); - } -} - -/*------------------------------------------------- - zlib_codec_decompress - decomrpess data using - the ZLIB codec --------------------------------------------------*/ - -chd_error zlib_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) -{ - zlib_codec_data *data = (zlib_codec_data *)codec; - int zerr; - - /* reset the decompressor */ - data->inflater.next_in = (Bytef *)src; - data->inflater.avail_in = complen; - data->inflater.total_in = 0; - data->inflater.next_out = (Bytef *)dest; - data->inflater.avail_out = destlen; - data->inflater.total_out = 0; - zerr = inflateReset(&data->inflater); - if (zerr != Z_OK) - return CHDERR_DECOMPRESSION_ERROR; - - /* do it */ - zerr = inflate(&data->inflater, Z_FINISH); - (void)zerr; - if (data->inflater.total_out != destlen) - return CHDERR_DECOMPRESSION_ERROR; - - return CHDERR_NONE; -} - -/*------------------------------------------------- - zlib_fast_alloc - fast malloc for ZLIB, which - allocates and frees memory frequently --------------------------------------------------*/ - -voidpf zlib_fast_alloc(voidpf opaque, uInt items, uInt size) -{ - zlib_allocator *alloc = (zlib_allocator *)opaque; - UINT32 *ptr; - int i; - - /* compute the size, rounding to the nearest 1k */ - size = (size * items + 0x3ff) & ~0x3ff; - - /* reuse a hunk if we can */ - for (i = 0; i < MAX_ZLIB_ALLOCS; i++) - { - ptr = alloc->allocptr[i]; - if (ptr && size == *ptr) - { - /* set the low bit of the size so we don't match next time */ - *ptr |= 1; - return ptr + 1; - } - } - - /* alloc a new one */ - ptr = (UINT32 *)malloc(size + sizeof(UINT32)); - if (!ptr) - return NULL; - - /* put it into the list */ - for (i = 0; i < MAX_ZLIB_ALLOCS; i++) - if (!alloc->allocptr[i]) - { - alloc->allocptr[i] = ptr; - break; - } - - /* set the low bit of the size so we don't match next time */ - *ptr = size | 1; - return ptr + 1; -} - -/*------------------------------------------------- - zlib_fast_free - fast free for ZLIB, which - allocates and frees memory frequently --------------------------------------------------*/ - -void zlib_fast_free(voidpf opaque, voidpf address) -{ - zlib_allocator *alloc = (zlib_allocator *)opaque; - UINT32 *ptr = (UINT32 *)address - 1; - int i; - - /* find the hunk */ - for (i = 0; i < MAX_ZLIB_ALLOCS; i++) - if (ptr == alloc->allocptr[i]) - { - /* clear the low bit of the size to allow matches */ - *ptr &= ~1; - return; - } -} +/*************************************************************************** + + libchdr_zlib.c + + MAME Compressed Hunks of Data file format + +**************************************************************************** + + Copyright Aaron Giles + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + * Neither the name 'MAME' nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + +***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#define TRUE 1 +#define FALSE 0 + +/* cdzl */ + +chd_error cdzl_codec_init(void *codec, uint32_t hunkbytes) +{ + chd_error ret; + cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; + + /* make sure the CHD's hunk size is an even multiple of the frame size */ + if (hunkbytes % CD_FRAME_SIZE != 0) + return CHDERR_CODEC_ERROR; + + cdzl->buffer = (uint8_t*)malloc(sizeof(uint8_t) * hunkbytes); + if (cdzl->buffer == NULL) + return CHDERR_OUT_OF_MEMORY; + + ret = zlib_codec_init(&cdzl->base_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); + if (ret != CHDERR_NONE) + return ret; + +#ifdef WANT_SUBCODE + ret = zlib_codec_init(&cdzl->subcode_decompressor, (hunkbytes / CD_FRAME_SIZE) * CD_MAX_SECTOR_DATA); + if (ret != CHDERR_NONE) + return ret; +#endif + + return CHDERR_NONE; +} + +void cdzl_codec_free(void *codec) +{ + cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; + + zlib_codec_free(&cdzl->base_decompressor); +#ifdef WANT_SUBCODE + zlib_codec_free(&cdzl->subcode_decompressor); +#endif + if (cdzl->buffer) + free(cdzl->buffer); +} + +chd_error cdzl_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) +{ +#ifdef WANT_RAW_DATA_SECTOR + uint8_t *sector; +#endif + uint32_t framenum; + cdzl_codec_data* cdzl = (cdzl_codec_data*)codec; + + /* determine header bytes */ + uint32_t frames = destlen / CD_FRAME_SIZE; + uint32_t complen_bytes = (destlen < 65536) ? 2 : 3; + uint32_t ecc_bytes = (frames + 7) / 8; + uint32_t header_bytes = ecc_bytes + complen_bytes; + + /* extract compressed length of base */ + uint32_t complen_base = (src[ecc_bytes + 0] << 8) | src[ecc_bytes + 1]; + if (complen_bytes > 2) + complen_base = (complen_base << 8) | src[ecc_bytes + 2]; + + /* reset and decode */ + zlib_codec_decompress(&cdzl->base_decompressor, &src[header_bytes], complen_base, &cdzl->buffer[0], frames * CD_MAX_SECTOR_DATA); +#ifdef WANT_SUBCODE + zlib_codec_decompress(&cdzl->subcode_decompressor, &src[header_bytes + complen_base], complen - complen_base - header_bytes, &cdzl->buffer[frames * CD_MAX_SECTOR_DATA], frames * CD_MAX_SUBCODE_DATA); +#endif + + /* reassemble the data */ + for (framenum = 0; framenum < frames; framenum++) + { + memcpy(&dest[framenum * CD_FRAME_SIZE], &cdzl->buffer[framenum * CD_MAX_SECTOR_DATA], CD_MAX_SECTOR_DATA); +#ifdef WANT_SUBCODE + memcpy(&dest[framenum * CD_FRAME_SIZE + CD_MAX_SECTOR_DATA], &cdzl->buffer[frames * CD_MAX_SECTOR_DATA + framenum * CD_MAX_SUBCODE_DATA], CD_MAX_SUBCODE_DATA); +#endif + +#ifdef WANT_RAW_DATA_SECTOR + /* reconstitute the ECC data and sync header */ + sector = (uint8_t *)&dest[framenum * CD_FRAME_SIZE]; + if ((src[framenum / 8] & (1 << (framenum % 8))) != 0) + { + memcpy(sector, s_cd_sync_header, sizeof(s_cd_sync_header)); + ecc_generate(sector); + } +#endif + } + return CHDERR_NONE; +} + +/*************************************************************************** + ZLIB COMPRESSION CODEC +***************************************************************************/ + +/*------------------------------------------------- + zlib_codec_init - initialize the ZLIB codec +-------------------------------------------------*/ + +chd_error zlib_codec_init(void *codec, uint32_t hunkbytes) +{ + int zerr; + chd_error err; + zlib_codec_data *data = (zlib_codec_data*)codec; + + /* clear the buffers */ + memset(data, 0, sizeof(zlib_codec_data)); + + /* init the inflater first */ + data->inflater.next_in = (Bytef *)data; /* bogus, but that's ok */ + data->inflater.avail_in = 0; + data->inflater.zalloc = zlib_fast_alloc; + data->inflater.zfree = zlib_fast_free; + data->inflater.opaque = &data->allocator; + zerr = inflateInit2(&data->inflater, -MAX_WBITS); + + /* convert errors */ + if (zerr == Z_MEM_ERROR) + err = CHDERR_OUT_OF_MEMORY; + else if (zerr != Z_OK) + err = CHDERR_CODEC_ERROR; + else + err = CHDERR_NONE; + + return err; +} + +/*------------------------------------------------- + zlib_codec_free - free data for the ZLIB + codec +-------------------------------------------------*/ + +void zlib_codec_free(void *codec) +{ + zlib_codec_data *data = (zlib_codec_data *)codec; + + /* deinit the streams */ + if (data != NULL) + { + int i; + zlib_allocator alloc; + + inflateEnd(&data->inflater); + + /* free our fast memory */ + alloc = data->allocator; + for (i = 0; i < MAX_ZLIB_ALLOCS; i++) + if (alloc.allocptr[i]) + free(alloc.allocptr[i]); + } +} + +/*------------------------------------------------- + zlib_codec_decompress - decomrpess data using + the ZLIB codec +-------------------------------------------------*/ + +chd_error zlib_codec_decompress(void *codec, const uint8_t *src, uint32_t complen, uint8_t *dest, uint32_t destlen) +{ + zlib_codec_data *data = (zlib_codec_data *)codec; + int zerr; + + /* reset the decompressor */ + data->inflater.next_in = (Bytef *)src; + data->inflater.avail_in = complen; + data->inflater.total_in = 0; + data->inflater.next_out = (Bytef *)dest; + data->inflater.avail_out = destlen; + data->inflater.total_out = 0; + zerr = inflateReset(&data->inflater); + if (zerr != Z_OK) + return CHDERR_DECOMPRESSION_ERROR; + + /* do it */ + zerr = inflate(&data->inflater, Z_FINISH); + (void)zerr; + if (data->inflater.total_out != destlen) + return CHDERR_DECOMPRESSION_ERROR; + + return CHDERR_NONE; +} + +/*------------------------------------------------- + zlib_fast_alloc - fast malloc for ZLIB, which + allocates and frees memory frequently +-------------------------------------------------*/ + +voidpf zlib_fast_alloc(voidpf opaque, uInt items, uInt size) +{ + zlib_allocator *alloc = (zlib_allocator *)opaque; + UINT32 *ptr; + int i; + + /* compute the size, rounding to the nearest 1k */ + size = (size * items + 0x3ff) & ~0x3ff; + + /* reuse a hunk if we can */ + for (i = 0; i < MAX_ZLIB_ALLOCS; i++) + { + ptr = alloc->allocptr[i]; + if (ptr && size == *ptr) + { + /* set the low bit of the size so we don't match next time */ + *ptr |= 1; + return ptr + 1; + } + } + + /* alloc a new one */ + ptr = (UINT32 *)malloc(size + sizeof(UINT32)); + if (!ptr) + return NULL; + + /* put it into the list */ + for (i = 0; i < MAX_ZLIB_ALLOCS; i++) + if (!alloc->allocptr[i]) + { + alloc->allocptr[i] = ptr; + break; + } + + /* set the low bit of the size so we don't match next time */ + *ptr = size | 1; + return ptr + 1; +} + +/*------------------------------------------------- + zlib_fast_free - fast free for ZLIB, which + allocates and frees memory frequently +-------------------------------------------------*/ + +void zlib_fast_free(voidpf opaque, voidpf address) +{ + zlib_allocator *alloc = (zlib_allocator *)opaque; + UINT32 *ptr = (UINT32 *)address - 1; + int i; + + /* find the hunk */ + for (i = 0; i < MAX_ZLIB_ALLOCS; i++) + if (ptr == alloc->allocptr[i]) + { + /* clear the low bit of the size to allow matches */ + *ptr &= ~1; + return; + } +} diff --git a/libretro-common/gfx/scaler/scaler.c b/libretro-common/gfx/scaler/scaler.c index 047c374548..5056f085bd 100644 --- a/libretro-common/gfx/scaler/scaler.c +++ b/libretro-common/gfx/scaler/scaler.c @@ -245,7 +245,7 @@ bool scaler_ctx_gen_filter(struct scaler_ctx *ctx) case SCALER_FMT_ABGR8888: ctx->out_pixconv = conv_argb8888_abgr8888; break; - + default: return false; } diff --git a/libretro-common/glsm/glsm.c b/libretro-common/glsm/glsm.c index 22ae5f2343..8b08c575a6 100644 --- a/libretro-common/glsm/glsm.c +++ b/libretro-common/glsm/glsm.c @@ -167,7 +167,7 @@ struct gl_cached_state GLenum mode; } frontface; - struct + struct { bool used; GLenum mode; @@ -193,7 +193,7 @@ struct gl_cached_state GLuint vao; GLuint framebuf; GLuint array_buffer; - GLuint program; + GLuint program; GLenum active_texture; int cap_state[SGL_CAP_MAX]; int cap_translate[SGL_CAP_MAX]; @@ -468,7 +468,7 @@ void rglFrontFace(GLenum mode) glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL); glFrontFace(mode); gl_state.frontface.used = true; - gl_state.frontface.mode = mode; + gl_state.frontface.mode = mode; } /* @@ -662,7 +662,7 @@ void rglBlendFuncSeparate(GLenum sfactor, GLenum dfactor) * Category: Textures * * Core in: - * OpenGL : 1.3 + * OpenGL : 1.3 */ void rglActiveTexture(GLenum texture) { @@ -723,7 +723,7 @@ void rglEnable(GLenum cap) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUseProgram(GLuint program) { @@ -828,7 +828,7 @@ void rglLinkProgram(GLuint program) * Category: FBO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 2.0 */ void rglFramebufferTexture2D(GLenum target, GLenum attachment, @@ -892,7 +892,7 @@ void rglCompressedTexImage2D(GLenum target, GLint level, #ifdef GLSM_DEBUG log_cb(RETRO_LOG_INFO, "glCompressedTexImage2D.\n"); #endif - glCompressedTexImage2D(target, level, internalformat, + glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); } @@ -915,7 +915,7 @@ void rglDeleteTextures(GLsizei n, const GLuint *textures) /* * * Core in: - * OpenGLES : 2.0 + * OpenGLES : 2.0 */ void rglRenderbufferStorage(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height) @@ -931,7 +931,7 @@ void rglRenderbufferStorage(GLenum target, GLenum internalFormat, * Core in: * * OpenGL : 3.0 - * OpenGLES : 2.0 + * OpenGLES : 2.0 */ void rglBindRenderbuffer(GLenum target, GLuint renderbuffer) { @@ -945,7 +945,7 @@ void rglBindRenderbuffer(GLenum target, GLuint renderbuffer) * * Core in: * - * OpenGLES : 2.0 + * OpenGLES : 2.0 */ void rglDeleteRenderbuffers(GLsizei n, GLuint *renderbuffers) { @@ -960,7 +960,7 @@ void rglDeleteRenderbuffers(GLsizei n, GLuint *renderbuffers) * Core in: * * OpenGL : 3.0 - * OpenGLES : 2.0 + * OpenGLES : 2.0 */ void rglGenRenderbuffers(GLsizei n, GLuint *renderbuffers) { @@ -975,7 +975,7 @@ void rglGenRenderbuffers(GLsizei n, GLuint *renderbuffers) * Core in: * * OpenGL : 3.0 - * OpenGLES : 2.0 + * OpenGLES : 2.0 */ void rglGenerateMipmap(GLenum target) { @@ -989,7 +989,7 @@ void rglGenerateMipmap(GLenum target) * Category: FBO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 */ GLenum rglCheckFramebufferStatus(GLenum target) { @@ -1003,7 +1003,7 @@ GLenum rglCheckFramebufferStatus(GLenum target) * Category: FBO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 2.0 */ void rglFramebufferRenderbuffer(GLenum target, GLenum attachment, @@ -1019,7 +1019,7 @@ void rglFramebufferRenderbuffer(GLenum target, GLenum attachment, * Category: Shaders * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 */ void rglBindFragDataLocation(GLuint program, GLuint colorNumber, const char * name) @@ -1036,7 +1036,7 @@ void rglBindFragDataLocation(GLuint program, GLuint colorNumber, * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglGetProgramiv(GLuint shader, GLenum pname, GLint *params) { @@ -1050,7 +1050,7 @@ void rglGetProgramiv(GLuint shader, GLenum pname, GLint *params) * Category: Shaders * * Core in: - * OpenGL : 4.1 + * OpenGL : 4.1 * OpenGLES : 3.0 */ void rglProgramParameteri( GLuint program, @@ -1070,7 +1070,7 @@ void rglProgramParameteri( GLuint program, /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, GLchar *name) @@ -1141,7 +1141,7 @@ void rglEndQuery( GLenum target) * * Core in: * - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglGetActiveUniformBlockiv(GLuint program, @@ -1273,7 +1273,7 @@ void rglUniformBlockBinding( GLuint program, /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglUniform1ui(GLint location, GLuint v) @@ -1289,7 +1289,7 @@ void rglUniform1ui(GLint location, GLuint v) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglUniform2ui(GLint location, GLuint v0, GLuint v1) @@ -1305,7 +1305,7 @@ void rglUniform2ui(GLint location, GLuint v0, GLuint v1) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) @@ -1321,7 +1321,7 @@ void rglUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) @@ -1337,7 +1337,7 @@ void rglUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) @@ -1352,7 +1352,7 @@ void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglDetachShader(GLuint program, GLuint shader) { @@ -1366,7 +1366,7 @@ void rglDetachShader(GLuint program, GLuint shader) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglGetShaderiv(GLuint shader, GLenum pname, GLint *params) { @@ -1380,7 +1380,7 @@ void rglGetShaderiv(GLuint shader, GLenum pname, GLint *params) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglAttachShader(GLuint program, GLuint shader) { @@ -1393,7 +1393,7 @@ void rglAttachShader(GLuint program, GLuint shader) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ GLint rglGetAttribLocation(GLuint program, const GLchar *name) { @@ -1407,7 +1407,7 @@ GLint rglGetAttribLocation(GLuint program, const GLchar *name) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglShaderSource(GLuint shader, GLsizei count, const GLchar **string, const GLint *length) @@ -1422,7 +1422,7 @@ void rglShaderSource(GLuint shader, GLsizei count, * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglCompileShader(GLuint shader) { @@ -1436,7 +1436,7 @@ void rglCompileShader(GLuint shader) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ GLuint rglCreateProgram(void) { @@ -1449,7 +1449,7 @@ GLuint rglCreateProgram(void) /* * * Core in: - * OpenGL : 1.1 + * OpenGL : 1.1 */ void rglGenTextures(GLsizei n, GLuint *textures) { @@ -1462,7 +1462,7 @@ void rglGenTextures(GLsizei n, GLuint *textures) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglGetShaderInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog) @@ -1476,7 +1476,7 @@ void rglGetShaderInfoLog(GLuint shader, GLsizei maxLength, /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglGetProgramInfoLog(GLuint shader, GLsizei maxLength, GLsizei *length, GLchar *infoLog) @@ -1490,7 +1490,7 @@ void rglGetProgramInfoLog(GLuint shader, GLsizei maxLength, /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ GLboolean rglIsProgram(GLuint program) { @@ -1514,7 +1514,7 @@ void rglTexCoord2f(GLfloat s, GLfloat t) * Category: Generic vertex attributes * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * */ void rglDisableVertexAttribArray(GLuint index) @@ -1530,7 +1530,7 @@ void rglDisableVertexAttribArray(GLuint index) * Category: Generic vertex attributes * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglEnableVertexAttribArray(GLuint index) { @@ -1546,7 +1546,7 @@ void rglEnableVertexAttribArray(GLuint index) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglVertexAttribIPointer( GLuint index, @@ -1582,7 +1582,7 @@ void rglVertexAttribLPointer( * Category: Generic vertex attributes * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglVertexAttribPointer(GLuint name, GLint size, GLenum type, GLboolean normalized, GLsizei stride, @@ -1605,7 +1605,7 @@ void rglVertexAttribPointer(GLuint name, GLint size, * Category: Generic vertex attributes * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglBindAttribLocation(GLuint program, GLuint index, const GLchar *name) { @@ -1618,7 +1618,7 @@ void rglBindAttribLocation(GLuint program, GLuint index, const GLchar *name) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglVertexAttrib4f(GLuint name, GLfloat x, GLfloat y, GLfloat z, GLfloat w) @@ -1632,7 +1632,7 @@ void rglVertexAttrib4f(GLuint name, GLfloat x, GLfloat y, /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglVertexAttrib4fv(GLuint name, GLfloat* v) { @@ -1646,7 +1646,7 @@ void rglVertexAttrib4fv(GLuint name, GLfloat* v) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ GLuint rglCreateShader(GLenum shaderType) { @@ -1660,7 +1660,7 @@ GLuint rglCreateShader(GLenum shaderType) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglDeleteProgram(GLuint program) { @@ -1674,7 +1674,7 @@ void rglDeleteProgram(GLuint program) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglDeleteShader(GLuint shader) { @@ -1688,7 +1688,7 @@ void rglDeleteShader(GLuint shader) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ GLint rglGetUniformLocation(GLuint program, const GLchar *name) { @@ -1702,7 +1702,7 @@ GLint rglGetUniformLocation(GLuint program, const GLchar *name) * Category: VBO and PBO * * Core in: - * OpenGL : 1.5 + * OpenGL : 1.5 */ void rglDeleteBuffers(GLsizei n, const GLuint *buffers) { @@ -1716,7 +1716,7 @@ void rglDeleteBuffers(GLsizei n, const GLuint *buffers) * Category: VBO and PBO * * Core in: - * OpenGL : 1.5 + * OpenGL : 1.5 */ void rglGenBuffers(GLsizei n, GLuint *buffers) { @@ -1730,7 +1730,7 @@ void rglGenBuffers(GLsizei n, GLuint *buffers) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform1f(GLint location, GLfloat v0) { @@ -1744,7 +1744,7 @@ void rglUniform1f(GLint location, GLfloat v0) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform1fv(GLint location, GLsizei count, const GLfloat *value) { @@ -1758,7 +1758,7 @@ void rglUniform1fv(GLint location, GLsizei count, const GLfloat *value) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform1iv(GLint location, GLsizei count, const GLint *value) { @@ -1793,7 +1793,7 @@ void rglTexBuffer(GLenum target, GLenum internalFormat, GLuint buffer) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ const GLubyte* rglGetStringi(GLenum name, GLuint index) @@ -1824,7 +1824,7 @@ void rglClearBufferfi( GLenum buffer, /* * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 3.0 */ void rglRenderbufferStorageMultisample( GLenum target, @@ -1845,7 +1845,7 @@ void rglRenderbufferStorageMultisample( GLenum target, * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform1i(GLint location, GLint v0) { @@ -1859,7 +1859,7 @@ void rglUniform1i(GLint location, GLint v0) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform2f(GLint location, GLfloat v0, GLfloat v1) { @@ -1873,7 +1873,7 @@ void rglUniform2f(GLint location, GLfloat v0, GLfloat v1) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform2i(GLint location, GLint v0, GLint v1) { @@ -1887,7 +1887,7 @@ void rglUniform2i(GLint location, GLint v0, GLint v1) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform2fv(GLint location, GLsizei count, const GLfloat *value) { @@ -1901,7 +1901,7 @@ void rglUniform2fv(GLint location, GLsizei count, const GLfloat *value) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { @@ -1915,7 +1915,7 @@ void rglUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform3fv(GLint location, GLsizei count, const GLfloat *value) { @@ -1943,7 +1943,7 @@ void rglUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) { @@ -1957,7 +1957,7 @@ void rglUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3 * Category: Shaders * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglUniform4fv(GLint location, GLsizei count, const GLfloat *value) { @@ -1970,7 +1970,7 @@ void rglUniform4fv(GLint location, GLsizei count, const GLfloat *value) /* * * Core in: - * OpenGL : 1.0 + * OpenGL : 1.0 */ void rglPolygonOffset(GLfloat factor, GLfloat units) { @@ -1988,7 +1988,7 @@ void rglPolygonOffset(GLfloat factor, GLfloat units) * Category: FBO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 */ void rglGenFramebuffers(GLsizei n, GLuint *ids) { @@ -2002,7 +2002,7 @@ void rglGenFramebuffers(GLsizei n, GLuint *ids) * Category: FBO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 */ void rglBindFramebuffer(GLenum target, GLuint framebuffer) { @@ -2018,7 +2018,7 @@ void rglBindFramebuffer(GLenum target, GLuint framebuffer) * Category: FBO * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void rglDrawBuffers(GLsizei n, const GLenum *bufs) @@ -2035,7 +2035,7 @@ void rglDrawBuffers(GLsizei n, const GLenum *bufs) * Category: FBO * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.0 */ void *rglMapBufferRange( GLenum target, @@ -2104,7 +2104,7 @@ void rglDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsiz /* * * Core in: - * OpenGL : 4.2 + * OpenGL : 4.2 * OpenGLES : 3.1 */ void rglMemoryBarrier( GLbitfield barriers) @@ -2122,7 +2122,7 @@ void rglMemoryBarrier( GLbitfield barriers) /* * * Core in: - * OpenGL : 4.2 + * OpenGL : 4.2 * OpenGLES : 3.1 */ void rglBindImageTexture( GLuint unit, @@ -2223,7 +2223,7 @@ void rglTexImage3D( GLenum target, /* * * Core in: - * OpenGL : 1.5 + * OpenGL : 1.5 */ void * rglMapBuffer( GLenum target, GLenum access) { @@ -2240,7 +2240,7 @@ void * rglMapBuffer( GLenum target, GLenum access) /* * * Core in: - * OpenGL : 1.5 + * OpenGL : 1.5 */ GLboolean rglUnmapBuffer( GLenum target) { @@ -2274,7 +2274,7 @@ void rglBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) * Category: Blending * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 */ void rglBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) { @@ -2287,7 +2287,7 @@ void rglBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) /* * * Core in: - * OpenGL : 2.0 + * OpenGL : 2.0 * OpenGLES : 3.2 */ void rglCopyImageSubData( GLuint srcName, @@ -2332,7 +2332,7 @@ void rglCopyImageSubData( GLuint srcName, * Category: VAO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 3.0 */ void rglBindVertexArray(GLuint array) @@ -2349,7 +2349,7 @@ void rglBindVertexArray(GLuint array) * Category: VAO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 3.0 */ void rglGenVertexArrays(GLsizei n, GLuint *arrays) @@ -2366,7 +2366,7 @@ void rglGenVertexArrays(GLsizei n, GLuint *arrays) * Category: VAO * * Core in: - * OpenGL : 3.0 + * OpenGL : 3.0 * OpenGLES : 3.0 */ void rglDeleteVertexArrays(GLsizei n, const GLuint *arrays) @@ -2593,7 +2593,7 @@ static void glsm_state_setup(void) default_framebuffer = glsm_get_current_framebuffer(); gl_state.framebuf = default_framebuffer; gl_state.cullface.mode = GL_BACK; - gl_state.frontface.mode = GL_CCW; + gl_state.frontface.mode = GL_CCW; gl_state.blendfunc_separate.used = false; gl_state.blendfunc_separate.srcRGB = GL_ONE; @@ -2602,7 +2602,7 @@ static void glsm_state_setup(void) gl_state.blendfunc_separate.dstAlpha = GL_ZERO; gl_state.depthfunc.used = false; - + gl_state.colormask.used = false; gl_state.colormask.red = GL_TRUE; gl_state.colormask.green = GL_TRUE; diff --git a/libretro-common/glsym/glgen.py b/libretro-common/glsym/glgen.py index 4d4a35b3e0..3fe2cf5276 100755 --- a/libretro-common/glsym/glgen.py +++ b/libretro-common/glsym/glgen.py @@ -2,7 +2,7 @@ """ License statement applies to this file (glgen.py) only. -""" +""" """ Permission is hereby granted, free of charge, diff --git a/libretro-common/glsym/rglgen.py b/libretro-common/glsym/rglgen.py index a970e7f59f..c1255ad8c8 100755 --- a/libretro-common/glsym/rglgen.py +++ b/libretro-common/glsym/rglgen.py @@ -2,7 +2,7 @@ """ License statement applies to this file (glgen.py) only. -""" +""" """ Permission is hereby granted, free of charge, diff --git a/libretro-common/glsym/xglgen.py b/libretro-common/glsym/xglgen.py index 814785eb81..92b428baf2 100644 --- a/libretro-common/glsym/xglgen.py +++ b/libretro-common/glsym/xglgen.py @@ -2,7 +2,7 @@ """ License statement applies to this file (xglgen.py) only. -""" +""" """ Permission is hereby granted, free of charge, diff --git a/libretro-common/include/array/dynarray.h b/libretro-common/include/array/dynarray.h index cdc4ff0d14..e3b28834ef 100644 --- a/libretro-common/include/array/dynarray.h +++ b/libretro-common/include/array/dynarray.h @@ -37,7 +37,7 @@ * You can #define your own allocators, assertion and the amount of runtime * checking of indexes, see CONFIGURATION section in the code for more information. * - * + * * This is heavily inspired by Sean Barrett's stretchy_buffer.h * ( see: https://github.com/nothings/stb/blob/master/stretchy_buffer.h ) * However I wanted to have a struct that holds the array pointer and the length @@ -52,7 +52,7 @@ * Microsoft Visual Studio 6 and 2010 (32bit) and 2013 (32bit and 64bit). * I guess it works with all (recentish) C++ compilers and C compilers supporting * C99 or even C89 + C++ comments (otherwise converting the comments should help). - * + * * (C) 2016 Daniel Gibson * * LICENSE @@ -69,9 +69,9 @@ #if 0 /* Usage Example: */ #define DG_DYNARR_IMPLEMENTATION /* this define is only needed in *one* .c/.cpp file! */ #include "DG_dynarr.h" - + DA_TYPEDEF(int, MyIntArrType); /* creates MyIntArrType - a dynamic array for ints */ - + void printIntArr(MyIntArrType* arr, const char* name) { /* note that arr is a pointer here, so use *arr in the da_*() functions. */ @@ -121,7 +121,7 @@ int x=da_pop(a1); printf("x = %d\n", x); /* "x = 3" */ printIntArr(&a1, "a1"); /* "a1 = { 42, 5, 6, 7 }" */ - + da_free(a1); /* make sure not to leak memory! */ da_free(a2); } @@ -269,12 +269,12 @@ /* insert n elements into a at idx, initialize them from array vals * doesn't return anything - * ! vals (and all other args) is evaluated multiple times ! + * ! vals (and all other args) is evaluated multiple times ! */ #define da_insertn(a, idx, vals, n) \ dg_dynarr_insertn(a, idx, vals, n) -/* insert n elements into a at idx and zeroe them with memset() +/* insert n elements into a at idx and zeroe them with memset() * returns pointer to first inserted element or NULL if out of memory */ #define da_insertn_zeroed(a, idx, n) \ @@ -292,7 +292,7 @@ /* overwrite n elements of a, starting at idx, with values from array vals * doesn't return anything - * ! vals (and all other args) is evaluated multiple times ! + * ! vals (and all other args) is evaluated multiple times ! */ #define da_setn(a, idx, vals, n) \ dg_dynarr_setn(a, idx, vals, n) @@ -477,7 +477,7 @@ /* insert n elements into a at idx, initialize them from array vals * doesn't return anything - * ! vals (and all other args) is evaluated multiple times ! + * ! vals (and all other args) is evaluated multiple times ! */ #define dg_dynarr_insertn(a, idx, vals, n) do { \ DG_DYNARR_ASSERT((vals)!=NULL, "Don't pass NULL as vals to dg_dynarr_insertn!"); \ @@ -487,7 +487,7 @@ while(i_ < e_) (a).p[i_++] = (vals)[v_++]; \ }} DG__DYNARR_WHILE0 -/* insert n elements into a at idx and zeroe them with memset() +/* insert n elements into a at idx and zeroe them with memset() * returns pointer to first inserted element or NULL if out of memory */ #define dg_dynarr_insertn_zeroed(a, idx, n) \ @@ -510,7 +510,7 @@ /* overwrite n elements of a, starting at idx, with values from array vals * doesn't return anything - * ! vals (and all other args) is evaluated multiple times ! + * ! vals (and all other args) is evaluated multiple times ! */ #define dg_dynarr_setn(a, idx, vals, n) do { \ DG_DYNARR_ASSERT((vals)!=NULL, "Don't pass NULL as vals to dg_dynarr_setn!"); \ @@ -690,7 +690,7 @@ static const size_t DG__DYNARR_SIZE_T_ALL_BUT_MSB = (((size_t)1) << (sizeof(size (void**)&(a).p, &(a).md, sizeof((a).p[0]) /* MSVC warns about "conditional expression is constant" when using the - * do { ... } while(0) idiom in macros.. + * do { ... } while(0) idiom in macros.. */ #ifdef _MSC_VER #if _MSC_VER >= 1400 // MSVC 2005 and newer @@ -891,7 +891,7 @@ dg__dynarr_deletefast(void** arr, dg__dynarr_md* md, size_t itemsize, size_t idx /* by default, C's malloc(), realloc() and free() is used to allocate/free heap memory. * you can #define DG_DYNARR_MALLOC, DG_DYNARR_REALLOC and DG_DYNARR_FREE * to provide alternative implementations like Win32 Heap(Re)Alloc/HeapFree - */ + */ #ifndef DG_DYNARR_MALLOC #define DG_DYNARR_MALLOC(elemSize, numElems) malloc(elemSize*numElems) @@ -963,9 +963,9 @@ dg__dynarr_grow(void** arr, dg__dynarr_md* md, size_t itemsize, size_t min_neede { md->cap = 0; md->cnt = 0; - + DG_DYNARR_OUT_OF_MEMORY ; - + return 0; } return 1; diff --git a/libretro-common/include/file/config_file.h b/libretro-common/include/file/config_file.h index bf8102f542..e4e7eb585d 100644 --- a/libretro-common/include/file/config_file.h +++ b/libretro-common/include/file/config_file.h @@ -189,7 +189,6 @@ void config_file_dump(config_file_t *conf, FILE *file, bool val); void config_file_dump_orbis(config_file_t *conf, int fd); #endif - bool config_file_exists(const char *path); RETRO_END_DECLS diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h index e894bebdc3..91afdc8a8e 100644 --- a/libretro-common/include/file/file_path.h +++ b/libretro-common/include/file/file_path.h @@ -108,7 +108,7 @@ const char *path_get_extension(const char *path); * text after and including the last '.'. * Only '.'s after the last slash are considered. * - * Returns: + * Returns: * 1) If path has an extension, returns path with the * extension removed. * 2) If there is no extension, returns NULL. diff --git a/libretro-common/include/glsm/glsmsym.h b/libretro-common/include/glsm/glsmsym.h index d32cab28d8..a1cc179263 100644 --- a/libretro-common/include/glsm/glsmsym.h +++ b/libretro-common/include/glsm/glsmsym.h @@ -150,7 +150,7 @@ RETRO_BEGIN_DECLS #define glUniformBlockBinding rglUniformBlockBinding #define glGetUniformBlockIndex rglGetUniformBlockIndex #define glGetActiveUniformBlockiv rglGetActiveUniformBlockiv -#define glBindBufferBase rglBindBufferBase +#define glBindBufferBase rglBindBufferBase #define glGetUniformIndices rglGetUniformIndices #define glGetActiveUniformsiv rglGetActiveUniformsiv #define glGetError rglGetError diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h index f3c13961ec..fadab9b7ca 100644 --- a/libretro-common/include/libretro.h +++ b/libretro-common/include/libretro.h @@ -875,12 +875,12 @@ enum retro_mod * types already defined in the libretro API. * * The core must pass an array of const struct retro_controller_info which - * is terminated with a blanked out struct. Each element of the + * is terminated with a blanked out struct. Each element of the * retro_controller_info struct corresponds to the ascending port index * that is passed to retro_set_controller_port_device() when that function * is called to indicate to the core that the frontend has changed the * active device subclass. SEE ALSO: retro_set_controller_port_device() - * + * * The ascending input port indexes provided by the core in the struct * are generally presented by frontends as ascending User # or Player #, * such as Player 1, Player 2, Player 3, etc. Which device subclasses are @@ -892,7 +892,7 @@ enum retro_mod * User or Player, beginning with the generic Libretro device that the * subclasses are derived from. The second inner element of each entry is the * total number of subclasses that are listed in the retro_controller_description. - * + * * NOTE: Even if special device types are set in the libretro core, * libretro should only poll input based on the base input device types. */ diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c index cec24a0cd1..dbac3db217 100644 --- a/libretro-common/net/net_compat.c +++ b/libretro-common/net/net_compat.c @@ -368,7 +368,7 @@ void network_deinit(void) net_deinit(); #elif defined(_3DS) socExit(); - + if(_net_compat_net_memory) { free(_net_compat_net_memory); diff --git a/libretro-common/net/net_ifinfo.c b/libretro-common/net/net_ifinfo.c index 55be3c90e9..9fe7e09692 100644 --- a/libretro-common/net/net_ifinfo.c +++ b/libretro-common/net/net_ifinfo.c @@ -121,7 +121,7 @@ bool net_ifinfo_new(net_ifinfo_t *list) /* actual interface can be wlan or eth (with a wiiu adapter) - so we just use "switch" as a name + so we just use "switch" as a name */ rc = nifmGetCurrentIpAddress(&id); diff --git a/libretro-common/net/net_natt.c b/libretro-common/net/net_natt.c index eca2a65500..08aa518fd9 100644 --- a/libretro-common/net/net_natt.c +++ b/libretro-common/net/net_natt.c @@ -203,7 +203,7 @@ bool natt_open_port_any(struct natt_status *status, struct net_ifinfo_entry *entry = list.entries + i; /* ignore localhost */ - if ( string_is_equal(entry->host, "127.0.0.1") || + if ( string_is_equal(entry->host, "127.0.0.1") || string_is_equal(entry->host, "::1")) continue; @@ -233,7 +233,7 @@ bool natt_read(struct natt_status *status) } #if 0 -/* If we want to remove redirects in the future, this is a +/* If we want to remove redirects in the future, this is a * sample of how to do that. */ void upnp_rem_redir (int port) diff --git a/libretro-common/rthreads/ctr_pthread.h b/libretro-common/rthreads/ctr_pthread.h index 0a393ebb8f..0370c8472e 100644 --- a/libretro-common/rthreads/ctr_pthread.h +++ b/libretro-common/rthreads/ctr_pthread.h @@ -56,27 +56,27 @@ static INLINE int pthread_create(pthread_t *thread, { s32 prio = 0; Thread new_ctr_thread; - + if (!mutex_inited) { LightLock_Init(&safe_double_thread_launch); mutex_inited = true; } - + /*Must wait if attempting to launch 2 threads at once to prevent corruption of function pointer*/ while (LightLock_TryLock(&safe_double_thread_launch) != 0); - + svcGetThreadPriority(&prio, CUR_THREAD_HANDLE); - + start_routine_jump = start_routine; new_ctr_thread = threadCreate(ctr_thread_launcher, arg, STACKSIZE, prio - 1, -1/*No affinity, use any CPU*/, false); - + if (!new_ctr_thread) { LightLock_Unlock(&safe_double_thread_launch); return EAGAIN; } - + *thread = new_ctr_thread; return 0; } @@ -150,14 +150,14 @@ static INLINE int pthread_cond_timedwait(pthread_cond_t *cond, struct timespec now = {0}; /* Missing clock_gettime*/ struct timeval tm; - + gettimeofday(&tm, NULL); now.tv_sec = tm.tv_sec; now.tv_nsec = tm.tv_usec * 1000; if (LightEvent_TryWait(cond) != 0 || now.tv_sec > abstime->tv_sec || (now.tv_sec == abstime->tv_sec && now.tv_nsec > abstime->tv_nsec)) break; } - + return 0; } diff --git a/libretro-common/samples/net/Makefile b/libretro-common/samples/net/Makefile index e4475900cc..4d5908b637 100644 --- a/libretro-common/samples/net/Makefile +++ b/libretro-common/samples/net/Makefile @@ -42,7 +42,7 @@ NET_IFINFO_C = \ net_ifinfo_test.c ifeq ($(platform), win) -CFLAGS += -liphlpapi -lws2_32 +CFLAGS += -liphlpapi -lws2_32 endif NET_IFINFO_OBJS := $(NET_IFINFO_C:.c=.o) diff --git a/libretro-common/samples/utils/Makefile b/libretro-common/samples/utils/Makefile index 94942be407..d0ced5fb5c 100644 --- a/libretro-common/samples/utils/Makefile +++ b/libretro-common/samples/utils/Makefile @@ -59,7 +59,7 @@ CC := $(compiler) CXX := $(subst CC,++,$(compiler)) flags := -I$(LIBRETRO_COMM_DIR)/include asflags := $(extra_flags) -LDFLAGS := +LDFLAGS := flags += -std=c99 -DMD5_BUILD_UTILITY -DSHA1_BUILD_UTILITY ifeq (1,$(use_neon)) diff --git a/libretro-common/streams/file_stream.c b/libretro-common/streams/file_stream.c index 3a6f161c5d..3d03fe3e53 100644 --- a/libretro-common/streams/file_stream.c +++ b/libretro-common/streams/file_stream.c @@ -215,37 +215,37 @@ int filestream_scanf(RFILE *stream, const char* format, ...) char buf[4096]; char subfmt[64]; va_list args; - + const char * bufiter = buf; int64_t startpos = filestream_tell(stream); int ret = 0; int64_t maxlen = filestream_read(stream, buf, sizeof(buf)-1); buf[maxlen] = '\0'; - + va_start(args, format); - + while (*format) { if (*format == '%') { int sublen; - + char* subfmtiter = subfmt; bool asterisk = false; - + *subfmtiter++ = *format++; /* '%' */ - + /* %[*][width][length]specifier */ - + if (*format == '*') { asterisk = true; *subfmtiter++ = *format++; } - + while (isdigit(*format)) *subfmtiter++ = *format++; /* width */ - + /* length */ if (*format == 'h' || *format == 'l') { @@ -256,7 +256,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...) { *subfmtiter++ = *format++; } - + /* specifier - always a single character (except ]) */ if (*format == '[') { @@ -264,11 +264,11 @@ int filestream_scanf(RFILE *stream, const char* format, ...) *subfmtiter++ = *format++; } else *subfmtiter++ = *format++; - + *subfmtiter++ = '%'; *subfmtiter++ = 'n'; *subfmtiter++ = '\0'; - + if (sizeof(void*) != sizeof(long*)) abort(); /* all pointers must have the same size */ if (asterisk) { @@ -278,7 +278,7 @@ int filestream_scanf(RFILE *stream, const char* format, ...) { if (sscanf(bufiter, subfmt, va_arg(args, void*), &sublen) != 1) break; } - + ret++; bufiter += sublen; } @@ -295,10 +295,10 @@ int filestream_scanf(RFILE *stream, const char* format, ...) format++; } } - + va_end(args); filestream_seek(stream, startpos+(bufiter-buf), RETRO_VFS_SEEK_POSITION_START); - + return ret; } diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c index 5a82f88c73..330b9e18af 100644 --- a/libretro-common/streams/file_stream_transforms.c +++ b/libretro-common/streams/file_stream_transforms.c @@ -37,7 +37,7 @@ RFILE* rfopen(const char *path, const char *mode) retro_mode = RETRO_VFS_FILE_ACCESS_READ; if (strstr(mode, "+")) { - retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE | + retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING; } } @@ -49,12 +49,12 @@ RFILE* rfopen(const char *path, const char *mode) } else if (strstr(mode, "a")) { - retro_mode = RETRO_VFS_FILE_ACCESS_WRITE | + retro_mode = RETRO_VFS_FILE_ACCESS_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING; position_to_end = true; if (strstr(mode, "+")) { - retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE | + retro_mode = RETRO_VFS_FILE_ACCESS_READ_WRITE | RETRO_VFS_FILE_ACCESS_UPDATE_EXISTING; } } diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index 16838f9b43..9763b5820c 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -238,10 +238,10 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i #ifdef HAVE_MMAP /* Need to check stream->mapped because this function is * called in filestream_open() */ - if (stream->mapped && stream->hints & + if (stream->mapped && stream->hints & RETRO_VFS_FILE_ACCESS_HINT_FREQUENT_ACCESS) { - /* fseek() returns error on under/overflow but + /* fseek() returns error on under/overflow but * allows cursor > EOF for read-only file descriptors. */ switch (whence) @@ -377,7 +377,7 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, uns #endif #endif break; - + default: goto error; } @@ -554,7 +554,7 @@ int64_t retro_vfs_file_tell_impl(libretro_vfs_implementation_file *stream) { #ifdef ORBIS int64_t ret = orbisLseek(stream->fd, 0, SEEK_CUR); - RARCH_LOG("[VFS]retro_vfs_file_tell_impl orbisLseek fd=%d path=%s ret=%d\n", stream->fd, stream->orig_path, ret); + RARCH_LOG("[VFS]retro_vfs_file_tell_impl orbisLseek fd=%d path=%s ret=%d\n", stream->fd, stream->orig_path, ret); if(ret < 0) return -1; return ret; @@ -675,7 +675,7 @@ int retro_vfs_file_flush_impl(libretro_vfs_implementation_file *stream) return -1; #ifdef ORBIS return 0; -#else +#else return fflush(stream->fp)==0 ? 0 : -1; #endif } @@ -801,7 +801,6 @@ const char *retro_vfs_file_get_path_impl(libretro_vfs_implementation_file *strea return stream->orig_path; } - int retro_vfs_stat_impl(const char *path, int32_t *size) { bool is_dir, is_character_special; @@ -978,7 +977,7 @@ struct libretro_vfs_implementation_dir CellFsDirent entry; #elif defined(ORBIS) int directory; - struct dirent entry; + struct dirent entry; #else DIR *directory; const struct dirent *entry; diff --git a/libretro-common/vfs/vfs_implementation_uwp.cpp b/libretro-common/vfs/vfs_implementation_uwp.cpp index 6c0b8122b6..2f9e94bf74 100644 --- a/libretro-common/vfs/vfs_implementation_uwp.cpp +++ b/libretro-common/vfs/vfs_implementation_uwp.cpp @@ -106,7 +106,6 @@ namespace } } - void windowsize_path(wchar_t* path) { /* UWP deals with paths containing / instead of \ way worse than normal Windows */ diff --git a/libretro-db/c_converter_test.sh b/libretro-db/c_converter_test.sh index 0c6bb646a3..80c6e27175 100755 --- a/libretro-db/c_converter_test.sh +++ b/libretro-db/c_converter_test.sh @@ -45,7 +45,6 @@ echo matches=0 failed=0 - for lua_rdb_file in $lua_RDB_outdir/*.rdb ; do name=`echo "$lua_rdb_file" | sed "s/${lua_RDB_outdir}\/*//"` name=`echo "$name" | sed "s/\.rdb//"` diff --git a/list_special.c b/list_special.c index 098dc2800a..976f30aa90 100644 --- a/list_special.c +++ b/list_special.c @@ -104,7 +104,7 @@ struct string_list *dir_list_new_special(const char *input_dir, if (!str_list) return NULL; - + ext_shaders[0] = '\0'; attr.i = 0; diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index cfd69f3619..6169e71c7f 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -666,7 +666,7 @@ bool cheat_manager_get_game_specific_filename(char * cheat_filename, size_t max_ game_name = path_basename(global->name.cheatfile); if (string_is_empty(settings->paths.path_cheat_database) || - string_is_empty(core_name) || + string_is_empty(core_name) || string_is_empty(game_name)) return false; @@ -760,7 +760,7 @@ int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound) { unsigned *val = (unsigned*)realloc( cheat_manager_state.memory_size_list, - sizeof(unsigned) * + sizeof(unsigned) * cheat_manager_state.num_memory_buffers); if (val) @@ -1243,7 +1243,7 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu cheat->rumble_prev_value = curr_value; - /* Give the emulator enough time + /* Give the emulator enough time * to initialize, load state, etc */ if (cheat->rumble_initialized > 300) { @@ -1309,7 +1309,7 @@ void cheat_manager_apply_retro_cheats(void) if (!cheat_manager_state.memory_initialized) cheat_manager_initialize_memory(NULL, false); - /* If we're still not initialized, something + /* If we're still not initialized, something * must have gone wrong - just bail */ if (!cheat_manager_state.memory_initialized) return; @@ -1320,7 +1320,7 @@ void cheat_manager_apply_retro_cheats(void) continue; } cheat_manager_setup_search_meta(cheat_manager_state.cheats[i].memory_search_size, &bytes_per_item, &mask, &bits); - + curr = cheat_manager_state.curr_memory_buf; idx = cheat_manager_state.cheats[i].address; diff --git a/media/icons/LICENSE/LICENSE.txt b/media/icons/LICENSE/LICENSE.txt index 6be4822288..aeb93d31e8 100644 --- a/media/icons/LICENSE/LICENSE.txt +++ b/media/icons/LICENSE/LICENSE.txt @@ -5,7 +5,6 @@ Icons generated with the Android Material Icon Generator are licensed under the For commercial usage, please submit a request under https://goo.gl/forms/zX8GZ3Jz89SRyHdJ2 or send us an email to material-icons@bitdroid.de. - Google Material Icons License ============================= diff --git a/media/rarch.rc b/media/rarch.rc index 932808ef1c..b9a4b7b76a 100644 --- a/media/rarch.rc +++ b/media/rarch.rc @@ -74,8 +74,6 @@ IDR_MENU MENU } } - - // // Dialog resources // @@ -91,16 +89,12 @@ FONT 8, "Ms Shell Dlg" LTEXT "Please select a core to use for the content loaded.\nOtherwise, press 'Cancel' to cancel loading.", 0, 9, 12, 160, 17, SS_LEFT, WS_EX_LEFT } - - // // Icon resources // LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 ICON "retroarch.ico" - - // // Manifest resources // diff --git a/media/rarch_ja.rc b/media/rarch_ja.rc index d69130844b..4174e44240 100644 --- a/media/rarch_ja.rc +++ b/media/rarch_ja.rc @@ -71,8 +71,6 @@ IDR_MENU MENU } } - - // // Dialog resources // diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index ed4e1bf648..8029d8c254 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -916,7 +916,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_switch_backlight_control); } #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) else if (strstr(label, msg_hash_to_str(MENU_ENUM_LABEL_SWITCH_CPU_PROFILE))) { diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 230afe2bab..69584cef43 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -2680,7 +2680,7 @@ static int action_ok_deferred_list_stub(const char *path, return 0; } -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) static int action_ok_set_switch_cpu_profile(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { @@ -2718,9 +2718,9 @@ static int action_ok_set_switch_gpu_profile(const char *path, snprintf(command, sizeof(command), "gpu-profile set %s", profile_name); system(command); - + snprintf(command, sizeof(command), "Current profile set to %s", profile_name); - + runloop_msg_queue_push(command, 1, 90, true); return menu_cbs_exit(); @@ -2736,9 +2736,9 @@ static int action_ok_set_switch_backlight(const char *path, snprintf(command, sizeof(command), "echo %d > /sys/class/backlight/backlight/brightness", brightness); system(command); - + snprintf(command, sizeof(command), "Brightness set to %d%%", brightness); - + runloop_msg_queue_push(command, 1, 90, true); return 0; @@ -2845,7 +2845,7 @@ static int action_ok_core_option_dropdown_list(const char *path, generic_action_ok_displaylist_push( core_option_lbl, NULL, - core_option_idx, 0, 0, 0, + core_option_idx, 0, 0, 0, ACTION_OK_DL_DROPDOWN_BOX_LIST); return 0; } @@ -5410,7 +5410,7 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE: case MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL: #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE: #endif BIND_ACTION_OK(cbs, action_ok_push_default); @@ -5880,7 +5880,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, BIND_ACTION_OK(cbs, action_ok_set_switch_backlight); break; #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case MENU_SET_SWITCH_CPU_PROFILE: BIND_ACTION_OK(cbs, action_ok_set_switch_cpu_profile); break; diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 520edfe59b..daaccec4f8 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -497,7 +497,7 @@ default_sublabel_macro(action_bind_sublabel_show_wimp, #endif default_sublabel_macro(action_bind_sublabel_discord_allow, MENU_ENUM_SUBLABEL_DISCORD_ALLOW) -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) default_sublabel_macro(action_bind_sublabel_switch_cpu_profile, MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE) #endif @@ -676,13 +676,13 @@ static int action_bind_sublabel_remap_sublabel( unsigned offset = (type - MENU_SETTINGS_INPUT_DESC_BEGIN) / (RARCH_FIRST_CUSTOM_BIND + 8); - snprintf(s, len, "%s #%d: %s", + snprintf(s, len, "%s #%d: %s", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USER), offset + 1, input_config_get_device_display_name(offset) ? input_config_get_device_display_name(offset) : (input_config_get_device_name(offset) ? - input_config_get_device_name(offset) : + input_config_get_device_name(offset) : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE))); return 0; } @@ -2188,7 +2188,7 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_show_wimp); break; #endif -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_switch_cpu_profile); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 6b0eb05202..fe528034ea 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -212,7 +212,7 @@ default_title_copy_macro(action_get_title_cheevos_list, MENU_ENUM_LABE default_title_copy_macro(action_get_title_video_shader_parameters,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS) default_title_copy_macro(action_get_title_video_shader_preset_parameters,MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS) -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) default_title_macro(action_get_title_switch_cpu_profile, MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE) #endif @@ -892,7 +892,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_LIBRETRO_INFO_PATH: BIND_ACTION_GET_TITLE(cbs, action_get_title_core_info_directory); break; -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE: BIND_ACTION_GET_TITLE(cbs, action_get_title_switch_cpu_profile); break; @@ -1194,7 +1194,7 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_LIBRETRO_INFO_PATH: BIND_ACTION_GET_TITLE(cbs, action_get_title_core_info_directory); break; -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE: BIND_ACTION_GET_TITLE(cbs, action_get_title_switch_cpu_profile); break; @@ -1252,7 +1252,7 @@ int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs, if (menu_cbs_init_bind_title_compare_type(cbs, type) == 0) return 0; - + if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MIXER_STREAM_SETTINGS_LIST))) { diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c index bbb066f61a..a214139139 100644 --- a/menu/drivers/ozone/ozone.c +++ b/menu/drivers/ozone/ozone.c @@ -668,7 +668,7 @@ static int ozone_list_push(void *data, void *userdata, menu_displaylist_setting(&entry); } -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) entry.enum_idx = MENU_ENUM_LABEL_SWITCH_CPU_PROFILE; menu_displaylist_setting(&entry); #endif diff --git a/menu/drivers/ozone/ozone.h b/menu/drivers/ozone/ozone.h index 76912544b9..cba78cdf90 100644 --- a/menu/drivers/ozone/ozone.h +++ b/menu/drivers/ozone/ozone.h @@ -46,7 +46,7 @@ struct ozone_handle { uint64_t frame_count; - struct + struct { font_data_t *footer; font_data_t *title; @@ -177,8 +177,8 @@ void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info, void ozone_draw_sidebar(ozone_handle_t *ozone, video_frame_info_t *video_info); -void ozone_change_tab(ozone_handle_t *ozone, - enum msg_hash_enums tab, +void ozone_change_tab(ozone_handle_t *ozone, + enum msg_hash_enums tab, enum menu_settings_type type); void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection); diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c index a61482cc05..ca6eb2b950 100644 --- a/menu/drivers/ozone/ozone_display.c +++ b/menu/drivers/ozone/ozone_display.c @@ -166,7 +166,7 @@ static void ozone_draw_cursor_fallback(ozone_handle_t *ozone, { ozone_color_alpha(ozone->theme_dynamic.selection_border, alpha); ozone_color_alpha(ozone->theme_dynamic.selection, alpha); - + /* Fill */ menu_display_draw_quad(video_info, x_offset, y, width, height - 5, video_info->width, video_info->height, ozone->theme_dynamic.selection); diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c index 49698e9d3f..08e8b97c40 100644 --- a/menu/drivers/ozone/ozone_entries.c +++ b/menu/drivers/ozone/ozone_entries.c @@ -27,7 +27,7 @@ #include "../../menu_driver.h" #include "../../menu_animation.h" -static void ozone_draw_entry_value(ozone_handle_t *ozone, +static void ozone_draw_entry_value(ozone_handle_t *ozone, video_frame_info_t *video_info, char *value, unsigned x, unsigned y, @@ -136,7 +136,7 @@ void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info, alpha = 1.0f - alpha; if (alpha != 1.0f) - { + { if (old_list) x_offset += invert * -(alpha_anim * 120); /* left */ else @@ -154,7 +154,7 @@ void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info, ozone_node_t *node = NULL; if (entry_selected) selection_y = y; - + if (entry_old_selected) old_selection_y = y; @@ -304,7 +304,7 @@ border_iterate: menu_animation_ticker(&ticker); ozone_draw_entry_value(ozone, video_info, entry_value_ticker, x_offset + 426 + entry_width, y + FONT_SIZE_ENTRIES_LABEL + 8 - 1 + scroll_y,alpha_uint32, &entry); - + free(entry_rich_label); if (sublabel_str) diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c index 2883a5fc18..f29ef4afd5 100644 --- a/menu/drivers/ozone/ozone_sidebar.c +++ b/menu/drivers/ozone/ozone_sidebar.c @@ -240,7 +240,7 @@ void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag) ozone->selection_old = ozone->selection; ozone->cursor_in_sidebar_old = ozone->cursor_in_sidebar; ozone->cursor_in_sidebar = true; - + /* Cursor animation */ ozone->animations.cursor_alpha = 0.0f; @@ -265,7 +265,7 @@ void ozone_leave_sidebar(ozone_handle_t *ozone, uintptr_t tag) ozone->categories_active_idx_old = ozone->categories_selection_ptr; ozone->cursor_in_sidebar_old = ozone->cursor_in_sidebar; ozone->cursor_in_sidebar = false; - + /* Cursor animation */ ozone->animations.cursor_alpha = 0.0f; @@ -370,8 +370,8 @@ void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection) } } -void ozone_change_tab(ozone_handle_t *ozone, - enum msg_hash_enums tab, +void ozone_change_tab(ozone_handle_t *ozone, + enum msg_hash_enums tab, enum menu_settings_type type) { file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); @@ -391,7 +391,7 @@ void ozone_change_tab(ozone_handle_t *ozone, if (menu_stack->list[stack_size - 1].label) free(menu_stack->list[stack_size - 1].label); menu_stack->list[stack_size - 1].label = NULL; - + menu_stack->list[stack_size - 1].label = strdup(msg_hash_to_str(tab)); menu_stack->list[stack_size - 1].type = diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c index 1c1d60cdaa..8f0a4b117d 100644 --- a/menu/drivers/ozone/ozone_theme.c +++ b/menu/drivers/ozone/ozone_theme.c @@ -124,7 +124,7 @@ unsigned ozone_get_system_theme(void) { #ifdef HAVE_LIBNX unsigned ret = 0; - if (R_SUCCEEDED(setsysInitialize())) + if (R_SUCCEEDED(setsysInitialize())) { ColorSetId theme; setsysGetColorSetId(&theme); diff --git a/menu/drivers/ozone/ozone_theme.h b/menu/drivers/ozone/ozone_theme.h index 375657806b..686fb892b9 100644 --- a/menu/drivers/ozone/ozone_theme.h +++ b/menu/drivers/ozone/ozone_theme.h @@ -86,7 +86,7 @@ static float ozone_sidebar_background_dark[16] = { static float ozone_sidebar_gradient_top_dark[16] = { 0.2, 0.2, 0.2, 1.00, - 0.2, 0.2, 0.2, 1.00, + 0.2, 0.2, 0.2, 1.00, 0.18, 0.18, 0.18, 1.00, 0.18, 0.18, 0.18, 1.00, }; @@ -144,7 +144,7 @@ typedef struct ozone_theme float *sidebar_top_gradient; float *sidebar_bottom_gradient; - /* + /* Fancy cursor colors */ float *cursor_border_0; diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 537699f250..7dbbd44ea5 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -589,12 +589,12 @@ static bool request_wallpaper(const char *path) if (string_is_equal(wallpaper.path, path)) return true; } - + /* 'Reset' current wallpaper */ wallpaper.is_valid = false; free(wallpaper.path); wallpaper.path = NULL; - + /* Ensure that new path is valid... */ if (!string_is_empty(path)) { @@ -608,18 +608,18 @@ static bool request_wallpaper(const char *path) return true; } } - + return false; } static void process_wallpaper(rgui_t *rgui, struct texture_image *image) { unsigned x, y; - + /* Sanity check */ if (!image->pixels || (image->width != WALLPAPER_WIDTH) || (image->height != WALLPAPER_HEIGHT)) return; - + /* Copy image to wallpaper buffer, performing pixel format conversion */ for (x = 0; x < WALLPAPER_WIDTH; x++) { @@ -629,9 +629,9 @@ static void process_wallpaper(rgui_t *rgui, struct texture_image *image) argb32_to_pixel_platform_format(image->pixels[x + (y * WALLPAPER_WIDTH)]); } } - + wallpaper.is_valid = true; - + /* Tell menu that a display update is required */ rgui->force_redraw = true; } @@ -644,14 +644,14 @@ static void request_thumbnail(rgui_t *rgui, const char *path) if (string_is_equal(thumbnail.path, path)) return; } - + /* 'Reset' current thumbnail */ thumbnail.width = 0; thumbnail.height = 0; thumbnail.is_valid = false; free(thumbnail.path); thumbnail.path = NULL; - + /* Ensure that new path is valid... */ if (!string_is_empty(path)) { @@ -671,7 +671,7 @@ static void request_thumbnail(rgui_t *rgui, const char *path) static bool downscale_thumbnail(rgui_t *rgui, struct texture_image *image_src, struct texture_image *image_dst) { settings_t *settings = config_get_ptr(); - + /* Determine output dimensions */ static const float display_aspect_ratio = (float)THUMB_MAX_WIDTH / (float)THUMB_MAX_HEIGHT; float aspect_ratio = (float)image_src->width / (float)image_src->height; @@ -691,24 +691,24 @@ static bool downscale_thumbnail(rgui_t *rgui, struct texture_image *image_src, s image_dst->width = (image_dst->width < 1) ? 1 : image_dst->width; image_dst->width = (image_dst->width > THUMB_MAX_WIDTH) ? THUMB_MAX_WIDTH : image_dst->width; } - + /* Allocate pixel buffer */ image_dst->pixels = (uint32_t*)calloc(image_dst->width * image_dst->height, sizeof(uint32_t)); if (!image_dst->pixels) return false; - + /* Determine scaling method */ if (settings->uints.menu_rgui_thumbnail_downscaler == RGUI_THUMB_SCALE_POINT) { uint32_t x_ratio, y_ratio; unsigned x_src, y_src; unsigned x_dst, y_dst; - + /* Perform nearest neighbour resampling * > Fastest method, minimal performance impact */ x_ratio = ((image_src->width << 16) / image_dst->width); y_ratio = ((image_src->height << 16) / image_dst->height); - + for (y_dst = 0; y_dst < image_dst->height; y_dst++) { y_src = (y_dst * y_ratio) >> 16; @@ -730,15 +730,15 @@ static bool downscale_thumbnail(rgui_t *rgui, struct texture_image *image_src, s rgui->image_scaler.in_height = image_src->height; rgui->image_scaler.in_stride = image_src->width * sizeof(uint32_t); rgui->image_scaler.in_fmt = SCALER_FMT_ARGB8888; - + rgui->image_scaler.out_width = image_dst->width; rgui->image_scaler.out_height = image_dst->height; rgui->image_scaler.out_stride = image_dst->width * sizeof(uint32_t); rgui->image_scaler.out_fmt = SCALER_FMT_ARGB8888; - + rgui->image_scaler.scaler_type = (settings->uints.menu_rgui_thumbnail_downscaler == RGUI_THUMB_SCALE_SINC) ? SCALER_TYPE_SINC : SCALER_TYPE_BILINEAR; - + /* This reset is redundant, since scaler_ctx_gen_filter() * calls it - but do it anyway in case the * scaler_ctx_gen_filter() internals ever change... */ @@ -750,13 +750,13 @@ static bool downscale_thumbnail(rgui_t *rgui, struct texture_image *image_src, s scaler_ctx_gen_reset(&rgui->image_scaler); return false; } - + scaler_ctx_scale(&rgui->image_scaler, image_dst->pixels, image_src->pixels); /* Reset again - don't want to leave anything hanging around * if the user switches back to nearest neighbour scaling */ scaler_ctx_gen_reset(&rgui->image_scaler); } - + return true; } @@ -770,7 +770,7 @@ static void process_thumbnail(rgui_t *rgui, struct texture_image *image_src) NULL, false }; - + /* Ensure that we only process the most recently loaded * thumbnail image (i.e. don't waste CPU cycles processing * old images if we have a backlog) @@ -783,11 +783,11 @@ static void process_thumbnail(rgui_t *rgui, struct texture_image *image_src) rgui->thumbnail_queue_size--; if (rgui->thumbnail_queue_size > 0) return; - + /* Sanity check */ if (!image_src->pixels || (image_src->width < 1) || (image_src->height < 1)) return; - + /* Downscale thumbnail if it exceeds maximum size limits */ if ((image_src->width > THUMB_MAX_WIDTH) || (image_src->height > THUMB_MAX_HEIGHT)) { @@ -799,10 +799,10 @@ static void process_thumbnail(rgui_t *rgui, struct texture_image *image_src) { image = image_src; } - + thumbnail.width = image->width; thumbnail.height = image->height; - + /* Copy image to thumbnail buffer, performing pixel format conversion */ for (x = 0; x < thumbnail.width; x++) { @@ -812,12 +812,12 @@ static void process_thumbnail(rgui_t *rgui, struct texture_image *image_src) argb32_to_pixel_platform_format(image->pixels[x + (y * thumbnail.width)]); } } - + thumbnail.is_valid = true; - + /* Tell menu that a display update is required */ rgui->force_redraw = true; - + /* Clean up */ image = NULL; if (image_resampled.pixels) @@ -857,21 +857,21 @@ static bool rgui_render_wallpaper(void) { size_t fb_pitch; unsigned fb_width, fb_height; - + if (wallpaper.is_valid && rgui_framebuf_data) { menu_display_get_fb_size(&fb_width, &fb_height, &fb_pitch); - + /* Sanity check */ if ((fb_width != WALLPAPER_WIDTH) || (fb_height != WALLPAPER_HEIGHT) || (fb_pitch != WALLPAPER_WIDTH << 1)) return false; - + /* Copy wallpaper to framebuffer */ memcpy(rgui_framebuf_data, wallpaper.data, WALLPAPER_WIDTH * WALLPAPER_HEIGHT * sizeof(uint16_t)); - + return true; } - + return false; } @@ -883,11 +883,11 @@ static void rgui_render_thumbnail(void) unsigned fb_x_offset, fb_y_offset; unsigned thumb_x_offset, thumb_y_offset; unsigned width, height; - + if (thumbnail.is_valid && rgui_framebuf_data) { menu_display_get_fb_size(&fb_width, &fb_height, &fb_pitch); - + /* Ensure that thumbnail is centred * > Have to perform some stupid tests here because we * cannot assume fb_width and fb_height are constant and @@ -917,7 +917,7 @@ static void rgui_render_thumbnail(void) fb_y_offset = 0; height = fb_height; } - + /* Copy thumbnail to framebuffer */ for (y = 0; y < height; y++) { @@ -1001,7 +1001,7 @@ static const rgui_theme_t *get_theme(rgui_t *rgui) default: break; } - + return &rgui_theme_classic_green; } @@ -1013,48 +1013,48 @@ static void load_custom_theme(rgui_t *rgui, rgui_theme_t *theme_colors, const ch border_dark_color, border_light_color; char wallpaper_file[PATH_MAX_LENGTH]; bool success = false; - + wallpaper_file[0] = '\0'; - + /* Sanity check */ if (string_is_empty(theme_path)) goto end; if (!filestream_exists(theme_path)) goto end; - + /* Open config file */ conf = config_file_new(theme_path); if (!conf) goto end; - + /* Parse config file */ if(!config_get_hex(conf, "rgui_entry_normal_color", &normal_color)) goto end; - + if(!config_get_hex(conf, "rgui_entry_hover_color", &hover_color)) goto end; - + if(!config_get_hex(conf, "rgui_title_color", &title_color)) goto end; - + if(!config_get_hex(conf, "rgui_bg_dark_color", &bg_dark_color)) goto end; - + if(!config_get_hex(conf, "rgui_bg_light_color", &bg_light_color)) goto end; - + if(!config_get_hex(conf, "rgui_border_dark_color", &border_dark_color)) goto end; - + if(!config_get_hex(conf, "rgui_border_light_color", &border_light_color)) goto end; - + config_get_array(conf, "rgui_wallpaper", wallpaper_file, sizeof(wallpaper_file)); - + success = true; - + end: - + if (success) { theme_colors->normal_color = (uint32_t)normal_color; @@ -1064,13 +1064,13 @@ end: theme_colors->bg_light_color = (uint32_t)bg_light_color; theme_colors->border_dark_color = (uint32_t)border_dark_color; theme_colors->border_light_color = (uint32_t)border_light_color; - + /* Load wallpaper, if required */ if (!string_is_empty(wallpaper_file)) { char wallpaper_path[PATH_MAX_LENGTH]; wallpaper_path[0] = '\0'; - + fill_pathname_resolve_relative(wallpaper_path, theme_path, wallpaper_file, sizeof(wallpaper_path)); rgui->show_wallpaper = request_wallpaper(wallpaper_path); } @@ -1086,7 +1086,7 @@ end: theme_colors->border_dark_color = rgui_theme_classic_green.border_dark_color; theme_colors->border_light_color = rgui_theme_classic_green.border_light_color; } - + if (conf) config_file_free(conf); conf = NULL; @@ -1121,7 +1121,7 @@ static void prepare_rgui_colors(rgui_t *rgui, settings_t *settings) rgui->colors.bg_light_color = argb32_to_pixel_platform_format(theme_colors.bg_light_color); rgui->colors.border_dark_color = argb32_to_pixel_platform_format(theme_colors.border_dark_color); rgui->colors.border_light_color = argb32_to_pixel_platform_format(theme_colors.border_light_color); - + rgui->bg_modified = true; } @@ -1279,7 +1279,7 @@ static void rgui_render_background(rgui_t *rgui) unsigned fb_width, fb_height; uint16_t *src = NULL; uint16_t *dst = NULL; - + menu_display_get_fb_size(&fb_width, &fb_height, &fb_pitch); @@ -1485,7 +1485,7 @@ static void rgui_render(void *data, bool is_idle) rgui->last_width = fb_width; rgui->last_height = fb_height; } - + if (rgui->bg_modified) rgui->bg_modified = false; @@ -1578,10 +1578,10 @@ static void rgui_render(void *data, bool is_idle) char thumbnail_title_buf[255]; unsigned title_x, title_width; thumbnail_title_buf[0] = '\0'; - + /* Draw thumbnail */ rgui_render_thumbnail(); - + /* Format thumbnail title */ ticker.s = thumbnail_title_buf; ticker.len = RGUI_TERM_WIDTH(fb_width) - 10; @@ -1589,16 +1589,16 @@ static void rgui_render(void *data, bool is_idle) ticker.str = rgui->thumbnail_content; ticker.selected = true; menu_animation_ticker(&ticker); - + title_width = utf8len(thumbnail_title_buf) * FONT_WIDTH_STRIDE; title_x = RGUI_TERM_START_X(fb_width) + ((RGUI_TERM_WIDTH(fb_width) * FONT_WIDTH_STRIDE) - title_width) / 2; - + if (rgui_framebuf_data) { /* Draw thumbnail title background */ rgui_fill_rect(rgui, rgui_framebuf_data, fb_pitch, title_x - 5, 0, title_width + 10, FONT_HEIGHT_STRIDE, rgui_bg_filler); - + /* Draw thumbnail title */ blit_line((int)title_x, 0, thumbnail_title_buf, rgui->colors.hover_color); } @@ -1642,9 +1642,9 @@ static void rgui_render(void *data, bool is_idle) ticker.idx = frame_count / RGUI_TERM_START_X(fb_width); ticker.str = core_title; ticker.selected = true; - + menu_animation_ticker(&ticker); - + if (rgui_framebuf_data) blit_line( RGUI_TERM_START_X(fb_width) + FONT_WIDTH_STRIDE, @@ -1837,7 +1837,7 @@ static void *rgui_init(void **userdata, bool video_is_threaded) rgui->thumbnail_queue_size = 0; /* Ensure that we start with thumbnails disabled */ rgui->show_thumbnail = false; - + return menu; error: @@ -1852,7 +1852,7 @@ static void rgui_free(void *data) const uint8_t *font_fb; bool fb_font_inited = false; rgui_t *rgui = (rgui_t*)data; - + if (rgui) { if (!string_is_empty(rgui->thumbnail_system)) @@ -1878,7 +1878,7 @@ static void rgui_free(void *data) if (!string_is_empty(thumbnail.path)) free(thumbnail.path); - + if (!string_is_empty(wallpaper.path)) free(wallpaper.path); } @@ -1916,7 +1916,7 @@ static const char *rgui_thumbnail_ident() { char folder = 0; settings_t *settings = config_get_ptr(); - + folder = settings->uints.menu_thumbnails; switch (folder) @@ -1942,13 +1942,13 @@ static void rgui_update_thumbnail_path(void *userdata) char new_path[PATH_MAX_LENGTH] = {0}; const char *thumbnail_base_dir = settings->paths.directory_thumbnails; const char *thumb_ident = rgui_thumbnail_ident(); - + if (!string_is_empty(rgui->thumbnail_path)) { free(rgui->thumbnail_path); rgui->thumbnail_path = NULL; } - + /* NB: The following is copied directly from xmb.c (xmb_update_thumbnail_path()) */ if (!string_is_equal(thumb_ident, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)) && !string_is_empty(thumbnail_base_dir) && @@ -1957,19 +1957,19 @@ static void rgui_update_thumbnail_path(void *userdata) { /* Append thumbnail system directory */ fill_pathname_join(new_path, thumbnail_base_dir, rgui->thumbnail_system, sizeof(new_path)); - + if (!string_is_empty(new_path)) { char *tmp_new2 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); tmp_new2[0] = '\0'; - + /* Append Named_Snaps/Named_Boxarts/Named_Titles */ fill_pathname_join(tmp_new2, new_path, thumb_ident, PATH_MAX_LENGTH * sizeof(char)); - + strlcpy(new_path, tmp_new2, PATH_MAX_LENGTH * sizeof(char)); free(tmp_new2); tmp_new2 = NULL; - + if (!string_is_empty(new_path)) { /* Scrub characters that are not cross-platform and/or violate the @@ -1980,27 +1980,27 @@ static void rgui_update_thumbnail_path(void *userdata) char *scrub_char_pointer = NULL; char *tmp_new = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); char *tmp = strdup(rgui->thumbnail_content); - + tmp_new[0] = '\0'; - + while((scrub_char_pointer = strpbrk(tmp, "&*/:`\"<>?\\|"))) *scrub_char_pointer = '_'; - + fill_pathname_join(tmp_new, new_path, tmp, PATH_MAX_LENGTH * sizeof(char)); - + if (!string_is_empty(tmp_new)) strlcpy(new_path, tmp_new, sizeof(new_path)); - + free(tmp_new); tmp_new = NULL; free(tmp); tmp = NULL; - + /* Append png extension */ if (!string_is_empty(new_path)) { strlcat(new_path, file_path_str(FILE_PATH_PNG_EXTENSION), sizeof(new_path)); - + if (!string_is_empty(new_path)) rgui->thumbnail_path = strdup(new_path); } @@ -2037,10 +2037,10 @@ static void rgui_update_thumbnail_content(void *userdata) playlist_t *playlist = NULL; char title[255]; size_t selection = menu_navigation_get_selection(); - + if (!rgui) return; - + /* Check whether current selection is a playlist entry * (i.e. whether we should be looking for a thumbnail image) */ rgui->is_playlist_entry = false; @@ -2061,13 +2061,13 @@ static void rgui_update_thumbnail_content(void *userdata) { const char *label = NULL; playlist_get_index(playlist, selection, NULL, &label, NULL, NULL, NULL, NULL); - + if (!string_is_empty(rgui->thumbnail_content)) { free(rgui->thumbnail_content); rgui->thumbnail_content = NULL; } - + if (!string_is_empty(label)) { rgui->thumbnail_content = strdup(label); @@ -2084,7 +2084,7 @@ static void rgui_update_thumbnail_image(void *userdata) rgui_t *rgui = (rgui_t*)userdata; if (!rgui) return; - + rgui->show_thumbnail = !rgui->show_thumbnail; if (rgui->show_thumbnail) diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index 4717c5577e..c91918b50f 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -881,7 +881,7 @@ static void stripes_update_thumbnail_path(void *data, unsigned i, char pos) stripes_node_t *node = (stripes_node_t*) file_list_get_userdata_at_offset(selection_buf, i); - if (!string_is_empty(node->fullpath) && + if (!string_is_empty(node->fullpath) && (pos == 'R' || (pos == 'L' && string_is_equal(stripes_thumbnails_ident('R'), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))))) { @@ -1700,7 +1700,7 @@ static void stripes_list_switch(stripes_handle_t *stripes) stripes_list_switch_horizontal_list(stripes); anim_entry.duration = STRIPES_DELAY; - anim_entry.target_value = stripes->categories_passive_width + anim_entry.target_value = stripes->categories_passive_width * -(float)stripes->categories_selection_ptr; anim_entry.subject = &stripes->categories_x_pos; anim_entry.easing_enum = EASING_OUT_QUAD; @@ -1879,7 +1879,7 @@ static void stripes_context_reset_horizontal_list( size_t list_size = stripes_list_get_size(stripes, MENU_LIST_HORIZONTAL); - stripes->categories_x_pos = + stripes->categories_x_pos = stripes->categories_passive_width * -(float)stripes->categories_selection_ptr; @@ -2292,7 +2292,7 @@ static void stripes_calculate_visible_range(const stripes_handle_t *stripes, { for (j = current; j-- > 0; ) { - float bottom = stripes_item_y(stripes, j, current) + float bottom = stripes_item_y(stripes, j, current) + base_y + stripes->icon_size; if (bottom < 0) @@ -2827,7 +2827,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info) return; scale_factor = (settings->uints.menu_xmb_scale_factor * (float)width) / (1920.0 * 100); - pseudo_font_length = stripes->icon_spacing_horizontal * 4 - stripes->icon_size / 4; + pseudo_font_length = stripes->icon_spacing_horizontal * 4 - stripes->icon_size / 4; stripes->frame_count++; @@ -2960,7 +2960,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info) // stripes->selection_buf_old, // stripes->selection_ptr_old, // (stripes_list_get_size(stripes, MENU_LIST_PLAIN) > 1) -// ? stripes->categories_selection_ptr : +// ? stripes->categories_selection_ptr : // stripes->categories_selection_ptr_old, // &stripes_item_color[0], // width, @@ -3123,7 +3123,7 @@ static void stripes_layout_psp(stripes_handle_t *stripes, int width) float scale_factor = ((settings->uints.menu_xmb_scale_factor * width) / (1920.0 * 100)) * 1.5; #ifdef _3DS - scale_factor = + scale_factor = settings->uints.menu_xmb_scale_factor / 400.0; #endif diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index a965d9477d..643e66106a 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -5007,8 +5007,6 @@ static void xmb_context_reset_textures( memcpy(item_color, coord_white, sizeof(item_color)); } - - return; error: diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp index 537b32a3d5..f47ee97dcb 100644 --- a/menu/drivers/xui.cpp +++ b/menu/drivers/xui.cpp @@ -2,7 +2,7 @@ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2011-2017 - Daniel De Matteis * Copyright (C) 2015- - Swizzy - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -188,11 +188,11 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName, HXUIRESOURCE hResource = 0; BOOL bIsMemoryResource = FALSE; IDirect3DDevice9 * d3dDevice = NULL; - HRESULT hr = + HRESULT hr = XuiResourceOpenNoLoc(szFileName, &hResource, &bIsMemoryResource); if (FAILED(hr)) - return hr; + return hr; if (bIsMemoryResource) { @@ -201,7 +201,7 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName, goto cleanup; cbTextureData = XuiResourceGetTotalSize(hResource); } - else + else { hr = XuiResourceRead(hResource, NULL, 0, &cbTextureData); if (FAILED(hr)) @@ -232,9 +232,9 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName, /* Create our texture based on our conditions */ hr = D3DXCreateTextureFromFileInMemoryEx( d3dDevice, - pbTextureData, + pbTextureData, cbTextureData, - D3DX_DEFAULT_NONPOW2, + D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2, 1, D3DUSAGE_CPU_CACHED_MEMORY, @@ -514,7 +514,7 @@ static void xui_set_list_text(int index, const wchar_t* leftText, XuiTextElementSetText(hTextLeft, leftText); XuiElementGetChildById(hVisual, L"RightText", &hTextRight); - if(XuiHandleIsValid(hTextRight)) + if(XuiHandleIsValid(hTextRight)) { currText = XuiTextElementGetText(hTextRight); XuiElementGetBounds(hTextRight, &width, &height); @@ -551,7 +551,7 @@ static void xui_render(void *data, bool is_idle) &fb_pitch); if ( - menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL) + menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL) && menu_driver_is_alive() && !msg_force ) @@ -623,7 +623,7 @@ static void xui_render(void *data, bool is_idle) const char *label = menu_input_dialog_get_label_buffer(); snprintf(msg, sizeof(msg), "%s\n%s", label, str); - xui_render_messagebox(NULL, msg); + xui_render_messagebox(NULL, msg); } } diff --git a/menu/drivers_display/menu_display_ctr.c b/menu/drivers_display/menu_display_ctr.c index 3713f966d2..1c6dc9ddb8 100644 --- a/menu/drivers_display/menu_display_ctr.c +++ b/menu/drivers_display/menu_display_ctr.c @@ -64,7 +64,7 @@ static void menu_display_ctr_draw(menu_display_ctx_draw_t *draw, { struct ctr_texture *texture = NULL; const float *color = NULL; - ctr_video_t *ctr = video_info ? + ctr_video_t *ctr = video_info ? (ctr_video_t*)video_info->userdata : NULL; if (!ctr || !draw) diff --git a/menu/drivers_display/menu_display_d3d10.c b/menu/drivers_display/menu_display_d3d10.c index c8e5792cf0..f04452b069 100644 --- a/menu/drivers_display/menu_display_d3d10.c +++ b/menu/drivers_display/menu_display_d3d10.c @@ -67,7 +67,7 @@ static void menu_display_d3d10_draw(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { int vertex_count; - d3d10_video_t* d3d10 = video_info ? + d3d10_video_t* d3d10 = video_info ? (d3d10_video_t*)video_info->userdata : NULL; if (!d3d10 || !draw || !draw->texture) @@ -188,7 +188,7 @@ static void menu_display_d3d10_draw(menu_display_ctx_draw_t *draw, static void menu_display_d3d10_draw_pipeline(menu_display_ctx_draw_t* draw, video_frame_info_t *video_info) { - d3d10_video_t* d3d10 = video_info ? + d3d10_video_t* d3d10 = video_info ? (d3d10_video_t*)video_info->userdata : NULL; if (!d3d10 || !draw) @@ -248,7 +248,7 @@ static void menu_display_d3d10_clear_color( menu_display_ctx_clearcolor_t* clearcolor, video_frame_info_t *video_info) { - d3d10_video_t *d3d10 = video_info ? + d3d10_video_t *d3d10 = video_info ? (d3d10_video_t*)video_info->userdata : NULL; if (!d3d10 || !clearcolor) diff --git a/menu/drivers_display/menu_display_d3d11.c b/menu/drivers_display/menu_display_d3d11.c index dd7ace57c8..55ac4fc9fe 100644 --- a/menu/drivers_display/menu_display_d3d11.c +++ b/menu/drivers_display/menu_display_d3d11.c @@ -187,7 +187,7 @@ static void menu_display_d3d11_draw(menu_display_ctx_draw_t *draw, static void menu_display_d3d11_draw_pipeline(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { - d3d11_video_t* d3d11 = video_info ? + d3d11_video_t* d3d11 = video_info ? (d3d11_video_t*)video_info->userdata : NULL; if (!d3d11 || !draw) @@ -247,7 +247,7 @@ static void menu_display_d3d11_clear_color( menu_display_ctx_clearcolor_t* clearcolor, video_frame_info_t *video_info) { - d3d11_video_t *d3d11 = video_info ? + d3d11_video_t *d3d11 = video_info ? (d3d11_video_t*)video_info->userdata : NULL; if (!d3d11 || !clearcolor) diff --git a/menu/drivers_display/menu_display_d3d12.c b/menu/drivers_display/menu_display_d3d12.c index a579c16245..e845770724 100644 --- a/menu/drivers_display/menu_display_d3d12.c +++ b/menu/drivers_display/menu_display_d3d12.c @@ -68,7 +68,7 @@ static void menu_display_d3d12_draw(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { int vertex_count; - d3d12_video_t* d3d12 = video_info ? + d3d12_video_t* d3d12 = video_info ? (d3d12_video_t*)video_info->userdata : NULL; if (!d3d12 || !draw || !draw->texture) @@ -205,7 +205,7 @@ static void menu_display_d3d12_draw(menu_display_ctx_draw_t *draw, static void menu_display_d3d12_draw_pipeline(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { - d3d12_video_t *d3d12 = video_info ? + d3d12_video_t *d3d12 = video_info ? (d3d12_video_t*)video_info->userdata : NULL; if (!d3d12 || !draw) diff --git a/menu/drivers_display/menu_display_d3d8.c b/menu/drivers_display/menu_display_d3d8.c index c2268c5111..c4b0279553 100644 --- a/menu/drivers_display/menu_display_d3d8.c +++ b/menu/drivers_display/menu_display_d3d8.c @@ -80,7 +80,7 @@ static INT32 menu_display_prim_to_d3d8_enum( static void menu_display_d3d8_blend_begin(video_frame_info_t *video_info) { - d3d8_video_t *d3d = video_info ? + d3d8_video_t *d3d = video_info ? (d3d8_video_t*)video_info->userdata : NULL; if (!d3d) @@ -91,7 +91,7 @@ static void menu_display_d3d8_blend_begin(video_frame_info_t *video_info) static void menu_display_d3d8_blend_end(video_frame_info_t *video_info) { - d3d8_video_t *d3d = video_info ? + d3d8_video_t *d3d = video_info ? (d3d8_video_t*)video_info->userdata : NULL; if (!d3d) @@ -124,8 +124,8 @@ static void menu_display_d3d8_draw(menu_display_ctx_draw_t *draw, video_shader_ctx_mvp_t mvp; math_matrix_4x4 mop, m1, m2; unsigned width, height; - d3d8_video_t *d3d = video_info ? - (d3d8_video_t*)video_info->userdata : NULL; + d3d8_video_t *d3d = video_info ? + (d3d8_video_t*)video_info->userdata : NULL; Vertex * pv = NULL; const float *vertex = NULL; const float *tex_coord = NULL; @@ -221,8 +221,8 @@ static void menu_display_d3d8_draw(menu_display_ctx_draw_t *draw, d3d8_draw_primitive(d3d->dev, menu_display_prim_to_d3d8_enum(draw->prim_type), d3d->menu_display.offset, - draw->coords->vertices - - ((draw->prim_type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) + draw->coords->vertices - + ((draw->prim_type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) ? 2 : 0)); d3d->menu_display.offset += draw->coords->vertices; @@ -242,7 +242,7 @@ static void menu_display_d3d8_clear_color( menu_display_ctx_clearcolor_t *clearcolor, video_frame_info_t *video_info) { DWORD clear_color = 0; - d3d8_video_t *d3d = video_info ? + d3d8_video_t *d3d = video_info ? (d3d8_video_t*)video_info->userdata : NULL; if (!d3d || !clearcolor) diff --git a/menu/drivers_display/menu_display_d3d9.c b/menu/drivers_display/menu_display_d3d9.c index fa7b2a2a01..72a3ba8e65 100644 --- a/menu/drivers_display/menu_display_d3d9.c +++ b/menu/drivers_display/menu_display_d3d9.c @@ -80,7 +80,7 @@ static INT32 menu_display_prim_to_d3d9_enum( static void menu_display_d3d9_blend_begin(video_frame_info_t *video_info) { - d3d9_video_t *d3d = video_info ? + d3d9_video_t *d3d = video_info ? (d3d9_video_t*)video_info->userdata : NULL; if (!d3d) @@ -91,7 +91,7 @@ static void menu_display_d3d9_blend_begin(video_frame_info_t *video_info) static void menu_display_d3d9_blend_end(video_frame_info_t *video_info) { - d3d9_video_t *d3d = video_info ? + d3d9_video_t *d3d = video_info ? (d3d9_video_t*)video_info->userdata : NULL; if (!d3d) @@ -126,8 +126,8 @@ static void menu_display_d3d9_draw(menu_display_ctx_draw_t *draw, math_matrix_4x4 mop, m1, m2; unsigned width, height; LPDIRECT3DDEVICE9 dev; - d3d9_video_t *d3d = video_info ? - (d3d9_video_t*)video_info->userdata : NULL; + d3d9_video_t *d3d = video_info ? + (d3d9_video_t*)video_info->userdata : NULL; Vertex * pv = NULL; const float *vertex = NULL; const float *tex_coord = NULL; @@ -215,8 +215,8 @@ static void menu_display_d3d9_draw(menu_display_ctx_draw_t *draw, d3d9_draw_primitive(dev, (D3DPRIMITIVETYPE)menu_display_prim_to_d3d9_enum(draw->prim_type), d3d->menu_display.offset, - draw->coords->vertices - - ((draw->prim_type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) + draw->coords->vertices - + ((draw->prim_type == MENU_DISPLAY_PRIM_TRIANGLESTRIP) ? 2 : 0)); d3d->menu_display.offset += draw->coords->vertices; @@ -228,7 +228,7 @@ static void menu_display_d3d9_draw_pipeline(menu_display_ctx_draw_t *draw, #if defined(HAVE_HLSL) || defined(HAVE_CG) static float t = 0; video_coord_array_t *ca = NULL; - + if (!draw) return; @@ -277,7 +277,7 @@ static void menu_display_d3d9_clear_color( { LPDIRECT3DDEVICE9 dev; DWORD clear_color = 0; - d3d9_video_t *d3d = video_info ? + d3d9_video_t *d3d = video_info ? (d3d9_video_t*)video_info->userdata : NULL; if (!d3d || !clearcolor) diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c index 53a17708fc..6dac4e0336 100644 --- a/menu/drivers_display/menu_display_gl.c +++ b/menu/drivers_display/menu_display_gl.c @@ -144,7 +144,7 @@ static void menu_display_gl_draw_pipeline(menu_display_ctx_draw_t *draw, { #ifdef HAVE_SHADERPIPELINE struct uniform_info uniform_param; - gl_t *gl = video_info ? + gl_t *gl = video_info ? (gl_t*)video_info->userdata : NULL; static float t = 0; video_coord_array_t *ca = menu_display_get_coords_array(); diff --git a/menu/drivers_display/menu_display_metal.m b/menu/drivers_display/menu_display_metal.m index f6b0eebcfb..97103bacad 100644 --- a/menu/drivers_display/menu_display_metal.m +++ b/menu/drivers_display/menu_display_metal.m @@ -42,7 +42,7 @@ static void *menu_display_metal_get_default_mvp(video_frame_info_t *video_info) MetalDriver *md = GET_DRIVER(video_info); if (!md) return NULL; - + return (void *)&md.viewportMVP->projectionMatrix; } @@ -51,7 +51,7 @@ static void menu_display_metal_blend_begin(video_frame_info_t *video_info) MetalDriver *md = GET_DRIVER(video_info); if (!md) return; - + md.display.blend = YES; } @@ -60,7 +60,7 @@ static void menu_display_metal_blend_end(video_frame_info_t *video_info) MetalDriver *md = GET_DRIVER(video_info); if (!md) return; - + md.display.blend = NO; } @@ -70,7 +70,7 @@ static void menu_display_metal_draw(menu_display_ctx_draw_t *draw, MetalDriver *md = GET_DRIVER(video_info); if (!md || !draw) return; - + [md.display draw:draw video:video_info]; } @@ -79,7 +79,7 @@ static void menu_display_metal_draw_pipeline(menu_display_ctx_draw_t *draw, vide MetalDriver *md = GET_DRIVER(video_info); if (!md || !draw) return; - + [md.display drawPipeline:draw video:video_info]; } @@ -93,7 +93,7 @@ static void menu_display_metal_scissor_begin(video_frame_info_t *video_info, int MetalDriver *md = GET_DRIVER(video_info); if (!md) return; - + MTLScissorRect r = {.x = (NSUInteger)x, .y = (NSUInteger)y, .width = width, .height = height}; [md.display setScissorRect:r]; } @@ -103,7 +103,7 @@ static void menu_display_metal_scissor_end(video_frame_info_t *video_info) MetalDriver *md = GET_DRIVER(video_info); if (!md) return; - + [md.display clearScissorRect]; } @@ -118,7 +118,7 @@ static void menu_display_metal_clear_color(menu_display_ctx_clearcolor_t *clearc MetalDriver *md = GET_DRIVER(video_info); if (!md) return; - + md.display.clearColor = MTLClearColorMake(clearcolor->r, clearcolor->g, clearcolor->b, clearcolor->a); } @@ -132,10 +132,10 @@ static bool menu_display_metal_font_init_first( font_path, font_size, true, is_threaded, FONT_DRIVER_RENDER_METAL_API); - + if (*handle) return true; - + return false; } diff --git a/menu/drivers_display/menu_display_vita2d.c b/menu/drivers_display/menu_display_vita2d.c index b1d439cdb6..701825ea50 100644 --- a/menu/drivers_display/menu_display_vita2d.c +++ b/menu/drivers_display/menu_display_vita2d.c @@ -56,7 +56,7 @@ static const float *menu_display_vita2d_get_default_tex_coords(void) static void *menu_display_vita2d_get_default_mvp( video_frame_info_t *video_info) { - vita_video_t *vita2d = video_info ? + vita_video_t *vita2d = video_info ? (vita_video_t*)video_info->userdata : NULL; if (!vita2d) @@ -113,7 +113,7 @@ static void menu_display_vita2d_draw(menu_display_ctx_draw_t *draw, const float *vertex = NULL; const float *tex_coord = NULL; const float *color = NULL; - vita_video_t *vita2d = video_info ? + vita_video_t *vita2d = video_info ? (vita_video_t*)video_info->userdata : NULL; if (!vita2d || !draw) diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c index 022ece580b..03164f9a89 100644 --- a/menu/drivers_display/menu_display_vulkan.c +++ b/menu/drivers_display/menu_display_vulkan.c @@ -102,7 +102,7 @@ static unsigned to_menu_pipeline( static void menu_display_vk_viewport(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { - vk_t *vk = video_info ? (vk_t*)video_info->userdata + vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL; if (!vk || !draw) @@ -125,7 +125,7 @@ static void menu_display_vk_draw_pipeline(menu_display_ctx_draw_t *draw, static struct video_coords blank_coords; float output_size[2]; video_coord_array_t *ca = NULL; - vk_t *vk = video_info ? + vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL; if (!vk || !draw) @@ -188,7 +188,7 @@ static void menu_display_vk_draw(menu_display_ctx_draw_t *draw, const float *tex_coord = NULL; const float *color = NULL; struct vk_vertex *pv = NULL; - vk_t *vk = video_info ? + vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL; if (!vk || !draw) diff --git a/menu/drivers_display/menu_display_wiiu.c b/menu/drivers_display/menu_display_wiiu.c index fdf50010e1..95471205a1 100644 --- a/menu/drivers_display/menu_display_wiiu.c +++ b/menu/drivers_display/menu_display_wiiu.c @@ -63,7 +63,7 @@ static void menu_display_wiiu_viewport(menu_display_ctx_draw_t *draw, static void menu_display_wiiu_draw(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { - wiiu_video_t *wiiu = video_info ? + wiiu_video_t *wiiu = video_info ? (wiiu_video_t*)video_info->userdata : NULL; if (!wiiu || !draw) @@ -234,7 +234,7 @@ static void menu_display_wiiu_draw_pipeline(menu_display_ctx_draw_t *draw, video_frame_info_t *video_info) { video_coord_array_t *ca = NULL; - wiiu_video_t *wiiu = video_info ? + wiiu_video_t *wiiu = video_info ? (wiiu_video_t*)video_info->userdata : NULL; if (!wiiu || !draw) diff --git a/menu/menu_animation.c b/menu/menu_animation.c index 17fe8013d8..a406faee77 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -487,7 +487,7 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry) /* ignore born dead tweens */ if (!t.easing || t.duration == 0 || t.initial_value == t.target_value) return false; - + if (anim.in_update) da_push(anim.pending, t); else @@ -499,7 +499,7 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry) bool menu_animation_update(float anim_delta_time) { unsigned i; - + anim.in_update = true; anim.pending_deletes = false; @@ -520,12 +520,12 @@ bool menu_animation_update(float anim_delta_time) if (tween->cb) tween->cb(tween->userdata); - + da_delete(anim.list, i); i--; } } - + if (anim.pending_deletes) { for(i = 0; i < da_count(anim.list); i++) @@ -539,7 +539,7 @@ bool menu_animation_update(float anim_delta_time) } anim.pending_deletes = false; } - + if (da_count(anim.pending) > 0) { da_addn(anim.list, anim.pending.p, da_count(anim.pending)); @@ -638,7 +638,7 @@ bool menu_animation_kill_by_tag(menu_animation_ctx_tag *tag) struct tween *t = da_getptr(anim.list, i); if (t->tag != *tag) continue; - + if (anim.in_update) { t->deleted = true; @@ -667,7 +667,7 @@ void menu_animation_kill_by_subject(menu_animation_ctx_subject_t *subject) { if (t->subject != sub[j]) continue; - + if (anim.in_update) { t->deleted = true; diff --git a/menu/menu_defines.h b/menu/menu_defines.h index d2a4126a0c..b5495b0efd 100644 --- a/menu/menu_defines.h +++ b/menu/menu_defines.h @@ -25,7 +25,6 @@ RETRO_BEGIN_DECLS #define MENU_SETTINGS_AUDIO_MIXER_MAX_STREAMS (AUDIO_MIXER_MAX_SYSTEM_STREAMS-1) - enum menu_image_type { MENU_IMAGE_NONE = 0, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1b7546fab7..50703545fa 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4364,7 +4364,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist switch (type) { -#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) +#if defined(HAVE_LAKKA_SWITCH) || defined(HAVE_LIBNX) case DISPLAYLIST_SWITCH_CPU_PROFILE: { unsigned i; @@ -4374,15 +4374,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist const size_t profiles_count = sizeof(SWITCH_CPU_PROFILES)/sizeof(SWITCH_CPU_PROFILES[1]); runloop_msg_queue_push("Warning : extended overclocking can damage the Switch", 1, 90, true); - + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - + #ifdef HAVE_LAKKA_SWITCH - profile = popen("cpu-profile get", "r"); - fgets(current_profile, PATH_MAX_LENGTH, profile); + profile = popen("cpu-profile get", "r"); + fgets(current_profile, PATH_MAX_LENGTH, profile); pclose(profile); - - + snprintf(text, sizeof(text), "Current profile : %s", current_profile); #else u32 currentClock = 0; @@ -4394,7 +4393,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist "", 0, MENU_INFO_MESSAGE, 0, 0); - + for (i = 0; i < profiles_count; i++) { char* profile = SWITCH_CPU_PROFILES[i]; @@ -4404,17 +4403,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist snprintf(title, sizeof(title), "%s (%s)", profile, speed); - menu_entries_append_enum(info->list, + menu_entries_append_enum(info->list, title, "", 0, MENU_SET_SWITCH_CPU_PROFILE, 0, i); - } - + } + info->need_push = true; info->need_refresh = true; info->need_clear = true; - + break; } #if defined(HAVE_LAKKA_SWITCH) @@ -4428,12 +4427,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist runloop_msg_queue_push("Warning : extented overclocking can damage the Switch", 1, 90, true); - profile = popen("gpu-profile get", "r"); - fgets(current_profile, PATH_MAX_LENGTH, profile); + profile = popen("gpu-profile get", "r"); + fgets(current_profile, PATH_MAX_LENGTH, profile); pclose(profile); - + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); - + snprintf(text, sizeof(text), "Current profile : %s", current_profile); menu_entries_append_enum(info->list, @@ -4441,8 +4440,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist "", 0, MENU_INFO_MESSAGE, 0, 0); - - + for (i = 0; i < profiles_count; i++) { char* profile = SWITCH_GPU_PROFILES[i]; @@ -4451,16 +4449,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist snprintf(title, sizeof(title), "%s (%s)", profile, speed); - menu_entries_append_enum(info->list, + menu_entries_append_enum(info->list, title, "", - 0, MENU_SET_SWITCH_GPU_PROFILE, 0, i); - } - + 0, MENU_SET_SWITCH_GPU_PROFILE, 0, i); + } + info->need_push = true; info->need_refresh = true; info->need_clear = true; - + break; } case DISPLAYLIST_SWITCH_BACKLIGHT_CONTROL: @@ -4476,7 +4474,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist snprintf(title, sizeof(title), "Set to %d%%", SWITCH_BRIGHTNESS[i]); - menu_entries_append_enum(info->list, + menu_entries_append_enum(info->list, title, "", 0, MENU_SET_SWITCH_BRIGHTNESS, 0, i); diff --git a/menu/menu_input.c b/menu/menu_input.c index 71f29e5f3e..70a8b4e127 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -176,7 +176,7 @@ unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input) menu_input_t *menu_input = NULL; settings_t *settings = config_get_ptr(); bool swap_ok_cancel_btns = settings->bools.input_menu_swap_ok_cancel_buttons; - bool input_swap_override = + bool input_swap_override = input_autoconfigure_get_swap_override(); unsigned menu_ok_btn = (!input_swap_override && swap_ok_cancel_btns) ? @@ -247,14 +247,14 @@ unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input) if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_DOWN)) { if (menu_event_get_osk_ptr() < 33) - menu_event_set_osk_ptr(menu_event_get_osk_ptr() + menu_event_set_osk_ptr(menu_event_get_osk_ptr() + OSK_CHARS_PER_LINE); } if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_UP)) { if (menu_event_get_osk_ptr() >= OSK_CHARS_PER_LINE) - menu_event_set_osk_ptr(menu_event_get_osk_ptr() + menu_event_set_osk_ptr(menu_event_get_osk_ptr() - OSK_CHARS_PER_LINE); } diff --git a/menu/menu_networking.c b/menu/menu_networking.c index 38dee85723..4504aac070 100644 --- a/menu/menu_networking.c +++ b/menu/menu_networking.c @@ -1,293 +1,293 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2014-2017 - Jean-André Santoni - * Copyright (C) 2015-2017 - Andrés Suárez - * Copyright (C) 2016-2017 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include - -#include -#include -#include -#include -#include -#include -#include - -#ifdef HAVE_NETWORKING -#include -#endif - -#include "menu_driver.h" -#include "menu_networking.h" -#include "menu_cbs.h" -#include "menu_entries.h" - -#include "../core_info.h" -#include "../configuration.h" -#include "../file_path_special.h" -#include "../msg_hash.h" -#include "../tasks/task_file_transfer.h" -#include "../tasks/tasks_internal.h" - -void print_buf_lines(file_list_t *list, char *buf, - const char *label, int buf_size, - enum msg_file_type type, bool append, bool extended) -{ - char c; - int i, j = 0; - char *line_start = buf; - - if (!buf || !buf_size) - { - menu_entries_append_enum(list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY), - msg_hash_to_str(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY), - MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, - FILE_TYPE_NONE, 0, 0); - return; - } - - for (i = 0; i < buf_size; i++) - { - size_t ln; - const char *core_date = NULL; - const char *core_crc = NULL; - const char *core_pathname = NULL; - struct string_list *str_list = NULL; - - /* The end of the buffer, print the last bit */ - if (*(buf + i) == '\0') - break; - - if (*(buf + i) != '\n') - continue; - - /* Found a line ending, print the line and compute new line_start */ - - /* Save the next char */ - c = *(buf + i + 1); - /* replace with \0 */ - *(buf + i + 1) = '\0'; - - /* We need to strip the newline. */ - ln = strlen(line_start) - 1; - if (line_start[ln] == '\n') - line_start[ln] = '\0'; - - str_list = string_split(line_start, " "); - - if (str_list->elems[0].data) - core_date = str_list->elems[0].data; - if (str_list->elems[1].data) - core_crc = str_list->elems[1].data; - if (str_list->elems[2].data) - core_pathname = str_list->elems[2].data; - - (void)core_date; - (void)core_crc; - - if (extended) - { - if (append) - menu_entries_append_enum(list, core_pathname, "", - MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); - else - menu_entries_prepend(list, core_pathname, "", - MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); - } - else - { - if (append) - menu_entries_append_enum(list, line_start, label, - MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); - else - menu_entries_prepend(list, line_start, label, - MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); - } - - switch (type) - { - case FILE_TYPE_DOWNLOAD_CORE: - { - settings_t *settings = config_get_ptr(); - - if (settings) - { - char display_name[255]; - char core_path[PATH_MAX_LENGTH]; - char *last = NULL; - - display_name[0] = core_path[0] = '\0'; - - fill_pathname_join_noext( - core_path, - settings->paths.path_libretro_info, - (extended && !string_is_empty(core_pathname)) - ? core_pathname : line_start, - sizeof(core_path)); - path_remove_extension(core_path); - - last = (char*)strrchr(core_path, '_'); - - if (!string_is_empty(last)) - { - if (string_is_not_equal_fast(last, "_libretro", 9)) - *last = '\0'; - } - - strlcat(core_path, - file_path_str(FILE_PATH_CORE_INFO_EXTENSION), - sizeof(core_path)); - - if ( - filestream_exists(core_path) - && core_info_get_display_name( - core_path, display_name, sizeof(display_name))) - file_list_set_alt_at_offset(list, j, display_name); - } - } - break; - default: - case FILE_TYPE_NONE: - break; - } - - j++; - - string_list_free(str_list); - - /* Restore the saved char */ - *(buf + i + 1) = c; - line_start = buf + i + 1; - } - - if (append) - file_list_sort_on_alt(list); - /* If the buffer was completely full, and didn't end - * with a newline, just ignore the partial last line. */ -} - -void cb_net_generic_subdir(void *task_data, void *user_data, const char *err) -{ -#ifdef HAVE_NETWORKING - char subdir_path[PATH_MAX_LENGTH]; - http_transfer_data_t *data = (http_transfer_data_t*)task_data; - file_transfer_t *state = (file_transfer_t*)user_data; - - subdir_path[0] = '\0'; - - if (!data || err) - goto finish; - - if (!string_is_empty(data->data)) - memcpy(subdir_path, data->data, data->len * sizeof(char)); - subdir_path[data->len] = '\0'; - -finish: - if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) - { - char parent_dir[PATH_MAX_LENGTH]; - - parent_dir[0] = '\0'; - - fill_pathname_parent_dir(parent_dir, - state->path, sizeof(parent_dir)); - - /*generic_action_ok_displaylist_push(parent_dir, NULL, - subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/ - } - - if (data) - { - if (data->data) - free(data->data); - free(data); - } - - if (user_data) - free(user_data); -#endif -} - -void cb_net_generic(void *task_data, void *user_data, const char *err) -{ -#ifdef HAVE_NETWORKING - bool refresh = false; - http_transfer_data_t *data = (http_transfer_data_t*)task_data; - file_transfer_t *state = (file_transfer_t*)user_data; - menu_handle_t *menu = NULL; - - if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) - goto finish; - - if (menu->core_buf) - free(menu->core_buf); - - menu->core_buf = NULL; - menu->core_len = 0; - - if (!data || err) - goto finish; - - menu->core_buf = (char*)malloc((data->len+1) * sizeof(char)); - - if (!menu->core_buf) - goto finish; - - if (!string_is_empty(data->data)) - memcpy(menu->core_buf, data->data, data->len * sizeof(char)); - menu->core_buf[data->len] = '\0'; - menu->core_len = data->len; - -finish: - refresh = true; - menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh); - - if (data) - { - if (data->data) - free(data->data); - free(data); - } - - if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) - { - char *parent_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); - file_transfer_t *transf = NULL; - - parent_dir[0] = '\0'; - - fill_pathname_parent_dir(parent_dir, - state->path, PATH_MAX_LENGTH * sizeof(char)); - strlcat(parent_dir, - file_path_str(FILE_PATH_INDEX_DIRS_URL), - PATH_MAX_LENGTH * sizeof(char)); - - transf = (file_transfer_t*)malloc(sizeof(*transf)); - - transf->enum_idx = MSG_UNKNOWN; - strlcpy(transf->path, parent_dir, sizeof(transf->path)); - - task_push_http_transfer(parent_dir, true, - "index_dirs", cb_net_generic_subdir, transf); - - free(parent_dir); - } - - if (state) - free(state); -#endif -} +/* RetroArch - A frontend for libretro. + * Copyright (C) 2011-2017 - Daniel De Matteis + * Copyright (C) 2014-2017 - Jean-André Santoni + * Copyright (C) 2015-2017 - Andrés Suárez + * Copyright (C) 2016-2017 - Brad Parker + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#ifdef HAVE_NETWORKING +#include +#endif + +#include "menu_driver.h" +#include "menu_networking.h" +#include "menu_cbs.h" +#include "menu_entries.h" + +#include "../core_info.h" +#include "../configuration.h" +#include "../file_path_special.h" +#include "../msg_hash.h" +#include "../tasks/task_file_transfer.h" +#include "../tasks/tasks_internal.h" + +void print_buf_lines(file_list_t *list, char *buf, + const char *label, int buf_size, + enum msg_file_type type, bool append, bool extended) +{ + char c; + int i, j = 0; + char *line_start = buf; + + if (!buf || !buf_size) + { + menu_entries_append_enum(list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY), + msg_hash_to_str(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY), + MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY, + FILE_TYPE_NONE, 0, 0); + return; + } + + for (i = 0; i < buf_size; i++) + { + size_t ln; + const char *core_date = NULL; + const char *core_crc = NULL; + const char *core_pathname = NULL; + struct string_list *str_list = NULL; + + /* The end of the buffer, print the last bit */ + if (*(buf + i) == '\0') + break; + + if (*(buf + i) != '\n') + continue; + + /* Found a line ending, print the line and compute new line_start */ + + /* Save the next char */ + c = *(buf + i + 1); + /* replace with \0 */ + *(buf + i + 1) = '\0'; + + /* We need to strip the newline. */ + ln = strlen(line_start) - 1; + if (line_start[ln] == '\n') + line_start[ln] = '\0'; + + str_list = string_split(line_start, " "); + + if (str_list->elems[0].data) + core_date = str_list->elems[0].data; + if (str_list->elems[1].data) + core_crc = str_list->elems[1].data; + if (str_list->elems[2].data) + core_pathname = str_list->elems[2].data; + + (void)core_date; + (void)core_crc; + + if (extended) + { + if (append) + menu_entries_append_enum(list, core_pathname, "", + MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); + else + menu_entries_prepend(list, core_pathname, "", + MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); + } + else + { + if (append) + menu_entries_append_enum(list, line_start, label, + MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); + else + menu_entries_prepend(list, line_start, label, + MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0); + } + + switch (type) + { + case FILE_TYPE_DOWNLOAD_CORE: + { + settings_t *settings = config_get_ptr(); + + if (settings) + { + char display_name[255]; + char core_path[PATH_MAX_LENGTH]; + char *last = NULL; + + display_name[0] = core_path[0] = '\0'; + + fill_pathname_join_noext( + core_path, + settings->paths.path_libretro_info, + (extended && !string_is_empty(core_pathname)) + ? core_pathname : line_start, + sizeof(core_path)); + path_remove_extension(core_path); + + last = (char*)strrchr(core_path, '_'); + + if (!string_is_empty(last)) + { + if (string_is_not_equal_fast(last, "_libretro", 9)) + *last = '\0'; + } + + strlcat(core_path, + file_path_str(FILE_PATH_CORE_INFO_EXTENSION), + sizeof(core_path)); + + if ( + filestream_exists(core_path) + && core_info_get_display_name( + core_path, display_name, sizeof(display_name))) + file_list_set_alt_at_offset(list, j, display_name); + } + } + break; + default: + case FILE_TYPE_NONE: + break; + } + + j++; + + string_list_free(str_list); + + /* Restore the saved char */ + *(buf + i + 1) = c; + line_start = buf + i + 1; + } + + if (append) + file_list_sort_on_alt(list); + /* If the buffer was completely full, and didn't end + * with a newline, just ignore the partial last line. */ +} + +void cb_net_generic_subdir(void *task_data, void *user_data, const char *err) +{ +#ifdef HAVE_NETWORKING + char subdir_path[PATH_MAX_LENGTH]; + http_transfer_data_t *data = (http_transfer_data_t*)task_data; + file_transfer_t *state = (file_transfer_t*)user_data; + + subdir_path[0] = '\0'; + + if (!data || err) + goto finish; + + if (!string_is_empty(data->data)) + memcpy(subdir_path, data->data, data->len * sizeof(char)); + subdir_path[data->len] = '\0'; + +finish: + if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) + { + char parent_dir[PATH_MAX_LENGTH]; + + parent_dir[0] = '\0'; + + fill_pathname_parent_dir(parent_dir, + state->path, sizeof(parent_dir)); + + /*generic_action_ok_displaylist_push(parent_dir, NULL, + subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/ + } + + if (data) + { + if (data->data) + free(data->data); + free(data); + } + + if (user_data) + free(user_data); +#endif +} + +void cb_net_generic(void *task_data, void *user_data, const char *err) +{ +#ifdef HAVE_NETWORKING + bool refresh = false; + http_transfer_data_t *data = (http_transfer_data_t*)task_data; + file_transfer_t *state = (file_transfer_t*)user_data; + menu_handle_t *menu = NULL; + + if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) + goto finish; + + if (menu->core_buf) + free(menu->core_buf); + + menu->core_buf = NULL; + menu->core_len = 0; + + if (!data || err) + goto finish; + + menu->core_buf = (char*)malloc((data->len+1) * sizeof(char)); + + if (!menu->core_buf) + goto finish; + + if (!string_is_empty(data->data)) + memcpy(menu->core_buf, data->data, data->len * sizeof(char)); + menu->core_buf[data->len] = '\0'; + menu->core_len = data->len; + +finish: + refresh = true; + menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh); + + if (data) + { + if (data->data) + free(data->data); + free(data); + } + + if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL))) + { + char *parent_dir = (char*)malloc(PATH_MAX_LENGTH * sizeof(char)); + file_transfer_t *transf = NULL; + + parent_dir[0] = '\0'; + + fill_pathname_parent_dir(parent_dir, + state->path, PATH_MAX_LENGTH * sizeof(char)); + strlcat(parent_dir, + file_path_str(FILE_PATH_INDEX_DIRS_URL), + PATH_MAX_LENGTH * sizeof(char)); + + transf = (file_transfer_t*)malloc(sizeof(*transf)); + + transf->enum_idx = MSG_UNKNOWN; + strlcpy(transf->path, parent_dir, sizeof(transf->path)); + + task_push_http_transfer(parent_dir, true, + "index_dirs", cb_net_generic_subdir, transf); + + free(parent_dir); + } + + if (state) + free(state); +#endif +} diff --git a/menu/menu_networking.h b/menu/menu_networking.h index d88c54563a..042af4dd50 100644 --- a/menu/menu_networking.h +++ b/menu/menu_networking.h @@ -1,43 +1,43 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2016-2017 - Brad Parker - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef _MENU_NETWORKING_H -#define _MENU_NETWORKING_H - -#include - -#include -#include - -#include - -#include "../msg_hash.h" - -RETRO_BEGIN_DECLS - -void print_buf_lines(file_list_t *list, char *buf, - const char *label, int buf_size, - enum msg_file_type type, bool append, bool extended); - -void cb_net_generic_subdir(void *task_data, void *user_data, - const char *err); - -void cb_net_generic(void *task_data, void *user_data, const char *err); - -RETRO_END_DECLS - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2017 - Daniel De Matteis + * Copyright (C) 2016-2017 - Brad Parker + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef _MENU_NETWORKING_H +#define _MENU_NETWORKING_H + +#include + +#include +#include + +#include + +#include "../msg_hash.h" + +RETRO_BEGIN_DECLS + +void print_buf_lines(file_list_t *list, char *buf, + const char *label, int buf_size, + enum msg_file_type type, bool append, bool extended); + +void cb_net_generic_subdir(void *task_data, void *user_data, + const char *err); + +void cb_net_generic(void *task_data, void *user_data, const char *err); + +RETRO_END_DECLS + +#endif diff --git a/midi/drivers/winmm_midi.c b/midi/drivers/winmm_midi.c index 94f7937a3d..0699accb9c 100644 --- a/midi/drivers/winmm_midi.c +++ b/midi/drivers/winmm_midi.c @@ -1,630 +1,630 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2018 The RetroArch team - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include - -#include -#include -#include -#include - -#include "../midi_driver.h" - -#define WINMM_MIDI_BUF_CNT 3 -#define WINMM_MIDI_BUF_LEN 1024 - -typedef struct -{ - MIDIHDR header; - DWORD data[WINMM_MIDI_BUF_LEN]; -} winmm_midi_buffer_t; - -typedef struct -{ - uint8_t data[WINMM_MIDI_BUF_LEN * 4]; - midi_event_t events[WINMM_MIDI_BUF_LEN]; - int rd_idx; - int wr_idx; -} winmm_midi_queue_t; - -typedef struct -{ - HMIDIIN in_dev; - HMIDISTRM out_dev; - winmm_midi_queue_t in_queue; - winmm_midi_buffer_t out_bufs[WINMM_MIDI_BUF_CNT]; - int out_buf_idx; - double tick_dur; -} winmm_midi_t; - -static void winmm_midi_free(void *p); - -static bool winmm_midi_queue_read(winmm_midi_queue_t *q, midi_event_t *ev) -{ - unsigned i; - midi_event_t *src_ev = NULL; - - if (q->rd_idx == q->wr_idx) - return false; - - if (ev->data_size < q->events[q->rd_idx].data_size) - { -#ifdef DEBUG - RARCH_ERR("[MIDI]: Input queue read failed (event data too small).\n"); -#endif - return false; - } - - src_ev = &q->events[q->rd_idx]; - - for (i = 0; i < src_ev->data_size; ++i) - ev->data[i] = src_ev->data[i]; - - ev->data_size = src_ev->data_size; - ev->delta_time = src_ev->delta_time; - - if (q->rd_idx + 1 == WINMM_MIDI_BUF_LEN) - q->rd_idx = 0; - else - ++q->rd_idx; - - return true; -} - -static bool winmm_midi_queue_write(winmm_midi_queue_t *q, const midi_event_t *ev) -{ - int wr_avail; - unsigned i; - int rd_idx = q->rd_idx; - midi_event_t *dest_ev = NULL; - - if (q->wr_idx >= rd_idx) - wr_avail = WINMM_MIDI_BUF_LEN - q->wr_idx + rd_idx; - else - wr_avail = rd_idx - q->wr_idx - 1; - - if (wr_avail < 1) - { -#ifdef DEBUG - RARCH_ERR("[MIDI]: Input queue overflow.\n"); -#endif - return false; - } - - dest_ev = &q->events[q->wr_idx]; - if (ev->data_size > 4) - { -#ifdef DEBUG - RARCH_ERR("[MIDI]: Input queue write failed (event too big).\n"); -#endif - return false; - } - - for (i = 0; i < ev->data_size; ++i) - dest_ev->data[i] = ev->data[i]; - - dest_ev->data_size = ev->data_size; - dest_ev->delta_time = ev->delta_time; - - if (q->wr_idx + 1 == WINMM_MIDI_BUF_LEN) - q->wr_idx = 0; - else - ++q->wr_idx; - - return true; -} - -static void winmm_midi_queue_init(winmm_midi_queue_t *q) -{ - unsigned i, j; - - for (i = j = 0; i < WINMM_MIDI_BUF_LEN; ++i, j += 4) - { - q->events[i].data = &q->data[j]; - q->events[i].delta_time = 0; - } - - q->rd_idx = 0; - q->wr_idx = 0; -} - -static void CALLBACK winmm_midi_input_callback(HMIDIIN dev, UINT msg, - DWORD_PTR q, DWORD_PTR par1, DWORD_PTR par2) -{ - uint8_t data[3]; - midi_event_t event; - winmm_midi_queue_t *queue = (winmm_midi_queue_t*)q; - - (void)dev; - - if (msg == MIM_OPEN) - winmm_midi_queue_init(queue); - else if (msg == MIM_DATA) - { - data[0] = (uint8_t)(par1 & 0xFF); - data[1] = (uint8_t)((par1 >> 8) & 0xFF); - data[2] = (uint8_t)((par1 >> 16) & 0xFF); - - event.data = data; - event.data_size = midi_driver_get_event_size(data[0]); - event.delta_time = 0; - - if (!winmm_midi_queue_write(queue, &event)) - { -#ifdef DEBUG - RARCH_ERR("[MIDI]: Input event dropped.\n"); -#endif - } - } - else if(msg == MIM_LONGDATA) - { -#ifdef DEBUG - RARCH_WARN("[MIDI]: SysEx input not implemented, event dropped.\n"); -#endif - } -} - -static HMIDIIN winmm_midi_open_input_device(const char *dev_name, - winmm_midi_queue_t *queue) -{ - unsigned i; - UINT dev_count = midiInGetNumDevs(); - HMIDIIN dev = NULL; - - for (i = 0; i < dev_count; ++i) - { - MIDIINCAPSA caps; - MMRESULT mmr = midiInGetDevCapsA((UINT)i, &caps, sizeof(caps)); - if (mmr == MMSYSERR_NOERROR) - { - if (string_is_equal(caps.szPname, dev_name)) - { - mmr = midiInOpen(&dev, (UINT)i, (DWORD_PTR)winmm_midi_input_callback, - (DWORD_PTR)queue, CALLBACK_FUNCTION); - if (mmr != MMSYSERR_NOERROR) - RARCH_ERR("[MIDI]: midiInOpen failed with error %d.\n", mmr); - break; - } - } - else - RARCH_WARN("[MIDI]: midiInGetDevCapsA failed with error %d.\n", mmr); - } - - return dev; -} - -static HMIDISTRM winmm_midi_open_output_device(const char *dev_name) -{ - unsigned i; - UINT dev_count = midiOutGetNumDevs(); - HMIDISTRM dev = NULL; - - for (i = 0; i < dev_count; ++i) - { - MIDIOUTCAPSA caps; - MMRESULT mmr = midiOutGetDevCapsA(i, &caps, sizeof(caps)); - if (mmr == MMSYSERR_NOERROR) - { - if (string_is_equal(caps.szPname, dev_name)) - { - mmr = midiStreamOpen(&dev, &i, 1, 0, 0, CALLBACK_NULL); - if (mmr != MMSYSERR_NOERROR) - RARCH_ERR("[MIDI]: midiStreamOpen failed with error %d.\n", mmr); - break; - } - } - else - RARCH_WARN("[MIDI]: midiOutGetDevCapsA failed with error %d.\n", mmr); - } - - return dev; -} - -static bool winmm_midi_init_clock(HMIDISTRM out_dev, double *tick_dur) -{ - MIDIPROPTIMEDIV division; - MIDIPROPTEMPO tempo; - MMRESULT mmr; - - tempo.cbStruct = sizeof(tempo); - mmr = midiStreamProperty(out_dev, (LPBYTE)&tempo, - MIDIPROP_GET | MIDIPROP_TEMPO); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: Current tempo unavailable (error %d).\n", mmr); - return false; - } - - division.dwTimeDiv = 3; - while (tempo.dwTempo / division.dwTimeDiv > 320) - division.dwTimeDiv *= 2; - - division.cbStruct = sizeof(division); - mmr = midiStreamProperty(out_dev, (LPBYTE)&division, - MIDIPROP_SET | MIDIPROP_TIMEDIV); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: Time division change failed (error %d).\n", mmr); - return false; - } - - *tick_dur = (double)tempo.dwTempo / (double)division.dwTimeDiv; -#ifdef DEBUG - RARCH_LOG("[MIDI]: Tick duration %f us.\n", *tick_dur); -#endif - - return true; -} - -static bool winmm_midi_init_output_buffers(HMIDISTRM dev, - winmm_midi_buffer_t *bufs) -{ - unsigned i; - - for (i = 0; i < WINMM_MIDI_BUF_CNT; ++i) - { - MMRESULT mmr; - - bufs[i].header.dwBufferLength = sizeof(DWORD) * WINMM_MIDI_BUF_LEN; - bufs[i].header.dwBytesRecorded = 0; - bufs[i].header.dwFlags = 0; - bufs[i].header.lpData = (LPSTR)bufs[i].data; - - mmr = midiOutPrepareHeader((HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiOutPrepareHeader failed with error %d.\n", mmr); - - while (--i <= 0) - midiOutUnprepareHeader((HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); - - return false; - } - } - - return true; -} - -static void winmm_midi_free_output_buffers(HMIDISTRM dev, winmm_midi_buffer_t *bufs) -{ - unsigned i; - - for (i = 0; i < WINMM_MIDI_BUF_CNT; ++i) - { - MMRESULT mmr = midiOutUnprepareHeader( - (HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); - if (mmr != MMSYSERR_NOERROR) - RARCH_ERR("[MIDI]: midiOutUnprepareHeader failed with error %d.\n", mmr); - } -} - -static bool winmm_midi_write_short_event(winmm_midi_buffer_t *buf, - const uint8_t *data, size_t data_size, DWORD delta_time) -{ - DWORD i = buf->header.dwBytesRecorded / sizeof(DWORD); - - if (buf->header.dwBytesRecorded + sizeof(DWORD) * 3 > - sizeof(DWORD) * WINMM_MIDI_BUF_LEN) - return false; - - buf->data[i++] = delta_time; - buf->data[i++] = 0; - buf->data[i] = MEVT_F_SHORT << 24; - if (data_size == 0) - buf->data[i] |= MEVT_NOP; - else - { - buf->data[i] |= MEVT_SHORTMSG << 24 | data[0]; - if (data_size > 1) - buf->data[i] |= data[1] << 8; - if (data_size > 2) - buf->data[i] |= data[2] << 16; - } - - buf->header.dwBytesRecorded += sizeof(DWORD) * 3; - - return true; -} - -static bool winmm_midi_write_long_event(winmm_midi_buffer_t *buf, - const uint8_t *data, size_t data_size, DWORD delta_time) -{ - DWORD i = buf->header.dwBytesRecorded / sizeof(DWORD); - - if (buf->header.dwBytesRecorded + sizeof(DWORD) * 3 + data_size > - sizeof(DWORD) * WINMM_MIDI_BUF_LEN) - return false; - - buf->data[i++] = delta_time; - buf->data[i++] = 0; - buf->data[i++] = MEVT_F_LONG << 24 | MEVT_LONGMSG << 24 | data_size; - - memcpy(&buf->data[i], data, data_size); - buf->header.dwBytesRecorded += sizeof(DWORD) * 3 + data_size; - - return true; -} - -static bool winmm_midi_get_avail_inputs(struct string_list *inputs) -{ - unsigned i; - union string_list_elem_attr attr = {0}; - UINT dev_count = midiInGetNumDevs(); - - for (i = 0; i < dev_count; ++i) - { - MIDIINCAPSA caps; - MMRESULT mmr = midiInGetDevCapsA((UINT)i, &caps, sizeof(caps)); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiInGetDevCapsA failed with error %d.\n", mmr); - return false; - } - - if (!string_list_append(inputs, caps.szPname, attr)) - { - RARCH_ERR("[MIDI]: string_list_append failed.\n"); - return false; - } - } - - return true; -} - -static bool winmm_midi_get_avail_outputs(struct string_list *outputs) -{ - unsigned i; - union string_list_elem_attr attr = {0}; - UINT dev_count = midiOutGetNumDevs(); - - for (i = 0; i < dev_count; ++i) - { - MIDIOUTCAPSA caps; - MMRESULT mmr = midiOutGetDevCapsA((UINT)i, &caps, sizeof(caps)); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiOutGetDevCapsA failed with error %d.\n", mmr); - return false; - } - - if (!string_list_append(outputs, caps.szPname, attr)) - { - RARCH_ERR("[MIDI]: string_list_append failed.\n"); - return false; - } - } - - return true; -} - -static void *winmm_midi_init(const char *input, const char *output) -{ - MMRESULT mmr; - bool err = false; - winmm_midi_t *d = (winmm_midi_t*)calloc(sizeof(winmm_midi_t), 1); - - if (!d) - { - RARCH_ERR("[MIDI]: Out of memory.\n"); - return NULL; - } - - if (input) - { - d->in_dev = winmm_midi_open_input_device(input, &d->in_queue); - if (!d->in_dev) - err = true; - else - { - mmr = midiInStart(d->in_dev); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiInStart failed with error %d.\n", mmr); - err = true; - } - } - } - - if (output) - { - d->out_dev = winmm_midi_open_output_device(output); - if (!d->out_dev) - err = true; - else if (!winmm_midi_init_clock(d->out_dev, &d->tick_dur)) - err = true; - else if (!winmm_midi_init_output_buffers(d->out_dev, d->out_bufs)) - err = true; - else - { - mmr = midiStreamRestart(d->out_dev); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiStreamRestart failed with error %d.\n", mmr); - err = true; - } - } - } - - if (err) - { - winmm_midi_free(d); - return NULL; - } - - return d; -} - -static void winmm_midi_free(void *p) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - - if (!d) - return; - - if (d->in_dev) - { - midiInStop(d->in_dev); - midiInClose(d->in_dev); - } - - if (d->out_dev) - { - midiStreamStop(d->out_dev); - winmm_midi_free_output_buffers(d->out_dev, d->out_bufs); - midiStreamClose(d->out_dev); - } - - free(d); -} - -static bool winmm_midi_set_input(void *p, const char *input) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - HMIDIIN new_dev = NULL; - - if (input) - { - new_dev = winmm_midi_open_input_device(input, &d->in_queue); - if (!new_dev) - return false; - } - - if (d->in_dev) - { - midiInStop(d->in_dev); - midiInClose(d->in_dev); - } - - d->in_dev = new_dev; - if (d->in_dev) - { - MMRESULT mmr = midiInStart(d->in_dev); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiInStart failed with error %d.\n", mmr); - return false; - } - } - - return true; -} - -static bool winmm_midi_set_output(void *p, const char *output) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - HMIDISTRM new_dev = NULL; - - if (output) - { - new_dev = winmm_midi_open_output_device(output); - if (!new_dev) - return false; - } - - if (d->out_dev) - { - midiStreamStop(d->out_dev); - winmm_midi_free_output_buffers(d->out_dev, d->out_bufs); - midiStreamClose(d->out_dev); - } - - d->out_dev = new_dev; - if (d->out_dev) - { - MMRESULT mmr; - if (!winmm_midi_init_output_buffers(d->out_dev, d->out_bufs)) - return false; - - d->out_buf_idx = 0; - - mmr = midiStreamRestart(d->out_dev); - if (mmr != MMSYSERR_NOERROR) - { - RARCH_ERR("[MIDI]: midiStreamRestart failed with error %d.\n", mmr); - return false; - } - } - - return true; -} - -static bool winmm_midi_read(void *p, midi_event_t *event) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - - return winmm_midi_queue_read(&d->in_queue, event); -} - -static bool winmm_midi_write(void *p, const midi_event_t *event) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - winmm_midi_buffer_t *buf = &d->out_bufs[d->out_buf_idx]; - DWORD delta_time; - - if (buf->header.dwFlags & MHDR_INQUEUE) - return false; - - if (buf->header.dwFlags & MHDR_DONE) - { - buf->header.dwBytesRecorded = 0; - buf->header.dwFlags ^= MHDR_DONE; - } - - delta_time = (DWORD)((double)event->delta_time / d->tick_dur); - if (event->data_size < 4) - return winmm_midi_write_short_event(buf, event->data, - event->data_size, delta_time); - - return winmm_midi_write_long_event(buf, event->data, - event->data_size, delta_time); -} - -static bool winmm_midi_flush(void *p) -{ - winmm_midi_t *d = (winmm_midi_t*)p; - winmm_midi_buffer_t *buf = &d->out_bufs[d->out_buf_idx]; - - if (buf->header.dwBytesRecorded) - { - MMRESULT mmr = midiStreamOut( - d->out_dev, &buf->header, sizeof(buf->header)); - - if (mmr != MMSYSERR_NOERROR) - { -#ifdef DEBUG - RARCH_ERR("[MIDI]: midiStreamOut failed with error %d.\n", mmr); -#endif - return false; - } - - if (++d->out_buf_idx == WINMM_MIDI_BUF_CNT) - d->out_buf_idx = 0; - } - - return true; -} - -midi_driver_t midi_winmm = { - "winmm", - winmm_midi_get_avail_inputs, - winmm_midi_get_avail_outputs, - winmm_midi_init, - winmm_midi_free, - winmm_midi_set_input, - winmm_midi_set_output, - winmm_midi_read, - winmm_midi_write, - winmm_midi_flush -}; +/* RetroArch - A frontend for libretro. + * Copyright (C) 2018 The RetroArch team + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include + +#include +#include +#include +#include + +#include "../midi_driver.h" + +#define WINMM_MIDI_BUF_CNT 3 +#define WINMM_MIDI_BUF_LEN 1024 + +typedef struct +{ + MIDIHDR header; + DWORD data[WINMM_MIDI_BUF_LEN]; +} winmm_midi_buffer_t; + +typedef struct +{ + uint8_t data[WINMM_MIDI_BUF_LEN * 4]; + midi_event_t events[WINMM_MIDI_BUF_LEN]; + int rd_idx; + int wr_idx; +} winmm_midi_queue_t; + +typedef struct +{ + HMIDIIN in_dev; + HMIDISTRM out_dev; + winmm_midi_queue_t in_queue; + winmm_midi_buffer_t out_bufs[WINMM_MIDI_BUF_CNT]; + int out_buf_idx; + double tick_dur; +} winmm_midi_t; + +static void winmm_midi_free(void *p); + +static bool winmm_midi_queue_read(winmm_midi_queue_t *q, midi_event_t *ev) +{ + unsigned i; + midi_event_t *src_ev = NULL; + + if (q->rd_idx == q->wr_idx) + return false; + + if (ev->data_size < q->events[q->rd_idx].data_size) + { +#ifdef DEBUG + RARCH_ERR("[MIDI]: Input queue read failed (event data too small).\n"); +#endif + return false; + } + + src_ev = &q->events[q->rd_idx]; + + for (i = 0; i < src_ev->data_size; ++i) + ev->data[i] = src_ev->data[i]; + + ev->data_size = src_ev->data_size; + ev->delta_time = src_ev->delta_time; + + if (q->rd_idx + 1 == WINMM_MIDI_BUF_LEN) + q->rd_idx = 0; + else + ++q->rd_idx; + + return true; +} + +static bool winmm_midi_queue_write(winmm_midi_queue_t *q, const midi_event_t *ev) +{ + int wr_avail; + unsigned i; + int rd_idx = q->rd_idx; + midi_event_t *dest_ev = NULL; + + if (q->wr_idx >= rd_idx) + wr_avail = WINMM_MIDI_BUF_LEN - q->wr_idx + rd_idx; + else + wr_avail = rd_idx - q->wr_idx - 1; + + if (wr_avail < 1) + { +#ifdef DEBUG + RARCH_ERR("[MIDI]: Input queue overflow.\n"); +#endif + return false; + } + + dest_ev = &q->events[q->wr_idx]; + if (ev->data_size > 4) + { +#ifdef DEBUG + RARCH_ERR("[MIDI]: Input queue write failed (event too big).\n"); +#endif + return false; + } + + for (i = 0; i < ev->data_size; ++i) + dest_ev->data[i] = ev->data[i]; + + dest_ev->data_size = ev->data_size; + dest_ev->delta_time = ev->delta_time; + + if (q->wr_idx + 1 == WINMM_MIDI_BUF_LEN) + q->wr_idx = 0; + else + ++q->wr_idx; + + return true; +} + +static void winmm_midi_queue_init(winmm_midi_queue_t *q) +{ + unsigned i, j; + + for (i = j = 0; i < WINMM_MIDI_BUF_LEN; ++i, j += 4) + { + q->events[i].data = &q->data[j]; + q->events[i].delta_time = 0; + } + + q->rd_idx = 0; + q->wr_idx = 0; +} + +static void CALLBACK winmm_midi_input_callback(HMIDIIN dev, UINT msg, + DWORD_PTR q, DWORD_PTR par1, DWORD_PTR par2) +{ + uint8_t data[3]; + midi_event_t event; + winmm_midi_queue_t *queue = (winmm_midi_queue_t*)q; + + (void)dev; + + if (msg == MIM_OPEN) + winmm_midi_queue_init(queue); + else if (msg == MIM_DATA) + { + data[0] = (uint8_t)(par1 & 0xFF); + data[1] = (uint8_t)((par1 >> 8) & 0xFF); + data[2] = (uint8_t)((par1 >> 16) & 0xFF); + + event.data = data; + event.data_size = midi_driver_get_event_size(data[0]); + event.delta_time = 0; + + if (!winmm_midi_queue_write(queue, &event)) + { +#ifdef DEBUG + RARCH_ERR("[MIDI]: Input event dropped.\n"); +#endif + } + } + else if(msg == MIM_LONGDATA) + { +#ifdef DEBUG + RARCH_WARN("[MIDI]: SysEx input not implemented, event dropped.\n"); +#endif + } +} + +static HMIDIIN winmm_midi_open_input_device(const char *dev_name, + winmm_midi_queue_t *queue) +{ + unsigned i; + UINT dev_count = midiInGetNumDevs(); + HMIDIIN dev = NULL; + + for (i = 0; i < dev_count; ++i) + { + MIDIINCAPSA caps; + MMRESULT mmr = midiInGetDevCapsA((UINT)i, &caps, sizeof(caps)); + if (mmr == MMSYSERR_NOERROR) + { + if (string_is_equal(caps.szPname, dev_name)) + { + mmr = midiInOpen(&dev, (UINT)i, (DWORD_PTR)winmm_midi_input_callback, + (DWORD_PTR)queue, CALLBACK_FUNCTION); + if (mmr != MMSYSERR_NOERROR) + RARCH_ERR("[MIDI]: midiInOpen failed with error %d.\n", mmr); + break; + } + } + else + RARCH_WARN("[MIDI]: midiInGetDevCapsA failed with error %d.\n", mmr); + } + + return dev; +} + +static HMIDISTRM winmm_midi_open_output_device(const char *dev_name) +{ + unsigned i; + UINT dev_count = midiOutGetNumDevs(); + HMIDISTRM dev = NULL; + + for (i = 0; i < dev_count; ++i) + { + MIDIOUTCAPSA caps; + MMRESULT mmr = midiOutGetDevCapsA(i, &caps, sizeof(caps)); + if (mmr == MMSYSERR_NOERROR) + { + if (string_is_equal(caps.szPname, dev_name)) + { + mmr = midiStreamOpen(&dev, &i, 1, 0, 0, CALLBACK_NULL); + if (mmr != MMSYSERR_NOERROR) + RARCH_ERR("[MIDI]: midiStreamOpen failed with error %d.\n", mmr); + break; + } + } + else + RARCH_WARN("[MIDI]: midiOutGetDevCapsA failed with error %d.\n", mmr); + } + + return dev; +} + +static bool winmm_midi_init_clock(HMIDISTRM out_dev, double *tick_dur) +{ + MIDIPROPTIMEDIV division; + MIDIPROPTEMPO tempo; + MMRESULT mmr; + + tempo.cbStruct = sizeof(tempo); + mmr = midiStreamProperty(out_dev, (LPBYTE)&tempo, + MIDIPROP_GET | MIDIPROP_TEMPO); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: Current tempo unavailable (error %d).\n", mmr); + return false; + } + + division.dwTimeDiv = 3; + while (tempo.dwTempo / division.dwTimeDiv > 320) + division.dwTimeDiv *= 2; + + division.cbStruct = sizeof(division); + mmr = midiStreamProperty(out_dev, (LPBYTE)&division, + MIDIPROP_SET | MIDIPROP_TIMEDIV); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: Time division change failed (error %d).\n", mmr); + return false; + } + + *tick_dur = (double)tempo.dwTempo / (double)division.dwTimeDiv; +#ifdef DEBUG + RARCH_LOG("[MIDI]: Tick duration %f us.\n", *tick_dur); +#endif + + return true; +} + +static bool winmm_midi_init_output_buffers(HMIDISTRM dev, + winmm_midi_buffer_t *bufs) +{ + unsigned i; + + for (i = 0; i < WINMM_MIDI_BUF_CNT; ++i) + { + MMRESULT mmr; + + bufs[i].header.dwBufferLength = sizeof(DWORD) * WINMM_MIDI_BUF_LEN; + bufs[i].header.dwBytesRecorded = 0; + bufs[i].header.dwFlags = 0; + bufs[i].header.lpData = (LPSTR)bufs[i].data; + + mmr = midiOutPrepareHeader((HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiOutPrepareHeader failed with error %d.\n", mmr); + + while (--i <= 0) + midiOutUnprepareHeader((HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); + + return false; + } + } + + return true; +} + +static void winmm_midi_free_output_buffers(HMIDISTRM dev, winmm_midi_buffer_t *bufs) +{ + unsigned i; + + for (i = 0; i < WINMM_MIDI_BUF_CNT; ++i) + { + MMRESULT mmr = midiOutUnprepareHeader( + (HMIDIOUT)dev, &bufs[i].header, sizeof(MIDIHDR)); + if (mmr != MMSYSERR_NOERROR) + RARCH_ERR("[MIDI]: midiOutUnprepareHeader failed with error %d.\n", mmr); + } +} + +static bool winmm_midi_write_short_event(winmm_midi_buffer_t *buf, + const uint8_t *data, size_t data_size, DWORD delta_time) +{ + DWORD i = buf->header.dwBytesRecorded / sizeof(DWORD); + + if (buf->header.dwBytesRecorded + sizeof(DWORD) * 3 > + sizeof(DWORD) * WINMM_MIDI_BUF_LEN) + return false; + + buf->data[i++] = delta_time; + buf->data[i++] = 0; + buf->data[i] = MEVT_F_SHORT << 24; + if (data_size == 0) + buf->data[i] |= MEVT_NOP; + else + { + buf->data[i] |= MEVT_SHORTMSG << 24 | data[0]; + if (data_size > 1) + buf->data[i] |= data[1] << 8; + if (data_size > 2) + buf->data[i] |= data[2] << 16; + } + + buf->header.dwBytesRecorded += sizeof(DWORD) * 3; + + return true; +} + +static bool winmm_midi_write_long_event(winmm_midi_buffer_t *buf, + const uint8_t *data, size_t data_size, DWORD delta_time) +{ + DWORD i = buf->header.dwBytesRecorded / sizeof(DWORD); + + if (buf->header.dwBytesRecorded + sizeof(DWORD) * 3 + data_size > + sizeof(DWORD) * WINMM_MIDI_BUF_LEN) + return false; + + buf->data[i++] = delta_time; + buf->data[i++] = 0; + buf->data[i++] = MEVT_F_LONG << 24 | MEVT_LONGMSG << 24 | data_size; + + memcpy(&buf->data[i], data, data_size); + buf->header.dwBytesRecorded += sizeof(DWORD) * 3 + data_size; + + return true; +} + +static bool winmm_midi_get_avail_inputs(struct string_list *inputs) +{ + unsigned i; + union string_list_elem_attr attr = {0}; + UINT dev_count = midiInGetNumDevs(); + + for (i = 0; i < dev_count; ++i) + { + MIDIINCAPSA caps; + MMRESULT mmr = midiInGetDevCapsA((UINT)i, &caps, sizeof(caps)); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiInGetDevCapsA failed with error %d.\n", mmr); + return false; + } + + if (!string_list_append(inputs, caps.szPname, attr)) + { + RARCH_ERR("[MIDI]: string_list_append failed.\n"); + return false; + } + } + + return true; +} + +static bool winmm_midi_get_avail_outputs(struct string_list *outputs) +{ + unsigned i; + union string_list_elem_attr attr = {0}; + UINT dev_count = midiOutGetNumDevs(); + + for (i = 0; i < dev_count; ++i) + { + MIDIOUTCAPSA caps; + MMRESULT mmr = midiOutGetDevCapsA((UINT)i, &caps, sizeof(caps)); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiOutGetDevCapsA failed with error %d.\n", mmr); + return false; + } + + if (!string_list_append(outputs, caps.szPname, attr)) + { + RARCH_ERR("[MIDI]: string_list_append failed.\n"); + return false; + } + } + + return true; +} + +static void *winmm_midi_init(const char *input, const char *output) +{ + MMRESULT mmr; + bool err = false; + winmm_midi_t *d = (winmm_midi_t*)calloc(sizeof(winmm_midi_t), 1); + + if (!d) + { + RARCH_ERR("[MIDI]: Out of memory.\n"); + return NULL; + } + + if (input) + { + d->in_dev = winmm_midi_open_input_device(input, &d->in_queue); + if (!d->in_dev) + err = true; + else + { + mmr = midiInStart(d->in_dev); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiInStart failed with error %d.\n", mmr); + err = true; + } + } + } + + if (output) + { + d->out_dev = winmm_midi_open_output_device(output); + if (!d->out_dev) + err = true; + else if (!winmm_midi_init_clock(d->out_dev, &d->tick_dur)) + err = true; + else if (!winmm_midi_init_output_buffers(d->out_dev, d->out_bufs)) + err = true; + else + { + mmr = midiStreamRestart(d->out_dev); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiStreamRestart failed with error %d.\n", mmr); + err = true; + } + } + } + + if (err) + { + winmm_midi_free(d); + return NULL; + } + + return d; +} + +static void winmm_midi_free(void *p) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + + if (!d) + return; + + if (d->in_dev) + { + midiInStop(d->in_dev); + midiInClose(d->in_dev); + } + + if (d->out_dev) + { + midiStreamStop(d->out_dev); + winmm_midi_free_output_buffers(d->out_dev, d->out_bufs); + midiStreamClose(d->out_dev); + } + + free(d); +} + +static bool winmm_midi_set_input(void *p, const char *input) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + HMIDIIN new_dev = NULL; + + if (input) + { + new_dev = winmm_midi_open_input_device(input, &d->in_queue); + if (!new_dev) + return false; + } + + if (d->in_dev) + { + midiInStop(d->in_dev); + midiInClose(d->in_dev); + } + + d->in_dev = new_dev; + if (d->in_dev) + { + MMRESULT mmr = midiInStart(d->in_dev); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiInStart failed with error %d.\n", mmr); + return false; + } + } + + return true; +} + +static bool winmm_midi_set_output(void *p, const char *output) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + HMIDISTRM new_dev = NULL; + + if (output) + { + new_dev = winmm_midi_open_output_device(output); + if (!new_dev) + return false; + } + + if (d->out_dev) + { + midiStreamStop(d->out_dev); + winmm_midi_free_output_buffers(d->out_dev, d->out_bufs); + midiStreamClose(d->out_dev); + } + + d->out_dev = new_dev; + if (d->out_dev) + { + MMRESULT mmr; + if (!winmm_midi_init_output_buffers(d->out_dev, d->out_bufs)) + return false; + + d->out_buf_idx = 0; + + mmr = midiStreamRestart(d->out_dev); + if (mmr != MMSYSERR_NOERROR) + { + RARCH_ERR("[MIDI]: midiStreamRestart failed with error %d.\n", mmr); + return false; + } + } + + return true; +} + +static bool winmm_midi_read(void *p, midi_event_t *event) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + + return winmm_midi_queue_read(&d->in_queue, event); +} + +static bool winmm_midi_write(void *p, const midi_event_t *event) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + winmm_midi_buffer_t *buf = &d->out_bufs[d->out_buf_idx]; + DWORD delta_time; + + if (buf->header.dwFlags & MHDR_INQUEUE) + return false; + + if (buf->header.dwFlags & MHDR_DONE) + { + buf->header.dwBytesRecorded = 0; + buf->header.dwFlags ^= MHDR_DONE; + } + + delta_time = (DWORD)((double)event->delta_time / d->tick_dur); + if (event->data_size < 4) + return winmm_midi_write_short_event(buf, event->data, + event->data_size, delta_time); + + return winmm_midi_write_long_event(buf, event->data, + event->data_size, delta_time); +} + +static bool winmm_midi_flush(void *p) +{ + winmm_midi_t *d = (winmm_midi_t*)p; + winmm_midi_buffer_t *buf = &d->out_bufs[d->out_buf_idx]; + + if (buf->header.dwBytesRecorded) + { + MMRESULT mmr = midiStreamOut( + d->out_dev, &buf->header, sizeof(buf->header)); + + if (mmr != MMSYSERR_NOERROR) + { +#ifdef DEBUG + RARCH_ERR("[MIDI]: midiStreamOut failed with error %d.\n", mmr); +#endif + return false; + } + + if (++d->out_buf_idx == WINMM_MIDI_BUF_CNT) + d->out_buf_idx = 0; + } + + return true; +} + +midi_driver_t midi_winmm = { + "winmm", + winmm_midi_get_avail_inputs, + winmm_midi_get_avail_outputs, + winmm_midi_init, + winmm_midi_free, + winmm_midi_set_input, + winmm_midi_set_output, + winmm_midi_read, + winmm_midi_write, + winmm_midi_flush +}; diff --git a/network/httpserver/handle_form.inl b/network/httpserver/handle_form.inl index f121f27333..4465076ba4 100644 --- a/network/httpserver/handle_form.inl +++ b/network/httpserver/handle_form.inl @@ -19,7 +19,6 @@ * THE SOFTWARE. */ - static int url_encoded_field_found(const struct mg_connection *conn, const char *key, @@ -80,7 +79,6 @@ struct mg_form_data_handler *fdh) return ret; } - static int url_encoded_field_get(const struct mg_connection *conn, const char *key, @@ -114,7 +112,6 @@ struct mg_form_data_handler *fdh) fdh->user_data); } - static int field_stored(const struct mg_connection *conn, const char *path, @@ -128,7 +125,6 @@ struct mg_form_data_handler *fdh) return fdh->field_store(path, file_size, fdh->user_data); } - static const char * search_boundary(const char *buf, size_t buf_len, @@ -150,7 +146,6 @@ search_boundary(const char *buf, return NULL; } - int mg_handle_form_request(struct mg_connection *conn, struct mg_form_data_handler *fdh) diff --git a/network/netplay/README b/network/netplay/README index 2d3aa8a41d..1c9b04aa51 100644 --- a/network/netplay/README +++ b/network/netplay/README @@ -128,10 +128,8 @@ For the server: 7) Receive INFO 8) Send SYNC - * Guarantee not actually a guarantee. - Netplay's command format Netplay commands consist of a 32-bit command identifier, followed by a 32-bit @@ -358,7 +356,6 @@ Unused Command: CFG_ACK Unused - Input types Each input device uses a number of words fixed by the type of device. When diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c index f8400e5d89..708b9e4a78 100644 --- a/network/netplay/netplay_handshake.c +++ b/network/netplay/netplay_handshake.c @@ -586,10 +586,10 @@ bool netplay_handshake_sync(netplay_t *netplay, + mem_info.size); cmd[2] = htonl(netplay->self_frame_count); client_num = (uint32_t)(connection - netplay->connections + 1); - + if (netplay->local_paused || netplay->remote_paused) client_num |= NETPLAY_CMD_SYNC_BIT_PAUSED; - + cmd[3] = htonl(client_num); if (!netplay_send(&connection->send_packet_buffer, connection->fd, cmd, diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c index c513a26519..0c488bccf1 100644 --- a/network/netplay/netplay_io.c +++ b/network/netplay/netplay_io.c @@ -183,7 +183,7 @@ void netplay_delayed_state_change(netplay_t *netplay) { uint32_t client_num = (uint32_t)(i + 1); struct netplay_connection *connection = &netplay->connections[i]; - + if ((connection->active || connection->mode == NETPLAY_CONNECTION_DELAYED_DISCONNECT) && connection->delay_frame && connection->delay_frame <= netplay->self_frame_count) @@ -193,7 +193,7 @@ void netplay_delayed_state_change(netplay_t *netplay) payload[0] = htonl(connection->delay_frame); payload[1] = htonl(client_num); payload[2] = htonl(0); - + memcpy(payload + 3, netplay->device_share_modes, sizeof(netplay->device_share_modes)); strncpy((char *) (payload + 7), connection->nick, NETPLAY_NICK_LEN); @@ -303,7 +303,7 @@ bool netplay_send_cur_input(netplay_t *netplay, { if (from_client == to_client) continue; - + if ((netplay->connected_players & (1<have_real[from_client]) diff --git a/network/netplay/netplay_sync.c b/network/netplay/netplay_sync.c index 0035ac7baf..7c94ec3670 100644 --- a/network/netplay/netplay_sync.c +++ b/network/netplay/netplay_sync.c @@ -126,7 +126,7 @@ static void netplay_merge_digital(netplay_t *netplay, { netplay_input_state_t simstate; uint32_t word, bit, client; - uint8_t share_mode = netplay->device_share_modes[device] + uint8_t share_mode = netplay->device_share_modes[device] & NETPLAY_SHARE_DIGITAL_BITS; /* Make sure all real clients are accounted for */ @@ -141,7 +141,7 @@ static void netplay_merge_digital(netplay_t *netplay, if (share_mode == NETPLAY_SHARE_DIGITAL_VOTE) { unsigned i, j; - /* This just assumes we have no more than + /* This just assumes we have no more than * three words, will need to be adjusted for new devices */ struct vote_count votes[3]; /* Vote mode requires counting all the bits */ @@ -257,7 +257,7 @@ static void merge_analog_part(netplay_t *netplay, { netplay_input_state_t simstate; uint32_t client, client_count = 0; - uint8_t share_mode = netplay->device_share_modes[device] + uint8_t share_mode = netplay->device_share_modes[device] & NETPLAY_SHARE_ANALOG_BITS; int32_t value = 0, new_value; @@ -374,7 +374,7 @@ bool netplay_resolve_input(netplay_t *netplay, size_t sim_ptr, bool resim) &simframe->real_input[device], client, dsize, false, true); if (!simstate) { - /* Don't already have this input, so must + /* Don't already have this input, so must * simulate if we're supposed to have it at all */ if (netplay->read_frame_count[client] > simframe->frame) continue; @@ -429,7 +429,7 @@ bool netplay_resolve_input(netplay_t *netplay, size_t sim_ptr, bool resim) || simframe->resolved_input[device]->client_num != 0)) { /* The default resolved input is of the wrong size! */ - netplay_input_state_t nextistate = + netplay_input_state_t nextistate = simframe->resolved_input[device]->next; free(simframe->resolved_input[device]); simframe->resolved_input[device] = nextistate; @@ -554,18 +554,18 @@ bool netplay_sync_pre_frame(netplay_t *netplay) serial_info.size = netplay->state_size; memset(serial_info.data, 0, serial_info.size); - if ((netplay->quirks & NETPLAY_QUIRK_INITIALIZATION) + if ((netplay->quirks & NETPLAY_QUIRK_INITIALIZATION) || netplay->run_frame_count == 0) { /* Don't serialize until it's safe */ } - else if (!(netplay->quirks & NETPLAY_QUIRK_NO_SAVESTATES) + else if (!(netplay->quirks & NETPLAY_QUIRK_NO_SAVESTATES) && core_serialize(&serial_info)) { - if (netplay->force_send_savestate && !netplay->stall + if (netplay->force_send_savestate && !netplay->stall && !netplay->remote_paused) { - /* Bring our running frame and input frames into + /* Bring our running frame and input frames into * parity so we don't send old info. */ if (netplay->run_ptr != netplay->self_ptr) { @@ -590,7 +590,7 @@ bool netplay_sync_pre_frame(netplay_t *netplay) netplay->stateless_mode = true; } - /* If we can't transmit savestates, we must stall + /* If we can't transmit savestates, we must stall * until the client is ready. */ if (netplay->run_frame_count > 0 && (netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)) && @@ -677,7 +677,7 @@ bool netplay_sync_pre_frame(netplay_t *netplay) else { size_t new_connections_size = netplay->connections_size * 2; - struct netplay_connection + struct netplay_connection *new_connections = (struct netplay_connection*) realloc(netplay->connections, @@ -748,7 +748,7 @@ void netplay_sync_post_frame(netplay_t *netplay, bool stalled) /* We've finished an input frame even if we're stalling */ if ((!stalled || netplay->stall == NETPLAY_STALL_INPUT_LATENCY) && - netplay->self_frame_count < + netplay->self_frame_count < netplay->run_frame_count + netplay->input_latency_frames) { netplay->self_ptr = NEXT_PTR(netplay->self_ptr); @@ -1004,11 +1004,11 @@ void netplay_sync_post_frame(netplay_t *netplay, bool stalled) { uint32_t client_num; struct netplay_connection *connection = &netplay->connections[i]; - + if (!connection->active || connection->mode != NETPLAY_CONNECTION_PLAYING) continue; - + client_num = (uint32_t)(i + 1); /* Are they ahead? */ diff --git a/no-xib.diff b/no-xib.diff index a77def0009..c4969c30c7 100644 --- a/no-xib.diff +++ b/no-xib.diff @@ -3,20 +3,20 @@ index e67725f..868d874 100644 --- a/gfx/drivers_context/cocoa_gl_ctx.m +++ b/gfx/drivers_context/cocoa_gl_ctx.m @@ -83,6 +83,7 @@ static NSOpenGLPixelFormat* g_format; - + static unsigned g_minor = 0; static unsigned g_major = 0; +static bool g_is_inited = false; - + /* forward declaration */ void *nsview_get_ptr(void); @@ -152,6 +153,9 @@ static bool cocoagl_gfx_ctx_init(void *data) { (void)data; - + + if (g_is_inited) + return true; -+ ++ #if defined(HAVE_COCOA) CocoaView *g_view = (CocoaView*)nsview_get_ptr(); #if MAC_OS_X_VERSION_10_7 @@ -27,19 +27,19 @@ index e67725f..868d874 100644 +#if defined(HAVE_COCOA) + [NSApp setDelegate:g_view]; +#endif -+ ++ + g_is_inited = true; return true; } - + @@ -221,6 +230,8 @@ static void cocoagl_gfx_ctx_destroy(void *data) #endif [GLContextClass clearCurrentContext]; g_context = nil; -+ ++ + g_is_inited = false; } - + static bool cocoagl_gfx_ctx_bind_api(void *data, enum gfx_ctx_api api, unsigned major, unsigned minor) diff --git a/pkg/apple/OSX/Info.plist b/pkg/apple/OSX/Info.plist index 8d59658..af95482 100644 @@ -60,7 +60,7 @@ index a7c1b57..e48f0bf 100644 +++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { - + /* Begin PBXBuildFile section */ - 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; }; 500845251B89300700CE6073 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; @@ -69,7 +69,7 @@ index a7c1b57..e48f0bf 100644 500845291B89300700CE6073 /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; }; 5008452A1B89300700CE6073 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; }; @@ -75,7 +73,6 @@ - + /* Begin PBXFileReference section */ 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = ""; }; - 1DDD58150DA1D0A300B32029 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = OSX/en.lproj/MainMenu.xib; sourceTree = ""; }; @@ -113,30 +113,30 @@ index a7c1b57..e48f0bf 100644 - sourceTree = ""; - }; /* End PBXVariantGroup section */ - + /* Begin XCBuildConfiguration section */ diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 5dde6f9..37cd066 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -421,10 +421,50 @@ extern void action_ok_push_quick_menu(void); - + @end - + +static void setup_appkit(void) +{ + [NSAutoreleasePool new]; + [NSApplication sharedApplication]; -+ ++ + /* Might be Snow Leopard (10.6) only and up */ + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; -+ ++ + id menubar = [[NSMenu new] autorelease]; + id appMenuItem = [[NSMenuItem new] autorelease]; + + [menubar addItem:appMenuItem]; + [NSApp setMainMenu:menubar]; -+ ++ + /* Add 'Quit' to menu */ + id appMenu = [[NSMenu new] autorelease]; + id appName = [[NSProcessInfo processInfo] processName]; @@ -145,16 +145,16 @@ index 5dde6f9..37cd066 100644 + action:@selector(terminate:) keyEquivalent:BOXSTRING("q")] autorelease]; + [appMenu addItem:quitMenuItem]; + [appMenuItem setSubmenu:appMenu]; -+ ++ + /* Create a window and activate the application */ + id window = [[[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 200, 200) styleMask:NSTitledWindowMask backing:NSBackingStoreBuffered defer:NO] autorelease]; + [window cascadeTopLeftFromPoint:NSMakePoint(20,20)]; + [window setTitle:appName]; + [window makeKeyAndOrderFront:nil]; -+ ++ + cocoagl_gfx_ctx_init(NULL); + [window setContentView:(CocoaView*)nsview_get_ptr()]; -+ ++ + /* Start the application */ + [NSApp activateIgnoringOtherApps:YES]; /* Brings application to front on startup */ + [NSApp run]; @@ -164,8 +164,8 @@ index 5dde6f9..37cd066 100644 { waiting_argc = argc; waiting_argv = argv; -+ ++ + setup_appkit(); -+ ++ return NSApplicationMain(argc, (const char **) argv); } diff --git a/ps2/compat_files/compat_ctype.c b/ps2/compat_files/compat_ctype.c index 83e80394f7..bb443bac17 100644 --- a/ps2/compat_files/compat_ctype.c +++ b/ps2/compat_files/compat_ctype.c @@ -25,7 +25,7 @@ - Because the PS2SDK implementation is wrong Overrriding these methods here, make that the RetroArch will execute this code - rather than the code in the linked libraries + rather than the code in the linked libraries */ int islower(int c) @@ -337,7 +337,7 @@ char *strtok(char *strToken, const char *strDelimit) // reached the end of the string before finding a delimiter // so dont move on to the next character return start; -} +} char * strtok_r (char *s, const char *delim, char **save_ptr) { diff --git a/ps2/compat_files/time.c b/ps2/compat_files/time.c index 2a7e672892..da7598f421 100644 --- a/ps2/compat_files/time.c +++ b/ps2/compat_files/time.c @@ -86,11 +86,11 @@ time_t ps2_time(time_t *t) { if(t) *t = tim; - + return tim; } -/* Protected methods in libc */ +/* Protected methods in libc */ void _ps2sdk_time_init(void) { SDL_Init(SDL_INIT_TIMER); diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh index 976ca7c53f..b453541670 100644 --- a/qb/qb.libs.sh +++ b/qb/qb.libs.sh @@ -158,7 +158,7 @@ check_pkgconf() break fi done - + eval "HAVE_$val=\"$answer\"" printf %s\\n "$ECHOBUF ... $version" if [ "$answer" = 'no' ]; then @@ -359,7 +359,7 @@ create_config_make() ;; 'no') printf %s\\n "HAVE_$1 = 0";; esac - + case "$PKG_CONF_USED" in *$1*) FLAG="$(eval "printf %s \"\$$1_CFLAGS\"")" diff --git a/qb/qb.params.sh b/qb/qb.params.sh index 7cdf554288..3d7ec4fd4d 100644 --- a/qb/qb.params.sh +++ b/qb/qb.params.sh @@ -72,7 +72,7 @@ parse_input() # Parse stuff :V done < 'qb/config.params.sh' #OPTS contains all available options in config.params.sh - used to speedup #things in opt_exists() - + while [ "$1" ]; do case "$1" in --prefix=*) PREFIX=${1##--prefix=};; diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c index f085a66a7e..82a7887e7c 100644 --- a/record/drivers/record_ffmpeg.c +++ b/record/drivers/record_ffmpeg.c @@ -688,7 +688,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p if (preset <= RECORD_CONFIG_TYPE_RECORDING_LOSSLESS_QUALITY) { if (!settings->bools.video_gpu_record) - params->scale_factor = settings->uints.video_record_scale_factor > 0 ? + params->scale_factor = settings->uints.video_record_scale_factor > 0 ? settings->uints.video_record_scale_factor : 1; else params->scale_factor = 1; @@ -697,7 +697,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p else if (preset >= RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST && settings->uints.video_record_quality < RECORD_CONFIG_TYPE_RECORDING_GIF) { if (!settings->bools.video_gpu_record) - params->scale_factor = settings->uints.video_record_scale_factor > 0 ? + params->scale_factor = settings->uints.video_record_scale_factor > 0 ? settings->uints.video_record_scale_factor : 1; else params->scale_factor = 1; @@ -706,7 +706,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p else if (preset <= RECORD_CONFIG_TYPE_STREAMING_LOW_QUALITY) { if (!settings->bools.video_gpu_record) - params->scale_factor = settings->uints.video_record_scale_factor > 0 ? + params->scale_factor = settings->uints.video_record_scale_factor > 0 ? settings->uints.video_record_scale_factor : 1; else params->scale_factor = 1; @@ -715,7 +715,7 @@ static bool ffmpeg_init_config_common(struct ff_config_param *params, unsigned p else if (preset <= RECORD_CONFIG_TYPE_STREAMING_HIGH_QUALITY) { if (!settings->bools.video_gpu_record) - params->scale_factor = settings->uints.video_stream_scale_factor > 0 ? + params->scale_factor = settings->uints.video_stream_scale_factor > 0 ? settings->uints.video_stream_scale_factor : 1; else params->scale_factor = 1; diff --git a/retroarch-mingw-build.sh b/retroarch-mingw-build.sh index 0e58a9f9a6..897c75ff00 100755 --- a/retroarch-mingw-build.sh +++ b/retroarch-mingw-build.sh @@ -1,10 +1,10 @@ #!/bin/sh -############### +############### # Build script which builds and packages RetroArch for MinGW 32/64-bit. # Preferably build on Linux with a cross chain ... :D ########## -#### +#### ## Tweak these to suit your environment. ## Not defining the variable will avoid building that target. ## Set MINGW32_BASE and/or MINGW64_BASE to set toolchain prefix: @@ -137,7 +137,7 @@ do_build() cp -v "$ZIP_BASE" "../$ZIP_FULL" || die "Failed to move final build ..." mv -v "$ZIP_BASE" .. zip "../$ZIP_BASE" *.dll retroarch-redist-version || die "Failed to build full/redist ..." - + cd .. } diff --git a/retroarch.c b/retroarch.c index 6cbf7fc77f..5cb20c2be7 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2813,7 +2813,7 @@ static enum runloop_state runloop_check_state( { enum menu_action action; static input_bits_t old_input = {{0}}; - static enum menu_action + static enum menu_action old_action = MENU_ACTION_CANCEL; bool focused = false; input_bits_t trigger_input = current_input; @@ -2976,7 +2976,7 @@ static enum runloop_state runloop_check_state( { if (menu_driver_is_alive()) { - if (rarch_is_initialized && + if (rarch_is_initialized && (current_core_type != CORE_TYPE_DUMMY)) { rarch_menu_running_finished(); @@ -2990,7 +2990,7 @@ static enum runloop_state runloop_check_state( { if (menu_driver_is_alive()) { - if (rarch_is_initialized && + if (rarch_is_initialized && (current_core_type != CORE_TYPE_DUMMY)) rarch_menu_running_finished(); } diff --git a/retroarch.cfg b/retroarch.cfg index d2f0e5bdec..d83ba0d399 100644 --- a/retroarch.cfg +++ b/retroarch.cfg @@ -552,7 +552,6 @@ # On Unix-likes, SIGINT/SIGTERM allows a clean deinitialization. # input_exit_emulator = escape - # Applies next and previous shader in directory. # input_shader_next = m # input_shader_prev = n diff --git a/runahead/copy_load_info.c b/runahead/copy_load_info.c index 44bb8a16ac..d9d4dc7914 100644 --- a/runahead/copy_load_info.c +++ b/runahead/copy_load_info.c @@ -26,7 +26,7 @@ static void free_retro_game_info(struct retro_game_info *dest) dest->meta = NULL; } -static struct retro_game_info* clone_retro_game_info(const +static struct retro_game_info* clone_retro_game_info(const struct retro_game_info *src) { void *data = NULL; @@ -116,9 +116,9 @@ static struct string_list *string_list_clone( } #if 0 -/* for cloning the Special field, however, attempting +/* for cloning the Special field, however, attempting * to use this feature crashes retroarch */ -static void free_retro_subsystem_memory_info(struct +static void free_retro_subsystem_memory_info(struct retro_subsystem_memory_info *dest) { if (!dest) @@ -128,7 +128,7 @@ static void free_retro_subsystem_memory_info(struct dest->extension = NULL; } -static void clone_retro_subsystem_memory_info(struct +static void clone_retro_subsystem_memory_info(struct retro_subsystem_memory_info* dest, const struct retro_subsystem_memory_info *src) { @@ -136,7 +136,7 @@ static void clone_retro_subsystem_memory_info(struct dest->type = src->type; } -static void free_retro_subsystem_rom_info(struct +static void free_retro_subsystem_rom_info(struct retro_subsystem_rom_info *dest) { int i; @@ -151,7 +151,7 @@ static void free_retro_subsystem_rom_info(struct dest->valid_extensions = NULL; for (i = 0; i < dest->num_memory; i++) - free_retro_subsystem_memory_info((struct + free_retro_subsystem_memory_info((struct retro_subsystem_memory_info*)&dest->memory[i]); if (dest->memory) @@ -159,7 +159,7 @@ static void free_retro_subsystem_rom_info(struct dest->memory = NULL; } -static void clone_retro_subsystem_rom_info(struct +static void clone_retro_subsystem_rom_info(struct retro_subsystem_rom_info *dest, const struct retro_subsystem_rom_info *src) { @@ -173,7 +173,7 @@ static void clone_retro_subsystem_rom_info(struct dest->desc = strcpy_alloc(src->desc); dest->valid_extensions = strcpy_alloc(src->valid_extensions); - memory = (struct retro_subsystem_memory_info*)calloc(1, + memory = (struct retro_subsystem_memory_info*)calloc(1, dest->num_memory * sizeof(struct retro_subsystem_memory_info)); dest->memory = memory; @@ -197,7 +197,7 @@ static void free_retro_subsystem_info(struct retro_subsystem_info *dest) dest->ident = NULL; for (i = 0; i < dest->num_roms; i++) - free_retro_subsystem_rom_info((struct + free_retro_subsystem_rom_info((struct retro_subsystem_rom_info*)&dest->roms[i]); if (dest->roms) @@ -205,7 +205,7 @@ static void free_retro_subsystem_info(struct retro_subsystem_info *dest) dest->roms = NULL; } -static retro_subsystem_info* clone_retro_subsystem_info(struct +static retro_subsystem_info* clone_retro_subsystem_info(struct const retro_subsystem_info *src) { int i; @@ -231,7 +231,7 @@ static retro_subsystem_info* clone_retro_subsystem_info(struct } #endif -static void free_retro_ctx_load_content_info(struct +static void free_retro_ctx_load_content_info(struct retro_ctx_load_content_info *dest) { if (!dest) @@ -255,7 +255,7 @@ static void free_retro_ctx_load_content_info(struct #endif } -static struct retro_ctx_load_content_info +static struct retro_ctx_load_content_info *clone_retro_ctx_load_content_info( const struct retro_ctx_load_content_info *src) { diff --git a/runahead/dirty_input.c b/runahead/dirty_input.c index f167692b43..390010e288 100644 --- a/runahead/dirty_input.c +++ b/runahead/dirty_input.c @@ -128,10 +128,10 @@ int16_t input_state_get_last(unsigned port, /* find list item */ for (i = 0; i < (unsigned)input_state_list->size; i++) { - InputListElement *element = + InputListElement *element = (InputListElement*)input_state_list->data[i]; - if ( (element->port == port) && + if ( (element->port == port) && (element->device == device) && (element->index == index)) { diff --git a/runahead/run_ahead.c b/runahead/run_ahead.c index f131354ef1..2f07d9e5a2 100644 --- a/runahead/run_ahead.c +++ b/runahead/run_ahead.c @@ -230,7 +230,7 @@ void run_ahead(int runahead_count, bool useSecondary) if (!useSecondary || !have_dynamic || !runahead_secondary_core_available) { - /* TODO: multiple savestates for higher performance + /* TODO: multiple savestates for higher performance * when not using secondary core */ for (frame_number = 0; frame_number <= runahead_count; frame_number++) { @@ -386,7 +386,7 @@ static bool runahead_load_state(void) bool last_dirty = input_is_dirty; set_fast_savestate(); - /* calling core_unserialize has side effects with + /* calling core_unserialize has side effects with * netplay (it triggers transmitting your save state) call retro_unserialize directly from the core instead */ okay = current_core.retro_unserialize( diff --git a/runahead/secondary_core.c b/runahead/secondary_core.c index 254a249cc9..f597c1afaa 100644 --- a/runahead/secondary_core.c +++ b/runahead/secondary_core.c @@ -241,7 +241,7 @@ static bool secondary_core_create(void) bool contentless = false; bool is_inited = false; - if ( last_core_type != CORE_TYPE_PLAIN || + if ( last_core_type != CORE_TYPE_PLAIN || !load_content_info || load_content_info->special) return false; diff --git a/samples/tasks/database/Makefile b/samples/tasks/database/Makefile index d526f03358..d87b5d33ae 100644 --- a/samples/tasks/database/Makefile +++ b/samples/tasks/database/Makefile @@ -60,7 +60,7 @@ CC := $(compiler) CXX := $(subst CC,++,$(compiler)) flags := -I$(LIBRETRO_COMM_DIR)/include asflags := $(extra_flags) -LDFLAGS := +LDFLAGS := flags += -std=c99 INCFLAGS := -I$(LIBRETRO_COMM_DIR)/include @@ -107,8 +107,8 @@ CXXFLAGS += $(DEFINES) OBJECTS = $(SOURCES_C:.c=.o) -OBJOUT = -o -LINKOUT = -o +OBJOUT = -o +LINKOUT = -o ifneq (,$(findstring msvc,$(platform))) OBJOUT = -Fo diff --git a/samples/tasks/database/main.c b/samples/tasks/database/main.c index 49b6274a3e..491507a6df 100644 --- a/samples/tasks/database/main.c +++ b/samples/tasks/database/main.c @@ -16,7 +16,7 @@ static void main_msg_queue_push(const char *msg, fprintf(stderr, "MSGQ: %s\n", msg); } -/* +/* * return codes - * graceful exit: 1 * normal exit: 0 diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index 72c494285d..f81435aa3f 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -114,7 +114,7 @@ static bool input_autoconfigured[MAX_USERS]; static unsigned input_device_name_index[MAX_INPUT_DEVICES]; static bool input_autoconfigure_swap_override; -/* TODO/FIXME - Not thread safe to access this +/* TODO/FIXME - Not thread safe to access this * on main thread as well in its current state - * menu_input.c - menu_event calls this function * right now, while the underlying variable can @@ -278,7 +278,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf, ? params->name : (!string_is_empty(display_name) ? display_name : "N/A"), msg_hash_to_str(MSG_DEVICE_CONFIGURED_IN_PORT), params->idx); - + /* allow overriding the swap menu controls for player 1*/ if (params->idx == 0) { diff --git a/tasks/task_content.c b/tasks/task_content.c index b0b81de326..b094e8b34d 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -659,7 +659,7 @@ static bool content_file_load( fill_pathname_join(new_path, new_basedir, path_basename(path), new_path_size); - /* TODO: This may fail on very large files... + /* TODO: This may fail on very large files... * but copying large files is not a good idea anyway */ if (!filestream_read_file(path, &buf, &len)) { @@ -698,7 +698,6 @@ static bool content_file_load( } #endif - RARCH_LOG("%s\n", msg_hash_to_str( MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT)); content_rom_crc = file_crc32(0, path); @@ -713,7 +712,7 @@ static bool content_file_load( if (!core_load_game(&load_info)) { - /* This is probably going to fail on multifile ROMs etc. + /* This is probably going to fail on multifile ROMs etc. * so give a visible explanation of what is likely wrong */ if (used_vfs_fallback_copy) snprintf(msg, @@ -1840,8 +1839,6 @@ bool task_push_load_subsystem_with_core_from_menu( return true; } - - void content_get_status( bool *contentless, bool *is_inited) diff --git a/tasks/task_database.c b/tasks/task_database.c index 41cce066f2..cd263a2bdc 100644 --- a/tasks/task_database.c +++ b/tasks/task_database.c @@ -550,7 +550,7 @@ static void gdi_prune(database_info_handle_t *db, const char *name) { for (i = db->list_ptr; i < db->list->size; ++i) { - if (db->list->elems[i].data + if (db->list->elems[i].data && string_is_equal(path, db->list->elems[i].data)) { RARCH_LOG("Pruning file referenced by gdi: %s\n", path); diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c index 8b23a74ff8..e5184d6025 100644 --- a/tasks/task_decompress.c +++ b/tasks/task_decompress.c @@ -52,7 +52,7 @@ static int file_decompressed_subdir(const char *name, /* Ignore directories. */ if ( - name[strlen(name) - 1] == '/' || + name[strlen(name) - 1] == '/' || name[strlen(name) - 1] == '\\') goto next_file; diff --git a/tasks/task_file_transfer.h b/tasks/task_file_transfer.h index f1dc43379a..605b43f1f0 100644 --- a/tasks/task_file_transfer.h +++ b/tasks/task_file_transfer.h @@ -1,81 +1,81 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#ifndef TASKS_FILE_TRANSFER_H -#define TASKS_FILE_TRANSFER_H - -#include -#include -#include - -#include - -#include "../msg_hash.h" - -RETRO_BEGIN_DECLS - -enum nbio_status_enum -{ - NBIO_STATUS_INIT = 0, - NBIO_STATUS_TRANSFER, - NBIO_STATUS_TRANSFER_PARSE, - NBIO_STATUS_TRANSFER_FINISHED -}; - -enum nbio_type -{ - NBIO_TYPE_NONE = 0, - NBIO_TYPE_JPEG, - NBIO_TYPE_PNG, - NBIO_TYPE_TGA, - NBIO_TYPE_BMP, - NBIO_TYPE_OGG, - NBIO_TYPE_FLAC, - NBIO_TYPE_MP3, - NBIO_TYPE_MOD, - NBIO_TYPE_WAV -}; - -enum nbio_status_flags -{ - NBIO_FLAG_NONE = 0, - NBIO_FLAG_IMAGE_SUPPORTS_RGBA -}; - -typedef int (*transfer_cb_t)(void *data, size_t len); - -typedef struct nbio_handle -{ - enum nbio_type type; - bool is_finished; - unsigned status; - unsigned pos_increment; - uint32_t status_flags; - void *data; - char *path; - struct nbio_t *handle; - msg_queue_t *msg_queue; - transfer_cb_t cb; -} nbio_handle_t; - -typedef struct -{ - enum msg_hash_enums enum_idx; - char path[PATH_MAX_LENGTH]; -} file_transfer_t; - -RETRO_END_DECLS - -#endif +/* RetroArch - A frontend for libretro. + * Copyright (C) 2011-2017 - Daniel De Matteis + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef TASKS_FILE_TRANSFER_H +#define TASKS_FILE_TRANSFER_H + +#include +#include +#include + +#include + +#include "../msg_hash.h" + +RETRO_BEGIN_DECLS + +enum nbio_status_enum +{ + NBIO_STATUS_INIT = 0, + NBIO_STATUS_TRANSFER, + NBIO_STATUS_TRANSFER_PARSE, + NBIO_STATUS_TRANSFER_FINISHED +}; + +enum nbio_type +{ + NBIO_TYPE_NONE = 0, + NBIO_TYPE_JPEG, + NBIO_TYPE_PNG, + NBIO_TYPE_TGA, + NBIO_TYPE_BMP, + NBIO_TYPE_OGG, + NBIO_TYPE_FLAC, + NBIO_TYPE_MP3, + NBIO_TYPE_MOD, + NBIO_TYPE_WAV +}; + +enum nbio_status_flags +{ + NBIO_FLAG_NONE = 0, + NBIO_FLAG_IMAGE_SUPPORTS_RGBA +}; + +typedef int (*transfer_cb_t)(void *data, size_t len); + +typedef struct nbio_handle +{ + enum nbio_type type; + bool is_finished; + unsigned status; + unsigned pos_increment; + uint32_t status_flags; + void *data; + char *path; + struct nbio_t *handle; + msg_queue_t *msg_queue; + transfer_cb_t cb; +} nbio_handle_t; + +typedef struct +{ + enum msg_hash_enums enum_idx; + char path[PATH_MAX_LENGTH]; +} file_transfer_t; + +RETRO_END_DECLS + +#endif diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c index 77f786134a..7c336021a4 100644 --- a/tasks/task_netplay_find_content.c +++ b/tasks/task_netplay_find_content.c @@ -64,7 +64,6 @@ static void netplay_crc_scan_callback(void *task_data, fflush(stdout); - if (!string_is_empty(state->subsystem_name) && !string_is_equal(state->subsystem_name, "N/A")) { content_ctx_info_t content_info = {0}; @@ -336,7 +335,6 @@ static void task_netplay_crc_scan_handler(retro_task_t *task) playlist = playlist_init(lpl_path, 99999); playlist_size = playlist_get_size(playlist); - for(k = 0; k < playlist_size && !found[i]; k++) { const char *playlist_crc32 = NULL; diff --git a/tools/cg2glsl.py b/tools/cg2glsl.py index 7536c6d8aa..c22315a064 100755 --- a/tools/cg2glsl.py +++ b/tools/cg2glsl.py @@ -15,32 +15,26 @@ if sys.version_info < (3, 0, 0): sys.stderr.write("You need python 3.0 or later to run this script\n") exit(1) - batch_mode = False - def log(*arg): if not batch_mode: # FIXME: This causes a syntax error in python2, preventing the version warning from displaying. print(*arg) - def keep_line_if(func, lines): ret = [] for line in filter(func, lines): ret.append(line) return ret - def remove_comments(source_lines): lines_without_comments = [line.split('//')[0] for line in source_lines] return keep_line_if(lambda line: line, lines_without_comments) - def defines_var(line): return ('//var' in line) or ('#var' in line) - def replace_by_table(source, table): for orig, new in table: if orig: @@ -48,7 +42,6 @@ def replace_by_table(source, table): return source - def replace_global_in(source): replace_table = [ ('IN.video_size', 'InputSize'), @@ -69,7 +62,6 @@ def replace_global_in(source): return replace_by_table(source, replace_table) - def replace_global_vertex(source): source = replace_global_in(source) @@ -96,7 +88,6 @@ def replace_global_vertex(source): return replace_by_table(source, replace_table) - def translate_varyings(varyings, source, direction): dictionary = {} for varying in varyings: @@ -108,7 +99,6 @@ def translate_varyings(varyings, source, direction): return dictionary - def no_uniform(elem): banned = [ '_video_size', @@ -128,7 +118,6 @@ def no_uniform(elem): return True - def destructify_varyings(source, direction): # We have to change varying structs that Cg support to single varyings for GL. # Varying structs aren't supported until later versions @@ -232,14 +221,12 @@ def destructify_varyings(source, direction): return source - def translate(cg, translations): if cg in translations: return translations[cg] else: return cg - def translate_varying(cg): translations = { 'IN.tex_coord': 'TexCoord', @@ -273,7 +260,6 @@ def translate_varying(cg): return translate(cg, translations) - def translate_texture_size(cg): translations = { 'ORIG.texture_size': 'OrigTextureSize', @@ -328,7 +314,6 @@ def translate_texture_size(cg): return translate(cg, translations) - def replace_varyings(source): ret = [] translations = [] @@ -367,7 +352,6 @@ def replace_varyings(source): return ret - def fix_samplers(log_prefix, ref_index, source): translations = [] added_samplers = [] @@ -414,7 +398,6 @@ def fix_samplers(log_prefix, ref_index, source): return source - def hack_source_vertex(source): ref_index = 0 for index, line in enumerate(source): @@ -436,7 +419,6 @@ def hack_source_vertex(source): return source - def replace_global_fragment(source): source = replace_global_in(source) @@ -452,7 +434,6 @@ def replace_global_fragment(source): return replace_by_table(source, replace_table) - def translate_texture(cg): translations = { 'ORIG.texture': 'OrigTexture', @@ -483,7 +464,6 @@ def translate_texture(cg): return translate(cg, translations) - def hack_source_fragment(source): ref_index = 0 for index, line in enumerate(source): @@ -501,7 +481,6 @@ def hack_source_fragment(source): return source - def validate_shader(source, target): log('Shader:') log('===') @@ -516,7 +495,6 @@ def validate_shader(source, target): return p.returncode == 0 - def preprocess_vertex(source_data): input_data = source_data.splitlines() ret = [] @@ -529,7 +507,6 @@ def preprocess_vertex(source_data): ret.append(line) return '\n'.join(ret) - def convert(source, dest): # Have to preprocess first to resolve #includes so we can hack potential vertex shaders. inc_dir = os.path.split(source)[0] @@ -650,7 +627,6 @@ precision mediump float; f.write('#endif\n') return 0 - def convert_cgp(source, dest): string = '' with open(source, 'r') as f: @@ -658,17 +634,14 @@ def convert_cgp(source, dest): open(dest, 'w').write(string) - def path_ext(path): _, ext = os.path.splitext(path) return ext - def convert_path(source, source_dir, dest_dir, conv): index = 0 if source_dir[-1] == '/' else 1 return os.path.join(dest_dir, source.replace(source_dir, '')[index:]).replace(conv[0], conv[1]) - def main(): if len(sys.argv) != 3: print('Usage: {} prog.cg(p) prog.glsl(p)'.format(sys.argv[0])) @@ -749,6 +722,5 @@ def main(): else: sys.exit(convert(source, dest)) - if __name__ == '__main__': sys.exit(main()) diff --git a/tools/com-parser/grammar.txt b/tools/com-parser/grammar.txt index 17489e04a3..1f7af65e8f 100644 --- a/tools/com-parser/grammar.txt +++ b/tools/com-parser/grammar.txt @@ -1,7 +1,6 @@ Program <- (Function / Comment / Line)* EndOfFile - Function <- _ ReturnType _ '(' _ FunctionName _ ')'_ Parameters Parameters <- '('_ This _ ','? _ ( _ Param _ ','?)*_ ');' FunctionName <- CallType _ '*' _ diff --git a/tools/ps3/ps3py/LICENSE b/tools/ps3/ps3py/LICENSE index 1580af9d38..9dd374fcfd 100644 --- a/tools/ps3/ps3py/LICENSE +++ b/tools/ps3/ps3py/LICENSE @@ -1,19 +1,19 @@ - Copyright (c) 2011 PSL1GHT Development Team - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. + Copyright (c) 2011 PSL1GHT Development Team + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. diff --git a/tools/ps3/ps3py/pkg.py b/tools/ps3/ps3py/pkg.py index fa545d8227..cba69625fa 100755 --- a/tools/ps3/ps3py/pkg.py +++ b/tools/ps3/ps3py/pkg.py @@ -15,26 +15,26 @@ class Struct(object): __slots__ = ('__attrs__', '__baked__', '__defs__', '__endian__', '__next__', '__sizes__', '__values__') int8 = StructType(('b', 1)) uint8 = StructType(('B', 1)) - + int16 = StructType(('h', 2)) uint16 = StructType(('H', 2)) - + int32 = StructType(('l', 4)) uint32 = StructType(('L', 4)) - + int64 = StructType(('q', 8)) uint64 = StructType(('Q', 8)) - + float = StructType(('f', 4)) def string(cls, len, offset=0, encoding=None, stripNulls=False, value=''): return StructType(('string', (len, offset, encoding, stripNulls, value))) string = classmethod(string) - + LE = '<' BE = '>' __endian__ = '<' - + def __init__(self, func=None, unpack=None, **kwargs): self.__defs__ = [] self.__sizes__ = [] @@ -42,7 +42,7 @@ class Struct(object): self.__values__ = {} self.__next__ = True self.__baked__ = False - + if func == None: self.__format__() else: @@ -51,36 +51,36 @@ class Struct(object): for name in func.func_code.co_varnames: value = self.__frame__.f_locals[name] self.__setattr__(name, value) - + self.__baked__ = True - + if unpack != None: if isinstance(unpack, tuple): self.unpack(*unpack) else: self.unpack(unpack) - + if len(kwargs): for name in kwargs: self.__values__[name] = kwargs[name] - + def __trace__(self, frame, event, arg): self.__frame__ = frame sys.settrace(None) - + def __setattr__(self, name, value): if name in self.__slots__: return object.__setattr__(self, name, value) - + if self.__baked__ == False: if not isinstance(value, list): value = [value] attrname = name else: attrname = '*' + name - + self.__values__[name] = None - + for sub in value: if isinstance(sub, Struct): sub = sub.__class__ @@ -95,7 +95,7 @@ class Struct(object): self.__sizes__.append(size) self.__attrs__.append(attrname) self.__next__ = True - + if attrname[0] != '*': self.__values__[name] = size[3] elif self.__values__[name] == None: @@ -105,7 +105,7 @@ class Struct(object): self.__sizes__.append(size) self.__attrs__.append(attrname) self.__next__ = True - + if attrname[0] != '*': self.__values__[name] = size() elif self.__values__[name] == None: @@ -116,11 +116,11 @@ class Struct(object): self.__sizes__.append(0) self.__attrs__.append([]) self.__next__ = False - + self.__defs__[-1] += type_ self.__sizes__[-1] += size self.__attrs__[-1].append(attrname) - + if attrname[0] != '*': self.__values__[name] = 0 elif self.__values__[name] == None: @@ -130,7 +130,7 @@ class Struct(object): self.__values__[name] = value except KeyError: raise AttributeError(name) - + def __getattr__(self, name): if self.__baked__ == False: return name @@ -139,14 +139,14 @@ class Struct(object): return self.__values__[name] except KeyError: raise AttributeError(name) - + def __len__(self): ret = 0 arraypos, arrayname = None, None - + for i in range(len(self.__defs__)): sdef, size, attrs = self.__defs__[i], self.__sizes__[i], self.__attrs__[i] - + if sdef == Struct.string: size, offset, encoding, stripNulls, value = size if isinstance(size, str): @@ -158,11 +158,11 @@ class Struct(object): arraypos = 0 size = len(self.__values__[attrs[1:]][arraypos]) size = len(self.__values__[attrs]) - + ret += size - + return ret - + def unpack(self, data, pos=0): for name in self.__values__: if not isinstance(self.__values__[name], Struct): @@ -170,27 +170,27 @@ class Struct(object): elif self.__values__[name].__class__ == list and len(self.__values__[name]) != 0: if not isinstance(self.__values__[name][0], Struct): self.__values__[name] = None - + arraypos, arrayname = None, None - + for i in range(len(self.__defs__)): sdef, size, attrs = self.__defs__[i], self.__sizes__[i], self.__attrs__[i] - + if sdef == Struct.string: size, offset, encoding, stripNulls, value = size if isinstance(size, str): size = self.__values__[size] + offset - + temp = data[pos:pos+size] if len(temp) != size: raise StructException('Expected %i byte string, got %i' % (size, len(temp))) - + if encoding != None: temp = temp.decode(encoding) - + if stripNulls: temp = temp.rstrip('\0') - + if attrs[0] == '*': name = attrs[1:] if self.__values__[name] == None: @@ -224,21 +224,21 @@ class Struct(object): else: self.__values__[name] = values[j] j += 1 - + return self - + def pack(self): arraypos, arrayname = None, None - + ret = '' for i in range(len(self.__defs__)): sdef, size, attrs = self.__defs__[i], self.__sizes__[i], self.__attrs__[i] - + if sdef == Struct.string: size, offset, encoding, stripNulls, value = size if isinstance(size, str): size = self.__values__[size]+offset - + if attrs[0] == '*': if arrayname != attrs: arraypos = 0 @@ -247,10 +247,10 @@ class Struct(object): arraypos += 1 else: temp = self.__values__[attrs] - + if encoding != None: temp = temp.encode(encoding) - + temp = temp[:size] ret += temp + ('\0' * (size - len(temp))) elif sdef == Struct: @@ -273,10 +273,10 @@ class Struct(object): arraypos += 1 else: values.append(self.__values__[name]) - + ret += struct.pack(self.__endian__+sdef, *values) return ret - + def __getitem__(self, value): return [('struct', self.__class__)] * value @@ -342,18 +342,18 @@ class MetaHeader(Struct): self.unk2 = Struct.uint32 self.drmType = Struct.uint32 self.unk4 = Struct.uint32 - + self.unk21 = Struct.uint32 self.unk22 = Struct.uint32 self.unk23 = Struct.uint32 self.unk24 = Struct.uint32 - + self.unk31 = Struct.uint32 self.unk32 = Struct.uint32 self.unk33 = Struct.uint32 self.secondaryVersion = Struct.uint16 self.unk34 = Struct.uint16 - + self.dataSize = Struct.uint32 self.unk42 = Struct.uint32 self.unk43 = Struct.uint32 @@ -371,7 +371,7 @@ class FileHeader(Struct): self.fileNameOff = Struct.uint32 self.fileNameLength = Struct.uint32 self.fileOff = Struct.uint64 - + self.fileSize = Struct.uint64 self.flags = Struct.uint32 self.padding = Struct.uint32 @@ -391,17 +391,16 @@ class FileHeader(Struct): else: out += " Overwrite NOT allowed.\n" out += "\n" - + out += "[X] File Name offset: %08x\n" % self.fileNameOff out += "[X] File Name Length: %08x\n" % self.fileNameLength out += "[X] Offset To File Data: %016x\n" % self.fileOff - + out += "[X] File Size: %016x\n" % self.fileSize out += "[X] Flags: %08x\n" % self.flags out += "[X] Padding: %08x\n\n" % self.padding assert self.padding == 0, "I guess I was wrong, this is not padding." - - + return out def __repr__(self): return self.fileName + (" Size: 0x%016x" % self.fileSize) @@ -416,44 +415,41 @@ class Header(Struct): self.type = Struct.uint32 self.pkgInfoOff = Struct.uint32 self.unk1 = Struct.uint32 - + self.headSize = Struct.uint32 self.itemCount = Struct.uint32 self.packageSize = Struct.uint64 - + self.dataOff = Struct.uint64 self.dataSize = Struct.uint64 - + self.contentID = Struct.uint8[0x30] self.QADigest = Struct.uint8[0x10] self.KLicensee = Struct.uint8[0x10] - - - + def __str__(self): context = keyToContext(self.QADigest) setContextNum(context, 0xFFFFFFFFFFFFFFFF) licensee = crypt(context, listToString(self.KLicensee), 0x10) - + out = "" out += "[X] Magic: %08x\n" % self.magic out += "[X] Type: %08x\n" % self.type out += "[X] Offset to package info: %08x\n" % self.pkgInfoOff out += "[ ] unk1: %08x\n" % self.unk1 - + out += "[X] Head Size: %08x\n" % self.headSize out += "[X] Item Count: %08x\n" % self.itemCount out += "[X] Package Size: %016x\n" % self.packageSize - + out += "[X] Data Offset: %016x\n" % self.dataOff out += "[X] Data Size: %016x\n" % self.dataSize - + out += "[X] ContentID: '%s'\n" % (nullterm(self.contentID)) - + out += "[X] QA_Digest: %s\n" % (nullterm(self.QADigest, True)) out += "[X] K Licensee: %s\n" % licensee.encode('hex') - - + return out def listToString(inlist): if isinstance(inlist, list): @@ -471,7 +467,7 @@ def nullterm(str_plus, printhex=False): return str_plus[:z] else: return str_plus - + def keyToContext(key): if isinstance(key, list): key = listToString(key) @@ -495,15 +491,14 @@ def manipulate(key): if not isinstance(key, list): return tmp = listToString(key[0x38:]) - - + tmpnum = struct.unpack('>Q', tmp)[0] tmpnum += 1 tmpnum = tmpnum & 0xFFFFFFFFFFFFFFFF setContextNum(key, tmpnum) def setContextNum(key, tmpnum): tmpchrs = struct.pack('>Q', tmpnum) - + key[0x38] = ord(tmpchrs[0]) key[0x39] = ord(tmpchrs[1]) key[0x3a] = ord(tmpchrs[2]) @@ -527,7 +522,6 @@ except: print "This should create a pkgcrypt.so file in the build/ directory. Move that file" print "over to the root of the ps3py directory and try running this script again." - def crypt(key, inbuf, length): if not isinstance(key, list): return "" @@ -553,7 +547,7 @@ def SHA1(data): return m.digest() pkgcrypt.register_sha1_callback(SHA1) - + def getFiles(files, folder, original): oldfolder = folder foundFiles = glob.glob( os.path.join(folder, '*') ) @@ -573,7 +567,7 @@ def getFiles(files, folder, original): folder.fileNameOff = 0 folder.fileNameLength = len(folder.fileName) folder.fileOff = 0 - + folder.fileSize = 0 folder.flags = TYPE_OVERWRITE_ALLOWED | TYPE_DIRECTORY folder.padding = 0 @@ -590,59 +584,57 @@ def getFiles(files, folder, original): if newpath == "USRDIR/EBOOT.BIN": file.fileSize = ((file.fileSize - 0x30 + 63) & ~63) + 0x30 file.flags = TYPE_OVERWRITE_ALLOWED | TYPE_NPDRMSELF - + file.padding = 0 files.append(file) - + def pack(folder, contentid, outname=None): qadigest = hashlib.sha1() - + header = Header() header.magic = 0x7F504B47 header.type = 0x01 header.pkgInfoOff = 0xC0 header.unk1 = 0x05 - + header.headSize = 0x80 header.itemCount = 0 header.packageSize = 0 - + header.dataOff = 0x140 header.dataSize = 0 - + for i in range(0, 0x30): header.contentID[i] = 0 - + for i in range(0,0x10): header.QADigest[i] = 0 header.KLicensee[i] = 0 - - + metaBlock = MetaHeader() metaBlock.unk1 = 1 #doesnt change output of --extract metaBlock.unk2 = 4 #doesnt change output of --extract metaBlock.drmType = 3 #1 = Network, 2 = Local, 3 = Free, anything else = unknown - metaBlock.unk4 = 2 - + metaBlock.unk4 = 2 + metaBlock.unk21 = 4 metaBlock.unk22 = 5 #5 == gameexec, 4 == gamedata metaBlock.unk23 = 3 metaBlock.unk24 = 4 - + metaBlock.unk31 = 0xE #packageType 0x10 == patch, 0x8 == Demo&Key, 0x0 == Demo&Key (AND UserFiles = NotOverWrite), 0xE == normal, use 0xE for gamexec, and 8 for gamedata metaBlock.unk32 = 4 #when this is 5 secondary version gets used?? metaBlock.unk33 = 8 #doesnt change output of --extract metaBlock.secondaryVersion = 0 metaBlock.unk34 = 0 - + metaBlock.dataSize = 0 metaBlock.unk42 = 5 metaBlock.unk43 = 4 metaBlock.packagedBy = 0x1061 metaBlock.packageVersion = 0 - - + files = [] getFiles(files, folder, folder) header.itemCount = len(files) @@ -689,7 +681,7 @@ def pack(folder, contentid, outname=None): digestOff += len(digest) if appheader.appType == 8 and found: dataToEncrypt += fileData[0:digestOff] - + meta = EbootMeta() meta.magic = 0x4E504400 meta.unk1 = 1 @@ -711,7 +703,7 @@ def pack(folder, contentid, outname=None): dataToEncrypt += fileData else: dataToEncrypt += fileData - + dataToEncrypt += '\0' * (((file.fileSize + 0x0F) & ~0x0F) - len(fileData)) header.dataSize = len(dataToEncrypt) metaBlock.dataSize = header.dataSize @@ -720,20 +712,20 @@ def pack(folder, contentid, outname=None): qadigest.update(head) qadigest.update(dataToEncrypt[0:fileDescLength]) QA_Digest = qadigest.digest() - + for i in range(0, 0x10): header.QADigest[i] = ord(QA_Digest[i]) - + for i in range(0, min(len(contentid), 0x30)): header.contentID[i] = ord(contentid[i]) - + context = keyToContext(header.QADigest) setContextNum(context, 0xFFFFFFFFFFFFFFFF) licensee = crypt(context, listToString(header.KLicensee), 0x10) - + for i in range(0, min(len(contentid), 0x10)): header.KLicensee[i] = ord(licensee[i]) - + if outname != None: outFile = open(outname, 'wb') else: @@ -741,29 +733,28 @@ def pack(folder, contentid, outname=None): outFile.write(header.pack()) headerSHA = SHA1(header.pack())[3:19] outFile.write(headerSHA) - - + metaData = metaBlock.pack() metaBlockSHA = SHA1(metaData)[3:19] metaBlockSHAPad = '\0' * 0x30 - + context = keyToContext([ord(c) for c in metaBlockSHA]) metaBlockSHAPadEnc = crypt(context, metaBlockSHAPad, 0x30) - + context = keyToContext([ord(c) for c in headerSHA]) metaBlockSHAPadEnc2 = crypt(context, metaBlockSHAPadEnc, 0x30) outFile.write(metaBlockSHAPadEnc2) outFile.write(metaData) outFile.write(metaBlockSHA) outFile.write(metaBlockSHAPadEnc) - + context = keyToContext(header.QADigest) encData = crypt(context, dataToEncrypt, header.dataSize) outFile.write(encData) outFile.write('\0' * 0x60) outFile.close() print header - + def usage(): print """usage: [based on revision 1061] diff --git a/tools/vulkan_loader_generator.py b/tools/vulkan_loader_generator.py index e750da434b..0678f1cdb6 100755 --- a/tools/vulkan_loader_generator.py +++ b/tools/vulkan_loader_generator.py @@ -43,7 +43,6 @@ def main(): continue extensions.append((m.group(1), m.group(2))) - with open(sys.argv[2], 'w') as f: print(''' /* This header is autogenerated by vulkan_loader_generator.py */ diff --git a/translation/drivers/translation_cached_google.c b/translation/drivers/translation_cached_google.c index 9a736512f2..1e862a554e 100644 --- a/translation/drivers/translation_cached_google.c +++ b/translation/drivers/translation_cached_google.c @@ -4,7 +4,7 @@ static void* translation_cached_google_init(const struct translation_driver_info { return NULL; } - + static void translation_cached_google_free(void* data) { } @@ -18,7 +18,7 @@ static char* translation_cached_google_translate_image(void* data, struct ocr_im { return ""; } - + const translation_driver_t translation_cached_google = { translation_cached_google_init, translation_cached_google_free, diff --git a/translation/drivers/translation_null.c b/translation/drivers/translation_null.c index deea614d98..2d26a88ce8 100644 --- a/translation/drivers/translation_null.c +++ b/translation/drivers/translation_null.c @@ -4,7 +4,7 @@ static void* translation_null_init(const struct translation_driver_info *params) { return NULL; } - + static void translation_null_free(void* data) { } @@ -13,7 +13,7 @@ static char* translation_null_translate_text(const char* game_text) { return ""; } - + const translation_driver_t translation_null = { translation_null_init, translation_null_free, diff --git a/translation/drivers_ocr/ocr_null.c b/translation/drivers_ocr/ocr_null.c index 610e9ea27c..6eb030b5df 100644 --- a/translation/drivers_ocr/ocr_null.c +++ b/translation/drivers_ocr/ocr_null.c @@ -4,7 +4,7 @@ static void* ocr_null_init(int game_character_set) { return NULL; } - + static void ocr_null_free(void* data) { } @@ -13,7 +13,7 @@ char* ocr_null_get_text(void* data, struct ocr_image_info image) { return ""; } - + const ocr_driver_t ocr_null = { ocr_null_init, ocr_null_free, diff --git a/translation/drivers_ocr/ocr_tesseract.c b/translation/drivers_ocr/ocr_tesseract.c index b29f9bb5cd..d1dcb4d3a0 100644 --- a/translation/drivers_ocr/ocr_tesseract.c +++ b/translation/drivers_ocr/ocr_tesseract.c @@ -36,7 +36,7 @@ static void* ocr_tesseract_init(int game_character_set) return NULL; } - + static void ocr_tesseract_free(void* data) { } @@ -44,30 +44,30 @@ static void ocr_tesseract_free(void* data) char* ocr_tesseract_get_text(void* data, struct ocr_image_info image) { tess_image temp_image; - + temp_image.width = image.width; temp_image.height = image.height; temp_image.data = image.data; - + switch (image.pixel_format) { case RETRO_PIXEL_FORMAT_0RGB1555: case RETRO_PIXEL_FORMAT_RGB565: temp_image.bytes_per_pixel = 2; break - + case RETRO_PIXEL_FORMAT_XRGB8888: temp_image.bytes_per_pixel = 4; break; - + default: /* unsupported format */ return ""; } - + return tess_get_text(temp_image); } - + const ocr_driver_t ocr_tesseract = { ocr_tesseract_init, ocr_tesseract_free, diff --git a/translation/drivers_ocr/tesseract/wrapper/tess_get_text.cpp b/translation/drivers_ocr/tesseract/wrapper/tess_get_text.cpp index 4de99e8973..fabf33d974 100644 --- a/translation/drivers_ocr/tesseract/wrapper/tess_get_text.cpp +++ b/translation/drivers_ocr/tesseract/wrapper/tess_get_text.cpp @@ -1,46 +1,46 @@ -#include -#include -#include "tess_get_text.h" - -#define ERROR_BUFFER_LENGTH 1000 - -static tesseract::TessBaseAPI *api; -static char* one_time_return_pointer = NULL; - -char tess_last_error[ERROR_BUFFER_LENGTH]; - -bool tess_init(const char* lang_data_dir, const char* language) -{ - api = new tesseract::TessBaseAPI(); - - snprintf(tess_last_error, ERROR_BUFFER_LENGTH, "No errors!\n"); - - if (api->Init(lang_data_dir, language)) - { - snprintf(tess_last_error, ERROR_BUFFER_LENGTH, - "Could not initialize tesseract.\n"); - return false; - } - - return true; -} - -void tess_deinit(void) -{ - if (one_time_return_pointer) - delete [] one_time_return_pointer; - - if (api) - api->End(); -} - -char* tess_get_text(tess_image image) -{ - if (one_time_return_pointer) - delete [] one_time_return_pointer; - - api->SetImage(image.data, image.width, image.height, - image.bytes_per_pixel, image.width * image.bytes_per_pixel); - one_time_return_pointer = api->GetUTF8Text(); - return one_time_return_pointer; -} +#include +#include +#include "tess_get_text.h" + +#define ERROR_BUFFER_LENGTH 1000 + +static tesseract::TessBaseAPI *api; +static char* one_time_return_pointer = NULL; + +char tess_last_error[ERROR_BUFFER_LENGTH]; + +bool tess_init(const char* lang_data_dir, const char* language) +{ + api = new tesseract::TessBaseAPI(); + + snprintf(tess_last_error, ERROR_BUFFER_LENGTH, "No errors!\n"); + + if (api->Init(lang_data_dir, language)) + { + snprintf(tess_last_error, ERROR_BUFFER_LENGTH, + "Could not initialize tesseract.\n"); + return false; + } + + return true; +} + +void tess_deinit(void) +{ + if (one_time_return_pointer) + delete [] one_time_return_pointer; + + if (api) + api->End(); +} + +char* tess_get_text(tess_image image) +{ + if (one_time_return_pointer) + delete [] one_time_return_pointer; + + api->SetImage(image.data, image.width, image.height, + image.bytes_per_pixel, image.width * image.bytes_per_pixel); + one_time_return_pointer = api->GetUTF8Text(); + return one_time_return_pointer; +} diff --git a/translation/drivers_ocr/tesseract/wrapper/tess_get_text.h b/translation/drivers_ocr/tesseract/wrapper/tess_get_text.h index 22410185ec..55cb827b7a 100644 --- a/translation/drivers_ocr/tesseract/wrapper/tess_get_text.h +++ b/translation/drivers_ocr/tesseract/wrapper/tess_get_text.h @@ -1,26 +1,26 @@ -#ifndef TESS_GET_TEXT -#define TESS_GET_TEXT - -#include -#include - -RETRO_BEGIN_DECLS - -typedef struct -{ - unsigned width; - unsigned height; - unsigned bytes_per_pixel; - void* data; -} tess_image; - -/* if running in RetroArch language should be "eng" or "jpn" */ -bool tess_init(const char* lang_data_dir, const char* language); -void tess_deinit(void); -char* tess_get_text(tess_image image); - -extern char tess_last_error[]; - -RETRO_END_DECLS - -#endif +#ifndef TESS_GET_TEXT +#define TESS_GET_TEXT + +#include +#include + +RETRO_BEGIN_DECLS + +typedef struct +{ + unsigned width; + unsigned height; + unsigned bytes_per_pixel; + void* data; +} tess_image; + +/* if running in RetroArch language should be "eng" or "jpn" */ +bool tess_init(const char* lang_data_dir, const char* language); +void tess_deinit(void); +char* tess_get_text(tess_image image); + +extern char tess_last_error[]; + +RETRO_END_DECLS + +#endif diff --git a/translation/ocr_driver.c b/translation/ocr_driver.c index 38bd2fb51d..c280aa0671 100644 --- a/translation/ocr_driver.c +++ b/translation/ocr_driver.c @@ -1,58 +1,57 @@ -#include -#include - -#include "ocr_driver.h" -#include "../configuration.h" - -static const ocr_driver_t *ocr_backends[] = { -#ifdef HAVE_TESSERACT - &ocr_tesseract, -#endif - &ocr_null, - NULL -}; - -static const ocr_driver_t *current_ocr_backend = NULL; -static void *ocr_data = NULL; - - -static const ocr_driver_t *ocr_find_backend(const char* ident) -{ - unsigned i; - - for (i = 0; ocr_backends[i]; i++) - { - if (string_is_equal(ocr_backends[i]->ident, ident)) - return ocr_backends[i]; - } - - return NULL; -} - -bool ocr_driver_init(void) -{ - settings_t *settings = config_get_ptr(); - int game_char_set = RETRO_LANGUAGE_DUMMY; - current_ocr_backend = ocr_find_backend(settings->arrays.ocr_driver); - ocr_data = NULL; - - /* TODO: get game language */ - - if (current_ocr_backend) - ocr_data = (*current_ocr_backend->init)(game_char_set); - return ocr_data != NULL; -} - -void ocr_driver_free(void) -{ - if (current_ocr_backend && ocr_data) - (*current_ocr_backend->free)(ocr_data); -} - -char* ocr_driver_get_text(struct ocr_image_info image) -{ - char* image_string = NULL; - if (current_ocr_backend && ocr_data) - image_string = (*current_ocr_backend->get_text)(ocr_data, image); - return image_string; +#include +#include + +#include "ocr_driver.h" +#include "../configuration.h" + +static const ocr_driver_t *ocr_backends[] = { +#ifdef HAVE_TESSERACT + &ocr_tesseract, +#endif + &ocr_null, + NULL +}; + +static const ocr_driver_t *current_ocr_backend = NULL; +static void *ocr_data = NULL; + +static const ocr_driver_t *ocr_find_backend(const char* ident) +{ + unsigned i; + + for (i = 0; ocr_backends[i]; i++) + { + if (string_is_equal(ocr_backends[i]->ident, ident)) + return ocr_backends[i]; + } + + return NULL; +} + +bool ocr_driver_init(void) +{ + settings_t *settings = config_get_ptr(); + int game_char_set = RETRO_LANGUAGE_DUMMY; + current_ocr_backend = ocr_find_backend(settings->arrays.ocr_driver); + ocr_data = NULL; + + /* TODO: get game language */ + + if (current_ocr_backend) + ocr_data = (*current_ocr_backend->init)(game_char_set); + return ocr_data != NULL; +} + +void ocr_driver_free(void) +{ + if (current_ocr_backend && ocr_data) + (*current_ocr_backend->free)(ocr_data); +} + +char* ocr_driver_get_text(struct ocr_image_info image) +{ + char* image_string = NULL; + if (current_ocr_backend && ocr_data) + image_string = (*current_ocr_backend->get_text)(ocr_data, image); + return image_string; } \ No newline at end of file diff --git a/translation/ocr_driver.h b/translation/ocr_driver.h index d9241cc8d4..44954358bb 100644 --- a/translation/ocr_driver.h +++ b/translation/ocr_driver.h @@ -1,41 +1,41 @@ -#ifndef __OCR_DRIVER__H -#define __OCR_DRIVER__H - -#include -#include - -RETRO_BEGIN_DECLS - -struct ocr_image_info -{ - unsigned width; - unsigned height; - unsigned pixel_format; - void* data; -}; - -typedef struct ocr_driver -{ - void* (*init)(int game_character_set); - void (*free)(void* data); - - /* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to get_text */ - char* (*get_text)(void* data, struct ocr_image_info image); - - const char *ident; -} ocr_driver_t; - -#ifdef HAVE_TESSERACT -extern const ocr_driver_t ocr_tesseract; -#endif -extern const ocr_driver_t ocr_null; - -bool ocr_driver_init(void); -void ocr_driver_free(void); - -/* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to ocr_driver_get_text */ -char* ocr_driver_get_text(struct ocr_image_info image); - -RETRO_END_DECLS - +#ifndef __OCR_DRIVER__H +#define __OCR_DRIVER__H + +#include +#include + +RETRO_BEGIN_DECLS + +struct ocr_image_info +{ + unsigned width; + unsigned height; + unsigned pixel_format; + void* data; +}; + +typedef struct ocr_driver +{ + void* (*init)(int game_character_set); + void (*free)(void* data); + + /* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to get_text */ + char* (*get_text)(void* data, struct ocr_image_info image); + + const char *ident; +} ocr_driver_t; + +#ifdef HAVE_TESSERACT +extern const ocr_driver_t ocr_tesseract; +#endif +extern const ocr_driver_t ocr_null; + +bool ocr_driver_init(void); +void ocr_driver_free(void); + +/* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to ocr_driver_get_text */ +char* ocr_driver_get_text(struct ocr_image_info image); + +RETRO_END_DECLS + #endif \ No newline at end of file diff --git a/translation/translation_driver.c b/translation/translation_driver.c index 9ab3eb32b1..2ff6ea4f0e 100644 --- a/translation/translation_driver.c +++ b/translation/translation_driver.c @@ -1,67 +1,67 @@ -#include - -#include "translation_driver.h" -#include "ocr_driver.h" -#include "../configuration.h" - -static const translation_driver_t *translation_backends[] = { - &translation_cached_google, - &ocr_null, - NULL -}; - -static const translation_driver_t *current_translation_backend = NULL; -static void *translation_data = NULL; - -static const translation_driver_t *translation_find_backend( - const char* ident) -{ - unsigned i; - - for (i = 0; translation_backends[i]; i++) - { - if (string_is_equal(translation_backends[i]->ident, ident)) - return translation_backends[i]; - } - - return NULL; -} - -bool translation_driver_init(void) -{ - settings_t *settings = config_get_ptr(); - - if (!settings) - return false; - - current_translation_backend = translation_find_backend( - settings->arrays.translation_driver); - translation_data = NULL; - - if (current_translation_backend) - translation_data = (*current_translation_backend->init)(); - return translation_data != NULL; -} - -void translation_driver_free(void) -{ - if (current_translation_backend && translation_data) - (*current_translation_backend->free)(translation_data); -} - -char* translation_driver_translate_image(struct ocr_image_info image) -{ - char* translated_text = NULL; - - if (current_translation_backend && translation_data) - { - if (current_translation_backend->translate_image) - translated_text = (*current_translation_backend->translate_image) - (translation_data, image); - else - translated_text = (*current_translation_backend->translate_text) - (translation_data, ocr_driver_get_text(image)); - } - - return translated_text; -} +#include + +#include "translation_driver.h" +#include "ocr_driver.h" +#include "../configuration.h" + +static const translation_driver_t *translation_backends[] = { + &translation_cached_google, + &ocr_null, + NULL +}; + +static const translation_driver_t *current_translation_backend = NULL; +static void *translation_data = NULL; + +static const translation_driver_t *translation_find_backend( + const char* ident) +{ + unsigned i; + + for (i = 0; translation_backends[i]; i++) + { + if (string_is_equal(translation_backends[i]->ident, ident)) + return translation_backends[i]; + } + + return NULL; +} + +bool translation_driver_init(void) +{ + settings_t *settings = config_get_ptr(); + + if (!settings) + return false; + + current_translation_backend = translation_find_backend( + settings->arrays.translation_driver); + translation_data = NULL; + + if (current_translation_backend) + translation_data = (*current_translation_backend->init)(); + return translation_data != NULL; +} + +void translation_driver_free(void) +{ + if (current_translation_backend && translation_data) + (*current_translation_backend->free)(translation_data); +} + +char* translation_driver_translate_image(struct ocr_image_info image) +{ + char* translated_text = NULL; + + if (current_translation_backend && translation_data) + { + if (current_translation_backend->translate_image) + translated_text = (*current_translation_backend->translate_image) + (translation_data, image); + else + translated_text = (*current_translation_backend->translate_text) + (translation_data, ocr_driver_get_text(image)); + } + + return translated_text; +} diff --git a/translation/translation_driver.h b/translation/translation_driver.h index 561a2952c1..da9b063a89 100644 --- a/translation/translation_driver.h +++ b/translation/translation_driver.h @@ -1,51 +1,51 @@ -#ifndef __TRANSLATION_DRIVER__H -#define __TRANSLATION_DRIVER__H - -#include -#include - -#include "ocr_driver.h" - -RETRO_BEGIN_DECLS - -enum translation_init_errors -{ - TRANSLATION_INIT_SUCCESS = 0, - TRANSLATION_INIT_UNSUPPORTED_DEVICE_LANGUAGE, - TRANSLATION_INIT_UNSUPPORTED_GAME_LANGUAGE, - TRANSLATION_INIT_UNKNOWN_DEVICE_LANGUAGE, - TRANSLATION_INIT_UNKNOWN_GAME_LANGUAGE -}; - -struct translation_driver_info -{ - int device_language; - int game_language; -}; - -typedef struct translation_driver -{ - void* (*init)(const struct translation_driver_info *params); - void (*free)(void* data); - - /* use translate_image if non NULL else run image through ocr driver then run translate_text */ - /* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to translate_image/text */ - /* NOTE: translate_image is allowed to call the ocr driver itself if it wants */ - char* (*translate_text)(void* data, const char* game_text); - char* (*translate_image)(void* data, struct ocr_image_info image); - - const char *ident; -} translation_driver_t; - -extern const translation_driver_t translation_cached_google; -extern const translation_driver_t translation_null; - -bool translation_driver_init(void); -void translation_driver_free(void); - -/* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to translation_driver_translate_image */ -char* translation_driver_translate_image(struct ocr_image_info image); - -RETRO_END_DECLS - +#ifndef __TRANSLATION_DRIVER__H +#define __TRANSLATION_DRIVER__H + +#include +#include + +#include "ocr_driver.h" + +RETRO_BEGIN_DECLS + +enum translation_init_errors +{ + TRANSLATION_INIT_SUCCESS = 0, + TRANSLATION_INIT_UNSUPPORTED_DEVICE_LANGUAGE, + TRANSLATION_INIT_UNSUPPORTED_GAME_LANGUAGE, + TRANSLATION_INIT_UNKNOWN_DEVICE_LANGUAGE, + TRANSLATION_INIT_UNKNOWN_GAME_LANGUAGE +}; + +struct translation_driver_info +{ + int device_language; + int game_language; +}; + +typedef struct translation_driver +{ + void* (*init)(const struct translation_driver_info *params); + void (*free)(void* data); + + /* use translate_image if non NULL else run image through ocr driver then run translate_text */ + /* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to translate_image/text */ + /* NOTE: translate_image is allowed to call the ocr driver itself if it wants */ + char* (*translate_text)(void* data, const char* game_text); + char* (*translate_image)(void* data, struct ocr_image_info image); + + const char *ident; +} translation_driver_t; + +extern const translation_driver_t translation_cached_google; +extern const translation_driver_t translation_null; + +bool translation_driver_init(void); +void translation_driver_free(void); + +/* returned char pointers do not need to be freed but are 1 time use, they may be destroyed on the next call to translation_driver_translate_image */ +char* translation_driver_translate_image(struct ocr_image_info image); + +RETRO_END_DECLS + #endif \ No newline at end of file diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m index fa1834a04e..78f3759a55 100644 --- a/ui/drivers/cocoa/cocoa_common.m +++ b/ui/drivers/cocoa/cocoa_common.m @@ -1,7 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2013-2014 - Jason Fetters * Copyright (C) 2011-2017 - Daniel De Matteis - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -63,7 +63,7 @@ void *glkitview_init(void); #ifdef HAVE_COCOATOUCH @interface CocoaView() { - + } @end #endif @@ -83,27 +83,27 @@ void *glkitview_init(void); { if (!g_instance) g_instance = [CocoaView new]; - + return g_instance; } - (id)init { self = [super init]; - + #if defined(HAVE_COCOA) [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; ui_window_cocoa_t cocoa_view; cocoa_view.data = (CocoaView*)self; - + [self registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]]; #elif defined(HAVE_COCOATOUCH) self.view = (__bridge GLKView*)glkitview_init(); -#if TARGET_OS_IOS +#if TARGET_OS_IOS [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showPauseIndicator) name:UIApplicationWillEnterForegroundNotification object:nil]; -#endif #endif - +#endif + return self; } @@ -134,20 +134,20 @@ void *glkitview_init(void); { NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; NSPasteboard *pboard = [sender draggingPasteboard]; - + if ( [[pboard types] containsObject:NSFilenamesPboardType] ) { if (sourceDragMask & NSDragOperationCopy) return NSDragOperationCopy; } - + return NSDragOperationNone; } - (BOOL)performDragOperation:(id)sender { NSPasteboard *pboard = [sender draggingPasteboard]; - + if ( [[pboard types] containsObject:NSURLPboardType]) { NSURL *fileURL = [NSURL URLFromPasteboard:pboard]; @@ -218,7 +218,7 @@ void *glkitview_init(void); UIInterfaceOrientation orientation = self.interfaceOrientation; CGRect screenSize = [screen bounds]; SEL selector = NSSelectorFromString(BOXSTRING("coordinateSpace")); - + if ([screen respondsToSelector:selector]) { screenSize = [[screen coordinateSpace] bounds]; @@ -230,10 +230,10 @@ void *glkitview_init(void); width = ((int)orientation < 3) ? CGRectGetWidth(screenSize) : CGRectGetHeight(screenSize); height = ((int)orientation < 3) ? CGRectGetHeight(screenSize) : CGRectGetWidth(screenSize); } - + tenpctw = width / 10.0f; tenpcth = height / 10.0f; - + g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth); [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth); [self adjustViewFrameForSafeArea]; @@ -272,7 +272,7 @@ void *glkitview_init(void); default: return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskAll); } - + return YES; } #endif @@ -287,7 +287,7 @@ void *glkitview_init(void); [self setNeedsUpdateOfHomeIndicatorAutoHidden]; } #elif TARGET_OS_TV - + #endif } @@ -371,16 +371,16 @@ static void event_process_camera_frame(void *pbuf_ptr) CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)pbuf_ptr; size_t width = CVPixelBufferGetWidth(pixelBuffer); size_t height = CVPixelBufferGetHeight(pixelBuffer); - + CVPixelBufferLockBaseAddress(pixelBuffer, 0); - + (void)width; (void)height; - + /*TODO - rewrite all this. * * create a texture from our render target. - * textureCache will be what you previously + * textureCache will be what you previously * made with RCVOpenGLTextureCacheCreate. */ #ifdef HAVE_OPENGLES @@ -398,17 +398,17 @@ static void event_process_camera_frame(void *pbuf_ptr) RARCH_ERR("[apple_camera]: RCVOpenGLTextureCacheCreateTextureFromImage failed.\n"); return; } - + outputTexture = RCVOpenGLTextureGetName(renderTexture); gl_bind_texture(outputTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR); - + CVPixelBufferUnlockBaseAddress(pixelBuffer, 0); [[NSNotificationCenter defaultCenter] postNotificationName:@"NewCameraTextureReady" object:nil]; newFrame = true; - + glBindTexture(GL_TEXTURE_2D, 0); - + RCVOpenGLTextureCacheFlush(textureCache, 0); CFRelease(renderTexture); @@ -437,42 +437,42 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer CVReturn ret = RCVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, RCVOpenGLGetCurrentContext(), NULL, &textureCache); (void)ret; - + /* Setup Capture Session. */ _session = [[AVCaptureSession alloc] init]; [_session beginConfiguration]; - + /* TODO: dehardcode this based on device capabilities */ _sessionPreset = AVCaptureSessionPreset640x480; - + /* Set preset session size. */ [_session setSessionPreset:_sessionPreset]; - + /* Creata a video device and input from that Device. Add the input to the capture session. */ videoDevice = (AVCaptureDevice*)[AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo]; if (videoDevice == nil) retro_assert(0); - + /* Add the device to the session. */ input = (AVCaptureDeviceInput*)[AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error]; - + if (error) { RARCH_ERR("video device input %s\n", error.localizedDescription.UTF8String); retro_assert(0); } - + [_session addInput:input]; - + /* Create the output for the capture session. */ dataOutput = (AVCaptureVideoDataOutput*)[[AVCaptureVideoDataOutput alloc] init]; [dataOutput setAlwaysDiscardsLateVideoFrames:NO]; /* Probably want to set this to NO when recording. */ - + [dataOutput setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]]; - + /* Set dispatch to be on the main thread so OpenGL can do things with the data. */ [dataOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()]; - + [_session addOutput:dataOutput]; [_session commitConfiguration]; } @@ -507,10 +507,10 @@ static CLLocationAccuracy currentVerticalAccuracy; - (bool)onLocationHasChanged { bool hasChanged = locationChanged; - + if (hasChanged) locationChanged = false; - + return hasChanged; } @@ -527,7 +527,7 @@ static CLLocationAccuracy currentVerticalAccuracy; - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations { CLLocation *location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)]; - + locationChanged = true; currentLatitude = [location coordinate].latitude; currentLongitude = [location coordinate].longitude; @@ -553,10 +553,10 @@ static CLLocationAccuracy currentVerticalAccuracy; - (void)onLocationInit { - /* Create the location manager + /* Create the location manager * if this object does not already have one. */ - + if (locationManager == nil) locationManager = [[CLLocationManager alloc] init]; locationManager.delegate = self; @@ -577,7 +577,7 @@ typedef struct apple_camera static void *apple_camera_init(const char *device, uint64_t caps, unsigned width, unsigned height) { applecamera_t *applecamera; - + if ((caps & (UINT64_C(1) << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE)) == 0) { RARCH_ERR("applecamera returns OpenGL texture.\n"); @@ -596,7 +596,7 @@ static void *apple_camera_init(const char *device, uint64_t caps, unsigned width static void apple_camera_free(void *data) { applecamera_t *applecamera = (applecamera_t*)data; - + [[CocoaView get] onCameraFree]; if (applecamera) @@ -627,14 +627,14 @@ static bool apple_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t f if (frame_gl_cb && newFrame) { - /* FIXME: Identity for now. + /* FIXME: Identity for now. * Use proper texture matrix as returned by iOS Camera (if at all?). */ static const float affine[] = { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f }; - + frame_gl_cb(outputTexture, GL_TEXTURE_2D, affine); newFrame = false; } @@ -663,25 +663,25 @@ static void *apple_location_init(void) applelocation_t *applelocation = (applelocation_t*)calloc(1, sizeof(applelocation_t)); if (!applelocation) return NULL; - + [[CocoaView get] onLocationInit]; - + return applelocation; } static void apple_location_set_interval(void *data, unsigned interval_update_ms, unsigned interval_distance) { (void)data; - + locationManager.distanceFilter = interval_distance ? interval_distance : kCLDistanceFilterNone; } static void apple_location_free(void *data) { applelocation_t *applelocation = (applelocation_t*)data; - + /* TODO - free location manager? */ - + if (applelocation) free(applelocation); applelocation = NULL; @@ -690,7 +690,7 @@ static void apple_location_free(void *data) static bool apple_location_start(void *data) { (void)data; - + [locationManager startUpdatingLocation]; return true; } @@ -698,7 +698,7 @@ static bool apple_location_start(void *data) static void apple_location_stop(void *data) { (void)data; - + [locationManager stopUpdatingLocation]; } @@ -711,7 +711,7 @@ static bool apple_location_get_position(void *data, double *lat, double *lon, do if (!ret) goto fail; - + *lat = currentLatitude; *lon = currentLongitude; *horiz_accuracy = currentHorizontalAccuracy; diff --git a/ui/drivers/cocoa/cocoa_common_metal.m b/ui/drivers/cocoa/cocoa_common_metal.m index 241ec14744..fd0b9a089c 100644 --- a/ui/drivers/cocoa/cocoa_common_metal.m +++ b/ui/drivers/cocoa/cocoa_common_metal.m @@ -1,7 +1,7 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2013-2014 - Jason Fetters * Copyright (C) 2011-2017 - Daniel De Matteis - * + * * RetroArch is free software: you can redistribute it and/or modify it under the terms * of the GNU General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -90,23 +90,23 @@ void *glkitview_init(void); { if (!g_instance) g_instance = [CocoaView new]; - + return g_instance; } - (id)init { self = [super init]; - + #if defined(HAVE_COCOA_METAL) [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [self registerForDraggedTypes:@[NSColorPboardType, NSFilenamesPboardType]]; #elif defined(HAVE_COCOATOUCH) self.view = (__bridge GLKView*)glkitview_init(); - + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showPauseIndicator) name:UIApplicationWillEnterForegroundNotification object:nil]; #endif - + return self; } @@ -140,20 +140,20 @@ void *glkitview_init(void); { NSDragOperation sourceDragMask = [sender draggingSourceOperationMask]; NSPasteboard *pboard = [sender draggingPasteboard]; - + if ( [[pboard types] containsObject:NSFilenamesPboardType] ) { if (sourceDragMask & NSDragOperationCopy) return NSDragOperationCopy; } - + return NSDragOperationNone; } - (BOOL)performDragOperation:(id)sender { NSPasteboard *pboard = [sender draggingPasteboard]; - + if ( [[pboard types] containsObject:NSURLPboardType]) { NSURL *fileURL = [NSURL URLFromPasteboard:pboard]; @@ -205,7 +205,7 @@ void *glkitview_init(void); UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation]; CGRect screenSize = [screen bounds]; SEL selector = NSSelectorFromString(BOXSTRING("coordinateSpace")); - + if ([screen respondsToSelector:selector]) { screenSize = [[screen coordinateSpace] bounds]; @@ -217,13 +217,13 @@ void *glkitview_init(void); width = ((int)orientation < 3) ? CGRectGetWidth(screenSize) : CGRectGetHeight(screenSize); height = ((int)orientation < 3) ? CGRectGetHeight(screenSize) : CGRectGetWidth(screenSize); } - + tenpctw = width / 10.0f; tenpcth = height / 10.0f; - + g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth); [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth); - + [self adjustViewFrameForSafeArea]; } @@ -256,7 +256,6 @@ void *glkitview_init(void); } } - #define ALMOST_INVISIBLE (.021f) - (void)hidePauseButton @@ -290,7 +289,7 @@ void *glkitview_init(void); default: return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskAll); } - + return YES; } #endif @@ -337,16 +336,16 @@ static void event_process_camera_frame(void *pbuf_ptr) CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)pbuf_ptr; size_t width = CVPixelBufferGetWidth(pixelBuffer); size_t height = CVPixelBufferGetHeight(pixelBuffer); - + CVPixelBufferLockBaseAddress(pixelBuffer, 0); - + (void)width; (void)height; - + /*TODO - rewrite all this. * * create a texture from our render target. - * textureCache will be what you previously + * textureCache will be what you previously * made with RCVOpenGLTextureCacheCreate. */ #ifdef HAVE_OPENGLES @@ -364,17 +363,17 @@ static void event_process_camera_frame(void *pbuf_ptr) RARCH_ERR("[apple_camera]: RCVOpenGLTextureCacheCreateTextureFromImage failed.\n"); return; } - + outputTexture = RCVOpenGLTextureGetName(renderTexture); gl_bind_texture(outputTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR); - + CVPixelBufferUnlockBaseAddress(pixelBuffer, 0); [[NSNotificationCenter defaultCenter] postNotificationName:@"NewCameraTextureReady" object:nil]; newFrame = true; - + glBindTexture(GL_TEXTURE_2D, 0); - + RCVOpenGLTextureCacheFlush(textureCache, 0); CFRelease(renderTexture); @@ -403,42 +402,42 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer CVReturn ret = RCVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, RCVOpenGLGetCurrentContext(), NULL, &textureCache); (void)ret; - + /* Setup Capture Session. */ _session = [[AVCaptureSession alloc] init]; [_session beginConfiguration]; - + /* TODO: dehardcode this based on device capabilities */ _sessionPreset = AVCaptureSessionPreset640x480; - + /* Set preset session size. */ [_session setSessionPreset:_sessionPreset]; - + /* Creata a video device and input from that Device. Add the input to the capture session. */ videoDevice = (AVCaptureDevice*)[AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo]; if (videoDevice == nil) retro_assert(0); - + /* Add the device to the session. */ input = (AVCaptureDeviceInput*)[AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error]; - + if (error) { RARCH_ERR("video device input %s\n", error.localizedDescription.UTF8String); retro_assert(0); } - + [_session addInput:input]; - + /* Create the output for the capture session. */ dataOutput = (AVCaptureVideoDataOutput*)[[AVCaptureVideoDataOutput alloc] init]; [dataOutput setAlwaysDiscardsLateVideoFrames:NO]; /* Probably want to set this to NO when recording. */ - + [dataOutput setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]]; - + /* Set dispatch to be on the main thread so OpenGL can do things with the data. */ [dataOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()]; - + [_session addOutput:dataOutput]; [_session commitConfiguration]; } @@ -473,10 +472,10 @@ static CLLocationAccuracy currentVerticalAccuracy; - (bool)onLocationHasChanged { bool hasChanged = locationChanged; - + if (hasChanged) locationChanged = false; - + return hasChanged; } @@ -493,7 +492,7 @@ static CLLocationAccuracy currentVerticalAccuracy; - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations { CLLocation *location = (CLLocation*)[locations objectAtIndex:([locations count] - 1)]; - + locationChanged = true; currentLatitude = [location coordinate].latitude; currentLongitude = [location coordinate].longitude; @@ -519,10 +518,10 @@ static CLLocationAccuracy currentVerticalAccuracy; - (void)onLocationInit { - /* Create the location manager + /* Create the location manager * if this object does not already have one. */ - + if (locationManager == nil) locationManager = [[CLLocationManager alloc] init]; locationManager.delegate = self; @@ -543,7 +542,7 @@ typedef struct apple_camera static void *apple_camera_init(const char *device, uint64_t caps, unsigned width, unsigned height) { applecamera_t *applecamera; - + if ((caps & (UINT64_C(1) << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE)) == 0) { RARCH_ERR("applecamera returns OpenGL texture.\n"); @@ -562,7 +561,7 @@ static void *apple_camera_init(const char *device, uint64_t caps, unsigned width static void apple_camera_free(void *data) { applecamera_t *applecamera = (applecamera_t*)data; - + [[CocoaView get] onCameraFree]; if (applecamera) @@ -593,14 +592,14 @@ static bool apple_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t f if (frame_gl_cb && newFrame) { - /* FIXME: Identity for now. + /* FIXME: Identity for now. * Use proper texture matrix as returned by iOS Camera (if at all?). */ static const float affine[] = { 1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 1.0f }; - + frame_gl_cb(outputTexture, GL_TEXTURE_2D, affine); newFrame = false; } @@ -629,25 +628,25 @@ static void *apple_location_init(void) applelocation_t *applelocation = (applelocation_t*)calloc(1, sizeof(applelocation_t)); if (!applelocation) return NULL; - + [[CocoaView get] onLocationInit]; - + return applelocation; } static void apple_location_set_interval(void *data, unsigned interval_update_ms, unsigned interval_distance) { (void)data; - + locationManager.distanceFilter = interval_distance ? interval_distance : kCLDistanceFilterNone; } static void apple_location_free(void *data) { applelocation_t *applelocation = (applelocation_t*)data; - + /* TODO - free location manager? */ - + if (applelocation) free(applelocation); applelocation = NULL; @@ -656,7 +655,7 @@ static void apple_location_free(void *data) static bool apple_location_start(void *data) { (void)data; - + [locationManager startUpdatingLocation]; return true; } @@ -664,7 +663,7 @@ static bool apple_location_start(void *data) static void apple_location_stop(void *data) { (void)data; - + [locationManager stopUpdatingLocation]; } @@ -677,7 +676,7 @@ static bool apple_location_get_position(void *data, double *lat, double *lon, do if (!ret) goto fail; - + *lat = currentLatitude; *lon = currentLongitude; *horiz_accuracy = currentHorizontalAccuracy; diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 500591aee8..18b8cb5828 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -650,13 +650,11 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath [message show]; } - -(void)msgQueuePush:(NSString *)msg { self.osdmessage.text = msg; } - - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)buttonIndex { menu_ctx_iterate_t iter; diff --git a/ui/drivers/cocoa/ui_cocoa_browser_window.m b/ui/drivers/cocoa/ui_cocoa_browser_window.m index af96902c1c..f93bed7efd 100644 --- a/ui/drivers/cocoa/ui_cocoa_browser_window.m +++ b/ui/drivers/cocoa/ui_cocoa_browser_window.m @@ -29,7 +29,7 @@ static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state) { NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel]; NSArray *filetypes = NULL; - + if (!string_is_empty(state->filters)) filetypes = [[NSArray alloc] initWithObjects:BOXSTRING(state->filters), BOXSTRING(state->filters_title), nil]; [panel setAllowedFileTypes:filetypes]; @@ -51,7 +51,7 @@ static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state) NSURL *url = (NSURL*)panel.URL; const char *res_path = [url.path UTF8String]; state->result = strdup(res_path); - + return true; } diff --git a/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m b/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m index 747df254a1..98a46cc8e2 100644 --- a/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m +++ b/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m @@ -28,12 +28,12 @@ static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state) { NSOpenPanel *panel = [NSOpenPanel openPanel]; - + if (!string_is_empty(state->filters)) { [panel setAllowedFileTypes:@[BOXSTRING(state->filters), BOXSTRING(state->filters_title)]]; } - + panel.title = NSLocalizedString(BOXSTRING(state->title), BOXSTRING("open panel")); panel.directoryURL = [NSURL fileURLWithPath:BOXSTRING(state->startdir)]; panel.canChooseDirectories = NO; @@ -45,7 +45,7 @@ static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state) return false; const char *res_path = [panel.URL.path UTF8String]; state->result = strdup(res_path); - + return true; } diff --git a/ui/drivers/cocoa/ui_cocoa_msg_window.m b/ui/drivers/cocoa/ui_cocoa_msg_window.m index d5e4ec9713..8b9ebb3e70 100644 --- a/ui/drivers/cocoa/ui_cocoa_msg_window.m +++ b/ui/drivers/cocoa/ui_cocoa_msg_window.m @@ -31,11 +31,11 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat { NSInteger response; NSAlert* alert = [[NSAlert new] autorelease]; - + if (!string_is_empty(state->title)) [alert setMessageText:BOXSTRING(state->title)]; [alert setInformativeText:BOXSTRING(state->text)]; - + switch (state->buttons) { case UI_MSG_WINDOW_OK: @@ -55,7 +55,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat [alert addButtonWithTitle:BOXSTRING("Cancel")]; break; } - + switch (type) { case UI_MSG_WINDOW_TYPE_ERROR: @@ -71,13 +71,13 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat [alert setAlertStyle:NSInformationalAlertStyle]; break; } - + [alert beginSheetModalForWindow:ui_companion_driver_get_main_window() modalDelegate:apple_platform didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil]; response = [[NSApplication sharedApplication] runModalForWindow:[alert window]]; - + switch (state->buttons) { case UI_MSG_WINDOW_OK: @@ -105,7 +105,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat return UI_MSG_RESPONSE_CANCEL; break; } - + return UI_MSG_RESPONSE_NA; } diff --git a/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m b/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m index 25d110b358..cc103bdb36 100644 --- a/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m +++ b/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m @@ -29,11 +29,11 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat { NSModalResponse response; NSAlert *alert = [NSAlert new]; - + if (!string_is_empty(state->title)) [alert setMessageText:BOXSTRING(state->title)]; [alert setInformativeText:BOXSTRING(state->text)]; - + switch (state->buttons) { case UI_MSG_WINDOW_OK: @@ -53,7 +53,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat [alert addButtonWithTitle:BOXSTRING("Cancel")]; break; } - + switch (type) { case UI_MSG_WINDOW_TYPE_ERROR: @@ -75,7 +75,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat [[NSApplication sharedApplication] stopModalWithCode:returnCode]; }]; response = [alert runModal]; - + switch (state->buttons) { case UI_MSG_WINDOW_OK: @@ -103,7 +103,7 @@ static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_stat return UI_MSG_RESPONSE_CANCEL; break; } - + return UI_MSG_RESPONSE_NA; } diff --git a/ui/drivers/qt/playlistthumbnaildownload.cpp b/ui/drivers/qt/playlistthumbnaildownload.cpp index 6caaf2f9c3..74c97a2599 100644 --- a/ui/drivers/qt/playlistthumbnaildownload.cpp +++ b/ui/drivers/qt/playlistthumbnaildownload.cpp @@ -242,7 +242,7 @@ void MainWindow::downloadNextPlaylistThumbnail(QString system, QString title, QS if (!m_playlistThumbnailDownloadFile.open(QIODevice::WriteOnly)) { m_failedThumbnails++; - + RARCH_ERR("[Qt]: Could not open file for writing: %s\n", fileNameData); if (m_pendingPlaylistThumbnails.count() > 0) diff --git a/ui/drivers/qt/qt_playlist.cpp b/ui/drivers/qt/qt_playlist.cpp index 2bd62e14d3..2ebcc684a0 100644 --- a/ui/drivers/qt/qt_playlist.cpp +++ b/ui/drivers/qt/qt_playlist.cpp @@ -168,7 +168,7 @@ QString PlaylistModel::getSanitizedThumbnailName(QString label) const } QString PlaylistModel::getThumbnailPath(const QHash &hash, QString type) const -{ +{ if (isSupportedImage(hash["path"])) { /* use thumbnail widgets to show regular image files */ diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp index 7f015f8cb8..8b3ca88e13 100644 --- a/ui/drivers/qt/ui_qt_window.cpp +++ b/ui/drivers/qt/ui_qt_window.cpp @@ -1987,7 +1987,7 @@ void MainWindow::loadContent(const QHash &contentHash) void MainWindow::onRunClicked() { QHash contentHash; - + switch (m_currentBrowser) { case BROWSER_TYPE_FILES: @@ -1997,10 +1997,10 @@ void MainWindow::onRunClicked() contentHash = getCurrentContentHash(); break; } - + if (contentHash.isEmpty()) return; - + loadContent(contentHash); } @@ -2208,7 +2208,6 @@ void MainWindow::setCoreActions() } } - void MainWindow::onTabWidgetIndexChanged(int index) { if (m_browserAndPlaylistTabWidget->tabText(index) == msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_TAB_FILE_BROWSER)) diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index c6fc4447e4..26a5b90b34 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -289,7 +289,6 @@ static char** waiting_argv; return reply; } - - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { if (filenames.count == 1 && filenames[0]) diff --git a/ui/drivers/ui_cocoa_metal.m b/ui/drivers/ui_cocoa_metal.m index 3df31b91f6..3f14ff3c32 100644 --- a/ui/drivers/ui_cocoa_metal.m +++ b/ui/drivers/ui_cocoa_metal.m @@ -86,7 +86,7 @@ static void app_terminate(void) - (void)sendEvent:(NSEvent *)event { [super sendEvent:event]; - + cocoa_input_data_t *apple = NULL; NSEventType event_type = event.type; @@ -205,20 +205,19 @@ static char** waiting_argv; @synthesize window = _window; - - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { unsigned i; apple_platform = self; self.window.collectionBehavior = NSWindowCollectionBehaviorFullScreenPrimary; - + _listener = [WindowListener new]; - + [self.window setAcceptsMouseMovedEvents: YES]; [self.window setNextResponder:_listener]; self.window.delegate = _listener; - + [[self.window contentView] setAutoresizesSubviews:YES]; for (i = 0; i < waiting_argc; i++) @@ -234,10 +233,10 @@ static char** waiting_argv; app_terminate(); waiting_argc = 0; - + [self.window makeMainWindow]; [self.window makeKeyWindow]; - + [self performSelectorOnMainThread:@selector(rarch_main) withObject:nil waitUntilDone:NO]; } @@ -247,9 +246,9 @@ static char** waiting_argv; if (vt == _vt) { return; } - + RARCH_LOG("[Cocoa]: change view type: %d → %d\n", _vt, vt); - + _vt = vt; if (_renderView != nil) { @@ -259,7 +258,7 @@ static char** waiting_argv; self.window.contentView = nil; _renderView = nil; } - + switch (vt) { case APPLE_VIEW_TYPE_VULKAN: case APPLE_VIEW_TYPE_METAL: @@ -270,21 +269,21 @@ static char** waiting_argv; _renderView = v; } break; - + case APPLE_VIEW_TYPE_OPENGL: { _renderView = [CocoaView get]; break; } - + case APPLE_VIEW_TYPE_NONE: default: return; } - + _renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable; [_renderView setFrame: [[self.window contentView] bounds]]; - + self.window.contentView = _renderView; self.window.contentView.nextResponder = _listener; } @@ -308,12 +307,12 @@ static char** waiting_argv; [self.window toggleFullScreen:self]; return; } - + if (!mode.fullscreen && isFullScreen) { [self.window toggleFullScreen:self]; } - + if (mode.width > 0) { // HACK(sgc): ensure MTKView posts a drawable resize event @@ -343,7 +342,6 @@ static char** waiting_argv; return YES; } - - (void) rarch_main { do @@ -403,7 +401,6 @@ static char** waiting_argv; return reply; } - - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { if (filenames.count == 1 && [filenames objectAtIndex:0]) diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index 2192f62cd6..cacf26ec49 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -108,7 +108,7 @@ apple_frontend_settings_t apple_frontend_settings; void get_ios_version(int *major, int *minor) { NSArray *decomposed_os_version = [[UIDevice currentDevice].systemVersion componentsSeparatedByString:@"."]; - + if (major && decomposed_os_version.count > 0) *major = (int)[decomposed_os_version[0] integerValue]; if (minor && decomposed_os_version.count > 1) @@ -128,12 +128,12 @@ static void handle_touch_event(NSArray* touches) return; apple->touch_count = 0; - + for (i = 0; i < touches.count && (apple->touch_count < MAX_TOUCHES); i++) { CGPoint coord; UITouch *touch = [touches objectAtIndex:i]; - + if (touch.view != [CocoaView get].view) continue; @@ -192,12 +192,12 @@ enum * for each keypress, that's fine for polling * but is bad for business with events. */ static double last_time_stamp; - + if (last_time_stamp == event.timestamp) return [super handleKeyUIEvent:event]; - + last_time_stamp = event.timestamp; - + /* If the _hidEvent is null, [event _keyCode] will crash. * (This happens with the on screen keyboard). */ if (event._hidEvent) @@ -205,34 +205,34 @@ enum NSString *ch = (NSString*)event._privateInput; uint32_t character = 0; uint32_t mod = 0; - + mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; - + if (ch && ch.length != 0) { unsigned i; character = [ch characterAtIndex:0]; - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, 0, mod, RETRO_DEVICE_KEYBOARD); - + for (i = 1; i < ch.length; i++) apple_input_keyboard_event(event._isKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, character, mod, RETRO_DEVICE_KEYBOARD); } - + [super handleKeyUIEvent:event]; } @@ -243,11 +243,11 @@ enum * for each keypress, that's fine for polling * but is bad for business with events. */ static double last_time_stamp; - + if (last_time_stamp == event.timestamp) return [super _keyCommandForEvent:event]; last_time_stamp = event.timestamp; - + /* If the _hidEvent is null, [event _keyCode] will crash. * (This happens with the on screen keyboard). */ if (event._hidEvent) @@ -255,14 +255,14 @@ enum NSString *ch = (NSString*)event._privateInput; uint32_t character = 0; uint32_t mod = 0; - + mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; - + if (ch && ch.length != 0) { unsigned i; @@ -271,13 +271,13 @@ enum apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, 0, mod, RETRO_DEVICE_KEYBOARD); - + for (i = 1; i < ch.length; i++) apple_input_keyboard_event(event._isKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, character, mod, RETRO_DEVICE_KEYBOARD); @@ -299,7 +299,7 @@ enum handle_touch_event(event.allTouches.allObjects); get_ios_version(&major, &minor); - + #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000 if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)]) { @@ -338,12 +338,12 @@ enum -(NSString*)documentsDirectory { if ( _documentsDirectory == nil ) { -#if TARGET_OS_IOS +#if TARGET_OS_IOS NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); #elif TARGET_OS_TV NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES); -#endif - +#endif + _documentsDirectory = paths.firstObject; } return _documentsDirectory; @@ -386,7 +386,7 @@ enum iterate_observer = CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting, true, 0, rarch_draw_observer, 0); CFRunLoopAddObserver(CFRunLoopGetMain(), iterate_observer, kCFRunLoopCommonModes); - + #ifdef HAVE_MFI extern bool apple_gamecontroller_joypad_init(void *data); apple_gamecontroller_joypad_init(NULL); @@ -411,13 +411,13 @@ enum - (void)applicationDidBecomeActive:(UIApplication *)application { settings_t *settings = config_get_ptr(); - + #ifdef HAVE_AVFOUNDATION [self supportOtherAudioSessions]; #endif if (settings->bools.ui_companion_start_on_boot) return; - + [self showGameView]; } @@ -437,12 +437,12 @@ enum { NSString *filename = (NSString*)url.path.lastPathComponent; NSError *error = nil; - + [[NSFileManager defaultManager] moveItemAtPath:[url path] toPath:[self.documentsDirectory stringByAppendingPathComponent:filename] error:&error]; - + if (error) printf("%s\n", [[error description] UTF8String]); - + return true; } @@ -460,14 +460,14 @@ enum /* implicitly initializes your audio session */ [self supportOtherAudioSessions]; #endif - + [self popToRootViewControllerAnimated:NO]; #if TARGET_OS_IOS [self setToolbarHidden:true animated:NO]; [[UIApplication sharedApplication] setStatusBarHidden:true withAnimation:UIStatusBarAnimationNone]; #endif - + [[UIApplication sharedApplication] setIdleTimerDisabled:true]; [self.window setRootViewController:[CocoaView get]]; @@ -485,12 +485,11 @@ enum #if TARGET_OS_IOS [[UIApplication sharedApplication] setStatusBarHidden:false withAnimation:UIStatusBarAnimationNone]; #endif - + [[UIApplication sharedApplication] setIdleTimerDisabled:false]; [self.window setRootViewController:self]; } - - (void)toggleUI { if (ui_companion_is_on_foreground()) @@ -511,7 +510,7 @@ enum #if TARGET_OS_IOS /* Get enabled orientations */ apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskAll; - + if (string_is_equal(apple_frontend_settings.orientations, "landscape")) apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape; else if (string_is_equal(apple_frontend_settings.orientations, "portrait")) @@ -594,7 +593,7 @@ static void apple_display_alert(const char *message, const char *title) static void apple_rarch_exited(void) { RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform; - + if (!ap) return; #ifdef HAVE_AVFOUNDATION @@ -633,7 +632,7 @@ static int ui_companion_cocoatouch_iterate(void *data, unsigned action) RetroArch_iOS *ap = (RetroArch_iOS*)apple_platform; (void)data; - + if (ap) [ap showPauseMenu:ap]; @@ -657,7 +656,7 @@ static void *ui_companion_cocoatouch_init(void) if (!handle) return NULL; - + rarch_enable_ui(); return handle; @@ -687,7 +686,7 @@ static void ui_companion_cocoatouch_notify_list_pushed(void *data, printf( "notify_list_pushed: old size should not be larger\n" ); old_size = new_size; - + if (ap) [ap mainMenuPushPop: pushp]; } diff --git a/ui/drivers/ui_cocoatouch_metal.m b/ui/drivers/ui_cocoatouch_metal.m index b1c21a624a..35e9155c49 100644 --- a/ui/drivers/ui_cocoatouch_metal.m +++ b/ui/drivers/ui_cocoatouch_metal.m @@ -108,7 +108,7 @@ apple_frontend_settings_t apple_frontend_settings; void get_ios_version(int *major, int *minor) { NSArray *decomposed_os_version = [[UIDevice currentDevice].systemVersion componentsSeparatedByString:@"."]; - + if (major && decomposed_os_version.count > 0) *major = (int)[decomposed_os_version[0] integerValue]; if (minor && decomposed_os_version.count > 1) @@ -128,12 +128,12 @@ static void handle_touch_event(NSArray* touches) return; apple->touch_count = 0; - + for (i = 0; i < touches.count && (apple->touch_count < MAX_TOUCHES); i++) { CGPoint coord; UITouch *touch = [touches objectAtIndex:i]; - + if (touch.view != [CocoaView get].view) continue; @@ -192,12 +192,12 @@ enum * for each keypress, that's fine for polling * but is bad for business with events. */ static double last_time_stamp; - + if (last_time_stamp == event.timestamp) return [super handleKeyUIEvent:event]; - + last_time_stamp = event.timestamp; - + /* If the _hidEvent is null, [event _keyCode] will crash. * (This happens with the on screen keyboard). */ if (event._hidEvent) @@ -205,64 +205,64 @@ enum NSString *ch = (NSString*)event._privateInput; uint32_t character = 0; uint32_t mod = 0; - + mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; - + if (ch && ch.length != 0) { unsigned i; character = [ch characterAtIndex:0]; - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, 0, mod, RETRO_DEVICE_KEYBOARD); - + for (i = 1; i < ch.length; i++) apple_input_keyboard_event(event._isKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, character, mod, RETRO_DEVICE_KEYBOARD); } - + [super handleKeyUIEvent:event]; } // This is for iOS versions < 9.0 - (id)_keyCommandForEvent:(UIEvent*)event { - /* This gets called twice with the same timestamp + /* This gets called twice with the same timestamp * for each keypress, that's fine for polling * but is bad for business with events. */ static double last_time_stamp; - + if (last_time_stamp == event.timestamp) return [super _keyCommandForEvent:event]; last_time_stamp = event.timestamp; - - /* If the _hidEvent is null, [event _keyCode] will crash. + + /* If the _hidEvent is null, [event _keyCode] will crash. * (This happens with the on screen keyboard). */ if (event._hidEvent) { NSString *ch = (NSString*)event._privateInput; uint32_t character = 0; uint32_t mod = 0; - + mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0; mod |= (event._modifierFlags & NSShiftKeyMask ) ? RETROKMOD_SHIFT : 0; mod |= (event._modifierFlags & NSControlKeyMask ) ? RETROKMOD_CTRL : 0; mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT : 0; mod |= (event._modifierFlags & NSCommandKeyMask ) ? RETROKMOD_META : 0; mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK : 0; - + if (ch && ch.length != 0) { unsigned i; @@ -271,13 +271,13 @@ enum apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, 0, mod, RETRO_DEVICE_KEYBOARD); - + for (i = 1; i < ch.length; i++) apple_input_keyboard_event(event._isKeyDown, 0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD); } - + apple_input_keyboard_event(event._isKeyDown, (uint32_t)event._keyCode, character, mod, RETRO_DEVICE_KEYBOARD); @@ -299,13 +299,13 @@ enum handle_touch_event(event.allTouches.allObjects); get_ios_version(&major, &minor); - + #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000 if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)]) { /* Keyboard event hack for iOS versions prior to iOS 7. * - * Derived from: + * Derived from: * http://nacho4d-nacho4d.blogspot.com/2012/01/catching-keyboard-events-in-ios.html */ const uint8_t *eventMem = objc_unretainedPointer([event performSelector:@selector(_gsEvent)]); @@ -379,7 +379,7 @@ enum iterate_observer = CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting, true, 0, rarch_draw_observer, 0); CFRunLoopAddObserver(CFRunLoopGetMain(), iterate_observer, kCFRunLoopCommonModes); - + #ifdef HAVE_MFI extern bool apple_gamecontroller_joypad_init(void *data); apple_gamecontroller_joypad_init(NULL); @@ -404,13 +404,13 @@ enum - (void)applicationDidBecomeActive:(UIApplication *)application { settings_t *settings = config_get_ptr(); - + #ifdef HAVE_AVFOUNDATION [self supportOtherAudioSessions]; #endif if (settings->bools.ui_companion_start_on_boot) return; - + [self showGameView]; } @@ -430,12 +430,12 @@ enum { NSString *filename = (NSString*)url.path.lastPathComponent; NSError *error = nil; - + [[NSFileManager defaultManager] moveItemAtPath:[url path] toPath:[self.documentsDirectory stringByAppendingPathComponent:filename] error:&error]; - + if (error) printf("%s\n", [[error description] UTF8String]); - + return true; } @@ -473,7 +473,6 @@ enum [self.window setRootViewController:self]; } - - (void)toggleUI { if (ui_companion_is_on_foreground()) @@ -493,15 +492,15 @@ enum { /* Get enabled orientations */ apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskAll; - + if (string_is_equal(apple_frontend_settings.orientations, "landscape")) apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape; else if (string_is_equal(apple_frontend_settings.orientations, "portrait")) - apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait + apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown; } -- (void)mainMenuRefresh +- (void)mainMenuRefresh { [self.mainmenu reloadData]; } @@ -525,7 +524,7 @@ enum self.menu_count--; [self popViewControllerAnimated:YES]; - self.mainmenu = self.mainmenu.last_menu; + self.mainmenu = self.mainmenu.last_menu; } } } @@ -569,7 +568,7 @@ static void apple_display_alert(const char *message, const char *title) static void apple_rarch_exited(void) { RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform; - + if (!ap) return; #ifdef HAVE_AVFOUNDATION @@ -608,7 +607,7 @@ static int ui_companion_cocoatouch_iterate(void *data, unsigned action) RetroArch_iOS *ap = (RetroArch_iOS*)apple_platform; (void)data; - + if (ap) [ap showPauseMenu:ap]; @@ -632,7 +631,7 @@ static void *ui_companion_cocoatouch_init(void) if (!handle) return NULL; - + rarch_enable_ui(); return handle; @@ -662,7 +661,7 @@ static void ui_companion_cocoatouch_notify_list_pushed(void *data, printf( "notify_list_pushed: old size should not be larger\n" ); old_size = new_size; - + if (ap) [ap mainMenuPushPop: pushp]; } diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 2536059777..00f61bb709 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -424,7 +424,6 @@ static void* ui_companion_qt_init(void) thumbnail3Widget = new ThumbnailWidget(THUMBNAIL_TYPE_SCREENSHOT); thumbnail3Widget->setObjectName("thumbnail3"); - QObject::connect(thumbnailWidget, SIGNAL(filesDropped(const QImage&, ThumbnailType)), mainwindow, SLOT(onThumbnailDropped(const QImage&, ThumbnailType))); QObject::connect(thumbnail2Widget, SIGNAL(filesDropped(const QImage&, ThumbnailType)), mainwindow, SLOT(onThumbnailDropped(const QImage&, ThumbnailType))); QObject::connect(thumbnail3Widget, SIGNAL(filesDropped(const QImage&, ThumbnailType)), mainwindow, SLOT(onThumbnailDropped(const QImage&, ThumbnailType))); diff --git a/ui/drivers/ui_qt.h b/ui/drivers/ui_qt.h index f578afeb67..b4ee8e0f71 100644 --- a/ui/drivers/ui_qt.h +++ b/ui/drivers/ui_qt.h @@ -166,7 +166,6 @@ private: void loadImage(const QModelIndex &index, const QString &path); }; - class ThumbnailWidget : public QStackedWidget { Q_OBJECT diff --git a/version.dtd b/version.dtd index ea61e030e4..bd0761a8bb 100644 --- a/version.dtd +++ b/version.dtd @@ -1 +1 @@ - + diff --git a/wii/libogc/libdb/debug_handler.S b/wii/libogc/libdb/debug_handler.S index 7a311a3c13..8bf073abe7 100644 --- a/wii/libogc/libdb/debug_handler.S +++ b/wii/libogc/libdb/debug_handler.S @@ -18,7 +18,7 @@ mfspr r0,919; \ stw r0,GQR7_OFFSET(sp); \ stmw r6,GPR6_OFFSET(sp) - + #define EXCEPTION_EPILOG \ lwz r4,GQR0_OFFSET(sp); \ mtspr 912,r4; \ @@ -66,11 +66,11 @@ dbg_exceptionhandler: nested: addi r6,r6,1 stw r6,__debug_nestlevel@l(r15) - + addi r3,r14,0x08 bl _cpu_context_save_fp bl c_debug_handler - + lwz r6,__debug_nestlevel@l(r15) addi r6,r6,-1 stw r6,__debug_nestlevel@l(r15) diff --git a/wii/libogc/libogc/cache_asm.S b/wii/libogc/libogc/cache_asm.S index 6782eb4109..4820ef1f18 100644 --- a/wii/libogc/libogc/cache_asm.S +++ b/wii/libogc/libogc/cache_asm.S @@ -25,10 +25,8 @@ must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - -------------------------------------------------------------*/ - #include .globl DCFlashInvalidate @@ -102,7 +100,7 @@ DCInvalidateRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -119,7 +117,7 @@ DCFlushRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -137,7 +135,7 @@ DCStoreRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -155,7 +153,7 @@ DCFlushRangeNoSync: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -172,7 +170,7 @@ DCStoreRangeNoSync: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -189,7 +187,7 @@ DCZeroRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -206,7 +204,7 @@ DCTouchRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 @@ -223,7 +221,7 @@ ICInvalidateRange: blelr clrlwi. r5, r3, 27 # check for lower bits set in address beq 1f - addi r4, r4, 0x20 + addi r4, r4, 0x20 1: addi r4, r4, 0x1f srwi r4, r4, 5 diff --git a/wii/libogc/libogc/decrementer_handler.S b/wii/libogc/libogc/decrementer_handler.S index 6e824d94be..bcaa5d52a7 100644 --- a/wii/libogc/libogc/decrementer_handler.S +++ b/wii/libogc/libogc/decrementer_handler.S @@ -25,10 +25,8 @@ must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. - -------------------------------------------------------------*/ - #include #define EXCEPTION_PROLOG \ @@ -58,7 +56,7 @@ distribution. stw r13,GPR13_OFFSET(sp); \ stw r14,GPR14_OFFSET(sp); \ stw r15,GPR15_OFFSET(sp) - + #define EXCEPTION_EPILOG \ lwz r4,GQR0_OFFSET(sp); \ mtspr 912,r4; \ @@ -102,7 +100,7 @@ dec_exceptionhandler: addi r14,sp,0 lis r15,_thread_dispatch_disable_level@ha - + mfspr r3,SPRG0 cmpwi r3,0 bne nested @@ -117,7 +115,7 @@ nested: addi r3,r14,0x08 bl c_decrementer_handler - + mfspr r4,SPRG0 lwz r3,_thread_dispatch_disable_level@l(r15) addi r4,r4,-1 diff --git a/wii/libogc/libogc/depackrnc.S b/wii/libogc/libogc/depackrnc.S index 18b70e3b65..1f58ecd4d8 100644 --- a/wii/libogc/libogc/depackrnc.S +++ b/wii/libogc/libogc/depackrnc.S @@ -27,7 +27,7 @@ #define GETBIT \ slwi r5,r5,1; \ extrwi r8,r5,1,23; \ - clrlwi. r5,r5,24 + clrlwi. r5,r5,24 #define COPYRAW \ lbzu r11,1(r29); \ @@ -49,7 +49,7 @@ depackrnc2: li r8,1 addi r30,r30,-1 addi r29,r29,17 - + LOAD GETBIT b _xloop @@ -109,13 +109,13 @@ _back3: insrwi r7,r8,1,31 extrwi r8,r7,1,23 clrlwi r7,r7,24 - + GETBIT beq _fetch4 _back4: rlwinm. r0,r8,0,31,31 beq _copy - + GETBIT beq _fetch5 _back5: @@ -127,7 +127,7 @@ _back5: cmpwi r7,9 beq _raw - + _copy: GETBIT beq _fetch6 @@ -137,7 +137,7 @@ _back6: GETBIT bne _skip0 - + LOAD _skip0: slwi r6,r6,1 //ROL(X) @@ -150,7 +150,7 @@ _skip0: extrwi r8,r5,1,23 clrlwi. r5,r5,24 bne _skip1 - + LOAD _skip1: rlwinm. r0,r8,0,31,31 @@ -158,11 +158,11 @@ _skip1: cmpwi r6,0 bne _bytedisp addic r6,r6,1 - + _another: GETBIT bne _dispx - + LOAD _dispx: slwi r6,r6,1 //ROL(X) @@ -197,7 +197,7 @@ _xloop: GETBIT rlwinm. r0,r8,0,31,31 bne _chkz - + COPYRAW GETBIT diff --git a/wii/libogc/libogc/exception_handler.S b/wii/libogc/libogc/exception_handler.S index 43ccc968b9..89c95161ca 100644 --- a/wii/libogc/libogc/exception_handler.S +++ b/wii/libogc/libogc/exception_handler.S @@ -27,7 +27,6 @@ distribution. -------------------------------------------------------------*/ - #include #define EXCEPTION_PROLOG \ @@ -57,7 +56,7 @@ distribution. stw r13,GPR13_OFFSET(sp); \ stw r14,GPR14_OFFSET(sp); \ stw r15,GPR15_OFFSET(sp); - + #define EXCEPTION_EPILOG \ lwz r4,GQR0_OFFSET(sp); \ mtspr 912,r4; \ @@ -87,7 +86,6 @@ distribution. lwz r6,GPR6_OFFSET(sp); \ lwz r5,GPR5_OFFSET(sp) - .globl exceptionhandler_start,exceptionhandler_end,exceptionhandler_patch exceptionhandler_start: mtspr SPRG3,r4 @@ -117,11 +115,11 @@ exceptionhandler_start: mfsrr1 r3 stw r3,SRR1_OFFSET(r4) mr r5,r3 - nop + nop mfmsr r3 ori r3,r3,MSR_IR|MSR_DR mtsrr1 r3 - + exceptionhandler_patch: li r3,0 stw r3,EXCEPTION_NUMBER(r4) @@ -135,19 +133,19 @@ exceptionhandler_patch: clrlwi r5,r5,2 clrlslwi r3,r3,24,2 lwzx r5,r3,r5 -1: +1: mtsrr0 r5 rfi exceptionhandler_end: nop - + .extern c_default_exceptionhandler .globl default_exceptionhandler default_exceptionhandler: stwu sp,-EXCEPTION_FRAME_END(sp) //now we're able to adjust the stackpointer with it's cached address EXCEPTION_PROLOG - + stmw r16,GPR16_OFFSET(sp) addi r3,sp,0x08 diff --git a/wii/libogc/libogc/gu_psasm.S b/wii/libogc/libogc/gu_psasm.S index 485499c29d..8385d9f140 100644 --- a/wii/libogc/libogc/gu_psasm.S +++ b/wii/libogc/libogc/gu_psasm.S @@ -582,7 +582,7 @@ ps_guVecScale: ps_muls0 fr4,fr2,fr1 psq_st fr4,0(r4),0,0 ps_muls0 fr4,fr3,fr1 - psq_st fr4,8(r4),1,0 + psq_st fr4,8(r4),1,0 blr .globl ps_guVecNormalize @@ -622,7 +622,7 @@ ps_guVecCross: ps_merge01 fr10,fr5,fr8 psq_st fr9,0(r5),1,0 ps_neg fr10,fr10 - psq_st fr10,4(r5),0,0 + psq_st fr10,4(r5),0,0 blr .globl ps_guVecDotProduct @@ -665,8 +665,8 @@ ps_guVecMultiply: // r3 = mt, r4 = src, r5 = dst ps_guVecMultiplySR: psq_l fr0,0(r3),0,0 // m[0][0], m[0][1] GQR0 = 0 - // fp6 - x y - psq_l fr6,0(r4),0,0 + // fp6 - x y + psq_l fr6,0(r4),0,0 psq_l fr2,16(r3),0,0 // m[1][0], m[1][1] // fp8 = m00x m01y // next X ps_mul fr8,fr0,fr6 @@ -680,12 +680,12 @@ ps_guVecMultiplySR: ps_sum0 fr8,fr8,fr8,fr8 psq_l fr5,40(r3),0,0 // m[2][2], m[2][3] ps_sum0 fr10,fr10,fr10,fr10 - psq_l fr1,8(r3),0,0 // m[0][2], m[0][3] + psq_l fr1,8(r3),0,0 // m[0][2], m[0][3] ps_sum0 fr12,fr12,fr12,fr12 ps_madd fr9,fr1,fr7,fr8 psq_st fr9,0(r5),1,0 // store X ps_madd fr11,fr3,fr7,fr10 - psq_st fr11,4(r5),1,0 // store Y + psq_st fr11,4(r5),1,0 // store Y ps_madd fr13,fr5,fr7,fr12 psq_st fr13,8(r5),1,0 // sore Z blr diff --git a/wii/libogc/libogc/irq_handler.S b/wii/libogc/libogc/irq_handler.S index da37e43d81..034b5ff6bc 100644 --- a/wii/libogc/libogc/irq_handler.S +++ b/wii/libogc/libogc/irq_handler.S @@ -27,7 +27,6 @@ distribution. -------------------------------------------------------------*/ - #include #define EXCEPTION_PROLOG \ @@ -57,7 +56,7 @@ distribution. stw r13,GPR13_OFFSET(sp); \ stw r14,GPR14_OFFSET(sp); \ stw r15,GPR15_OFFSET(sp) - + #define EXCEPTION_EPILOG \ lwz r4,GQR0_OFFSET(sp); \ mtspr 912,r4; \ @@ -101,7 +100,7 @@ irq_exceptionhandler: addi r14,sp,0 lis r15,_thread_dispatch_disable_level@ha - + mfspr r3,SPRG0 cmpwi r3,0 bne nested @@ -116,7 +115,7 @@ nested: addi r3,r14,0x08 bl c_irqdispatcher - + mfspr r4,SPRG0 lwz r3,_thread_dispatch_disable_level@l(r15) addi r4,r4,-1 diff --git a/wii/libogc/libogc/lwp_handler.S b/wii/libogc/libogc/lwp_handler.S index edb8e633cd..61e5f574b3 100644 --- a/wii/libogc/libogc/lwp_handler.S +++ b/wii/libogc/libogc/lwp_handler.S @@ -284,7 +284,7 @@ _cpu_context_switch: stmw r13,GP_13(r3) lmw r13,GP_13(r4) - + mfspr r5,912 stw r5,GQ_0(r3) lwz r6,GQ_0(r4) diff --git a/wii/libogc/libogc/lwp_mutex.inl b/wii/libogc/libogc/lwp_mutex.inl index afa9c82396..9fff40d557 100644 --- a/wii/libogc/libogc/lwp_mutex.inl +++ b/wii/libogc/libogc/lwp_mutex.inl @@ -45,7 +45,7 @@ static __inline__ u32 __lwp_mutex_seize_irq_trylock(lwp_mutex *mutex,u32 *isr_le } { u32 prioceiling,priocurr; - + prioceiling = mutex->atrrs.prioceil; priocurr = exec->cur_prio; if(priocurr==prioceiling) { diff --git a/wii/libogc/libogc/lwp_priority.inl b/wii/libogc/libogc/lwp_priority.inl index 3b4b54bba8..4fe6fb5403 100644 --- a/wii/libogc/libogc/lwp_priority.inl +++ b/wii/libogc/libogc/lwp_priority.inl @@ -4,16 +4,16 @@ static __inline__ void __lwp_priomap_init(prio_cntrl *theprio,u32 prio) { u32 mask; - + u32 major = prio/16; u32 minor = prio%16; - + theprio->minor = &_prio_bitmap[major]; - + mask = 0x80000000>>major; theprio->ready_major = mask; theprio->block_major = ~mask; - + mask = 0x80000000>>minor; theprio->ready_minor = mask; theprio->block_minor = ~mask; diff --git a/wii/libogc/libogc/lwp_queue.inl b/wii/libogc/libogc/lwp_queue.inl index 809aaa3d1c..9e67230c75 100644 --- a/wii/libogc/libogc/lwp_queue.inl +++ b/wii/libogc/libogc/lwp_queue.inl @@ -68,7 +68,7 @@ static __inline__ void __lwp_queue_extractI(lwp_node *node) static __inline__ void __lwp_queue_insertI(lwp_node *after,lwp_node *node) { lwp_node *before; - + node->prev = after; before = after->next; after->next = node; diff --git a/wii/libogc/libogc/ogc_crt0.S b/wii/libogc/libogc/ogc_crt0.S index 57f56026b3..8adb1769f0 100644 --- a/wii/libogc/libogc/ogc_crt0.S +++ b/wii/libogc/libogc/ogc_crt0.S @@ -6,7 +6,7 @@ # crt0.s file for the GameCube V1.1 by Costis (costis@gbaemu.com)! # # Updates: Added support for clearing the BSS section so that global - # variables are cleared to 0 upon start-up. + # variables are cleared to 0 upon start-up. # # This is start-up code for initializing the GameCube system and hardware # before executing the actual user program code. It clears the GPR's, @@ -110,7 +110,7 @@ __InitGPRS: lis r2,_SDA2_BASE_@h ori r2,r2,_SDA2_BASE_@l # Set the Small Data 2 (Read Only) base register. lis r13,_SDA_BASE_@h - ori r13,r13,_SDA_BASE_@l # Set the Small Data (Read\Write) base register. + ori r13,r13,_SDA_BASE_@l # Set the Small Data (Read\Write) base register. blr __InitHardware: @@ -125,7 +125,7 @@ __InitHardware: bl __InitCache # Initialize the system caches mtlr r31 blr - + //r3 = ptr, r4 = fill, r5 = size .globl _memset _memset: diff --git a/wii/libogc/libogc/system_asm.S b/wii/libogc/libogc/system_asm.S index 2b8580ca7e..1acd9c6493 100644 --- a/wii/libogc/libogc/system_asm.S +++ b/wii/libogc/libogc/system_asm.S @@ -23,7 +23,7 @@ __configBATS: ori r3,r3,0x0c64 mtspr HID0,r3 isync - + #if defined(HW_RVL) lis r3,0x8200 //bits set: H4A(HID4 access), SBE(2nd BAT enabled) mtspr HID4,r3 @@ -57,7 +57,7 @@ __configBATS: mtspr DBAT0L,r3 mtspr DBAT0U,r4 isync - + #if defined(HW_RVL) // set [DI]BAT4 for 256MB@90000000, // real 10000000, WIMG=0000, R/W @@ -69,7 +69,7 @@ __configBATS: mtspr DBAT4U,r4 isync #endif - + // set DBAT1 for 256MB@c0000000, // real 00000000, WIMG=0101, R/W li r3,0x2a @@ -78,7 +78,7 @@ __configBATS: mtspr DBAT1L,r3 mtspr DBAT1U,r4 isync - + #if defined(HW_RVL) // set DBAT5 for 256MB@d0000000, // real 10000000, WIMG=0101, R/W @@ -96,7 +96,7 @@ __configBATS: oris r3,r3,0x8000 mtsrr0 r3 rfi - + .globl __InitFPRS __InitFPRS: # Enable the Floating Point Registers @@ -111,38 +111,38 @@ __InitFPRS: lis r3,zeroPS@ha addi r3,r3,zeroPS@l psq_l fr0,0(r3),0,0 - ps_mr fr1,fr0 - ps_mr fr2,fr0 - ps_mr fr3,fr0 - ps_mr fr4,fr0 - ps_mr fr5,fr0 - ps_mr fr6,fr0 - ps_mr fr7,fr0 - ps_mr fr8,fr0 - ps_mr fr9,fr0 - ps_mr fr10,fr0 - ps_mr fr11,fr0 - ps_mr fr12,fr0 - ps_mr fr13,fr0 - ps_mr fr14,fr0 - ps_mr fr15,fr0 - ps_mr fr16,fr0 - ps_mr fr17,fr0 - ps_mr fr18,fr0 - ps_mr fr19,fr0 - ps_mr fr20,fr0 - ps_mr fr21,fr0 - ps_mr fr22,fr0 - ps_mr fr23,fr0 - ps_mr fr24,fr0 - ps_mr fr25,fr0 - ps_mr fr26,fr0 - ps_mr fr27,fr0 - ps_mr fr28,fr0 - ps_mr fr29,fr0 - ps_mr fr30,fr0 + ps_mr fr1,fr0 + ps_mr fr2,fr0 + ps_mr fr3,fr0 + ps_mr fr4,fr0 + ps_mr fr5,fr0 + ps_mr fr6,fr0 + ps_mr fr7,fr0 + ps_mr fr8,fr0 + ps_mr fr9,fr0 + ps_mr fr10,fr0 + ps_mr fr11,fr0 + ps_mr fr12,fr0 + ps_mr fr13,fr0 + ps_mr fr14,fr0 + ps_mr fr15,fr0 + ps_mr fr16,fr0 + ps_mr fr17,fr0 + ps_mr fr18,fr0 + ps_mr fr19,fr0 + ps_mr fr20,fr0 + ps_mr fr21,fr0 + ps_mr fr22,fr0 + ps_mr fr23,fr0 + ps_mr fr24,fr0 + ps_mr fr25,fr0 + ps_mr fr26,fr0 + ps_mr fr27,fr0 + ps_mr fr28,fr0 + ps_mr fr29,fr0 + ps_mr fr30,fr0 ps_mr fr31,fr0 - + # Clear all of the FPR's to 0 1: lis r3,zeroF@ha lfd fr0,zeroF@l(r3) @@ -229,10 +229,10 @@ ICEnabled: mfspr r3, HID0 rlwinm. r0, r3, 0, 17, 17 // Check if the Data Cache has been enabled or not. bne DCEnabled - - bl DCEnable + + bl DCEnable DCEnabled: - + mfspr r3, L2CR clrrwi. r0, r3, 31 // Check if the Locked Cache has been enabled or not. bne L2Enabled @@ -270,7 +270,7 @@ __InitSystem: mtspr 957, r3 mtspr 958, r3 isync - + #if defined(HW_RVL) mfspr r3,HID4 oris r3,r3,0x0190 //set additional bits in HID4: SR0(store 0), LPE(PS LE exception), L2CFI(L2 castout prior to L2 inv. flash) @@ -283,16 +283,16 @@ __InitSystem: ori r3, r3, 0x0200 mtspr HID0, r3 isync - + # Set the Non-IEEE mode in the FPSCR mtfsb1 29 - + # Disable Write Gather Pipe mfspr r3,HID2 # (HID2) - rlwinm r3, r3, 0, 2, 0 + rlwinm r3, r3, 0, 2, 0 mtspr HID2,r3 # (HID2) isync - + # Restore the non-volatile registers to their previous values and return. lwz r0, 28(sp) lmw r29,12(sp) @@ -345,7 +345,7 @@ __reset: 6: b 8f 7: nop b 7b -8: b 9b +8: b 9b .globl __InitBATS __InitBATS: @@ -356,7 +356,7 @@ __InitBATS: bl __realmode mtlr r31 blr - + .globl SYS_SwitchFiber SYS_SwitchFiber: mflr r0 diff --git a/wii/libogc/libogc/video_asm.S b/wii/libogc/libogc/video_asm.S index b8cd37329e..d5becce3a2 100644 --- a/wii/libogc/libogc/video_asm.S +++ b/wii/libogc/libogc/video_asm.S @@ -27,7 +27,6 @@ distribution. -------------------------------------------------------------*/ - #include .globl __VIClearFramebuffer diff --git a/wiiu/link_elf.ld b/wiiu/link_elf.ld index 5dfdf95e80..262dd5c8fb 100644 --- a/wiiu/link_elf.ld +++ b/wiiu/link_elf.ld @@ -172,7 +172,6 @@ SECTIONS .jcr : { KEEP (*(.jcr)) } .got : { *(.got.plt) *(.got) } - /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ diff --git a/wiiu/slang/grammar.txt b/wiiu/slang/grammar.txt index 6352468df5..62e50198cf 100644 --- a/wiiu/slang/grammar.txt +++ b/wiiu/slang/grammar.txt @@ -9,7 +9,6 @@ Version <- '#'_'version' Space+ <(!EndOfLine .)*> EndOfLine Stage <- '#'_'pragma' Space+ 'stage' Space? <(!EndOfLine .)*> EndOfLine #.*Include <- '#'_'include' _ '"' <(!'"' .)*> '"' _ EndOfLine - Declaration <- Layout? _ Qualifier Space _ Type Space _ Name _ ArraySize? _ EndOfStatement ConstArray <- Type Space _ Name _ ArraySize? _ '=' _ Array _ EndOfStatement UniformBlock <- Layout? _ 'uniform' _ StructName? _ '{' Member* '}' _ Name? _ EndOfStatement @@ -39,10 +38,8 @@ Set <- 'set' _ '=' _ PushConstant <- 'push_constant' Std <- 'std' - #.*Block <- '{' (Directive/ Statement / Block _)* '}' - Float <- $< '-'? [0-9]+ '.' ([0-9]+ ('e-'[0-9]+)? )? 'f'? > Int <- < '-'? [0-9]+ > ~EndOfStatement <- ';' diff --git a/wiiu/system/missing_libc_functions.c b/wiiu/system/missing_libc_functions.c index 4a35405a10..934f8a28e7 100644 --- a/wiiu/system/missing_libc_functions.c +++ b/wiiu/system/missing_libc_functions.c @@ -131,7 +131,7 @@ static const char *wiiu_iface_name = "eth0"; /** * Allocate and zeroize the hunk of memory for the ifaddrs struct and its contents; the struct will be filled * out later. - * + * * returns NULL if any of the memory allocations fail. */ static struct ifaddrs *buildEmptyIfa() { diff --git a/wiiu/system/stubs_rpl.S b/wiiu/system/stubs_rpl.S index 6bd4ffdea9..f5c07f87de 100644 --- a/wiiu/system/stubs_rpl.S +++ b/wiiu/system/stubs_rpl.S @@ -8,7 +8,6 @@ nop; \ nop*/ - #define IMPORT(name) \ .align 2; \ .section ".rplTramp.text","ax"; \ @@ -24,8 +23,7 @@ #include "imports.h" - -#undef IMPORT_BEGIN +#undef IMPORT_BEGIN #undef IMPORT #undef IMPORT_END