Changeset 80402 in vbox
- Timestamp:
- Aug 23, 2019 4:01:26 PM (5 years ago)
- Location:
- trunk/src/VBox/GuestHost/OpenGL
- Files:
-
- 23 deleted
- 1 edited
-
Makefile.kmk (modified) (2 diffs)
-
error (deleted)
-
spu_loader (deleted)
-
state_tracker (deleted)
-
util/VBoxOGLcrutil.rc (deleted)
-
util/blitter.cpp (deleted)
-
util/bmpscale.cpp (deleted)
-
util/bufpool.c (deleted)
-
util/compositor.cpp (deleted)
-
util/dll.c (deleted)
-
util/error.c (deleted)
-
util/hash.c (deleted)
-
util/htable.cpp (deleted)
-
util/matrix.c (deleted)
-
util/mem.c (deleted)
-
util/net.c (deleted)
-
util/net_internals.h (deleted)
-
util/pixel.c (deleted)
-
util/process.c (deleted)
-
util/string.c (deleted)
-
util/threads.c (deleted)
-
util/util.def (deleted)
-
util/util.rc (deleted)
-
util/vboxhgcm.c (deleted)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/OpenGL/Makefile.kmk
r80399 r80402 27 27 $(VBOX_PATH_CROGL_GENFILES)/state/ 28 28 29 ifdef VBOX_WITH_ADDITIONS30 ifn1of ($(KBUILD_TARGET), darwin os2)31 VBOX_WITH_CROGL_ADDITIONS = 132 endif33 endif34 35 ifdef VBOX_WITH_CROGL_ADDITIONS36 LIBRARIES += VBoxOGLcrpacker VBoxOGLcrstate37 endif38 39 29 # 40 # VBoxOGLcrpacker30 # Generate files for WDDM driver which are still used. 41 31 # 42 VBoxOGLcrpacker_TEMPLATE = VBOXCROGLR3GUESTLIB43 VBoxOGLcrpacker_INCS = \44 packer \45 $(VBOX_GRAPHICS_INCS)46 if1of ($(KBUILD_TARGET), linux solaris freebsd)47 VBoxOGLcrpacker_INCS += \48 $(VBOX_GL_INCS)49 endif50 VBoxOGLcrpacker_INTERMEDIATES = \51 $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h \52 $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \53 $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \54 $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h \55 $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h56 VBoxOGLcrpacker_SOURCES = \57 packer/pack_arrays.c \58 packer/pack_beginend.c \59 packer/pack_bounds.c \60 packer/pack_buffer.c \61 packer/pack_bufferobject.c \62 packer/pack_client.c \63 packer/pack_clipplane.c \64 packer/pack_context.c \65 packer/pack_error.c \66 packer/pack_extensions.c \67 packer/pack_feedback.c \68 packer/pack_fence.c \69 packer/pack_fog.c \70 packer/pack_init.c \71 packer/pack_lights.c \72 packer/pack_lists.c \73 packer/pack_map.c \74 packer/pack_point.c \75 packer/pack_misc.c \76 packer/pack_materials.c \77 packer/pack_matrices.c \78 packer/pack_pixels.c \79 packer/pack_pixelmap.c \80 packer/pack_program.c \81 packer/pack_regcombiner.c \82 packer/pack_stipple.c \83 packer/pack_texture.c \84 packer/pack_visibleregion.c \85 packer/pack_shaders.c \86 packer/pack_framebuffer.c \87 $(VBOX_PATH_CROGL_GENFILES)/pack_bbox.c \88 $(VBOX_PATH_CROGL_GENFILES)/pack_current.c \89 $(VBOX_PATH_CROGL_GENFILES)/packer.c90 VBoxOGLcrpacker_CLEAN = \91 $(VBOX_PATH_CROGL_GENFILES)/pack_bbox.c \92 $(VBOX_PATH_CROGL_GENFILES)/pack_current.c \93 $(VBOX_PATH_CROGL_GENFILES)/packer.c \94 $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h \95 $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h \96 $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h97 ifdef VBOX_WITH_CRHGSMI98 VBoxOGLcrpacker_DEFS.win += VBOX_WITH_CRHGSMI99 endif100 ifdef VBOX_WITH_WDDM101 VBoxOGLcrpacker_DEFS.win += VBOX_WITH_WDDM102 endif103 104 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)105 #106 # VBoxOGLcrpacker-x86 - x86 VBoxOGLcrpacker version built for amd64 build107 #108 LIBRARIES.win.amd64 += VBoxOGLcrpacker-x86109 VBoxOGLcrpacker-x86_TEMPLATE = VBOXCROGLR3GUESTLIB110 VBoxOGLcrpacker-x86_EXTENDS = VBoxOGLcrpacker111 VBoxOGLcrpacker-x86_BLD_TRG_ARCH = x86112 VBoxOGLcrpacker-x86_DEFS = $(VBoxOGLcrpacker_DEFS) VBOX_WDDM_WOW64113 endif114 115 #116 # Generate files for VBoxOGLcrpacker.117 #118 $(VBOX_PATH_CROGL_GENFILES)/packer.def: $(PATH_SUB_CURRENT)/packer/packer_defs.py $(VBOX_CROGL_API_FILES) | $$(dir $$@)119 $(call MSG_GENERATE,python,$@,$<)120 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< $(VBOX_PATH_CROGL_GLAPI)121 122 32 $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h: $(PATH_SUB_CURRENT)/packer/pack_header.py $(PATH_SUB_CURRENT)/packer/packer_special $(VBOX_CROGL_API_FILES) | $$(dir $$@) 123 33 $(call MSG_GENERATE,python,$@,$<) … … 144 54 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $< 145 55 146 147 #148 # VBoxOGLcrstate149 #150 VBoxOGLcrstate_TEMPLATE = VBOXCROGLR3GUESTLIB151 VBoxOGLcrstate_INCS = \152 state_tracker \153 $(VBOX_GRAPHICS_INCS)154 if1of ($(KBUILD_TARGET), linux solaris freebsd)155 VBoxOGLcrstate_INCS += \156 $(VBOX_GL_INCS)157 endif158 VBoxOGLcrstate_INTERMEDIATES = \159 $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h \160 $(VBOX_PATH_CROGL_GENFILES)/state/cr_currentpointers.h \161 $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h162 VBoxOGLcrstate_SOURCES = \163 state_tracker/state_attrib.c \164 state_tracker/state_buffer.c \165 state_tracker/state_bufferobject.c \166 state_tracker/state_client.c \167 state_tracker/state_current.c \168 state_tracker/state_diff.c \169 state_tracker/state_enable.c \170 state_tracker/state_error.c \171 state_tracker/state_evaluators.c \172 state_tracker/state_feedback.c \173 state_tracker/state_fence.c \174 state_tracker/state_flush.c \175 state_tracker/state_fog.c \176 state_tracker/state_getstring.c \177 state_tracker/state_hint.c \178 state_tracker/state_init.c \179 state_tracker/state_lighting.c \180 state_tracker/state_limits.c \181 state_tracker/state_line.c \182 state_tracker/state_lists.c \183 state_tracker/state_multisample.c \184 state_tracker/state_occlude.c \185 state_tracker/state_pixel.c \186 state_tracker/state_point.c \187 state_tracker/state_polygon.c \188 state_tracker/state_program.c \189 state_tracker/state_rasterpos.c \190 state_tracker/state_regcombiner.c \191 state_tracker/state_stencil.c \192 state_tracker/state_texture.c \193 state_tracker/state_teximage.c \194 state_tracker/state_texdiff.c \195 state_tracker/state_transform.c \196 state_tracker/state_viewport.c \197 state_tracker/state_framebuffer.c \198 state_tracker/state_glsl.c \199 $(VBOX_PATH_CROGL_GENFILES)/state_buffer_gen.c \200 $(VBOX_PATH_CROGL_GENFILES)/state_current_gen.c \201 $(VBOX_PATH_CROGL_GENFILES)/state_fog_gen.c \202 $(VBOX_PATH_CROGL_GENFILES)/state_hint_gen.c \203 $(VBOX_PATH_CROGL_GENFILES)/state_lighting_gen.c \204 $(VBOX_PATH_CROGL_GENFILES)/state_line_gen.c \205 $(VBOX_PATH_CROGL_GENFILES)/state_multisample_gen.c \206 $(VBOX_PATH_CROGL_GENFILES)/state_polygon_gen.c \207 $(VBOX_PATH_CROGL_GENFILES)/state_regcombiner_gen.c \208 $(VBOX_PATH_CROGL_GENFILES)/state_viewport_gen.c \209 $(VBOX_PATH_CROGL_GENFILES)/state_get.c \210 $(VBOX_PATH_CROGL_GENFILES)/state_isenabled.c211 ifdef VBOX_WITH_CRDUMPER212 VBoxOGLcrstate_SOURCES += state_tracker/dump.cpp \213 $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp214 endif215 VBoxOGLcrstate_SOURCES.win = \216 $(PATH_ROOT)/src/VBox/Runtime/common/asm/ASMBitNextClear.asm \217 $(PATH_ROOT)/src/VBox/Runtime/common/asm/ASMBitNextSet.asm218 219 VBoxOGLcrstate_CLEAN = \220 $(VBOX_PATH_CROGL_GENFILES)/state_buffer_gen.c \221 $(VBOX_PATH_CROGL_GENFILES)/state_current_gen.c \222 $(VBOX_PATH_CROGL_GENFILES)/state_fog_gen.c \223 $(VBOX_PATH_CROGL_GENFILES)/state_hint_gen.c \224 $(VBOX_PATH_CROGL_GENFILES)/state_lighting_gen.c \225 $(VBOX_PATH_CROGL_GENFILES)/state_line_gen.c \226 $(VBOX_PATH_CROGL_GENFILES)/state_multisample_gen.c \227 $(VBOX_PATH_CROGL_GENFILES)/state_polygon_gen.c \228 $(VBOX_PATH_CROGL_GENFILES)/state_regcombiner_gen.c \229 $(VBOX_PATH_CROGL_GENFILES)/state_viewport_gen.c \230 $(VBOX_PATH_CROGL_GENFILES)/state_get.c \231 $(VBOX_PATH_CROGL_GENFILES)/state_isenabled.c \232 $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h233 ifdef VBOX_WITH_CRDUMPER234 VBoxOGLcrstate_CLEAN += $(VBOX_PATH_CROGL_GENFILES)/dump_gen.cpp235 endif236 237 ifneq ($(KBUILD_TARGET),win)238 state_tracker/state_lists.c_CFLAGS += $(VBOX_GCC_Wno-pointer-sign)239 VBoxOGLcrstate_CFLAGS +=240 endif241 ifdef VBOX_WITH_CRHGSMI242 VBoxOGLcrstate_DEFS.win += VBOX_WITH_CRHGSMI243 endif244 ifdef VBOX_WITH_WDDM245 VBoxOGLcrstate_DEFS.win += VBOX_WITH_WDDM246 endif247 ifdef VBOX_WITH_CRDUMPER248 VBoxOGLcrstate_DEFS += VBOX_WITH_CRDUMPER249 endif250 251 if defined(VBOX_WITH_WDDM) && defined(VBOX_WITH_CROGL_ADDITIONS)252 #253 # VBoxOGLcrstate-x86 - x86 VBoxOGLcrstate version built for amd64 build254 #255 LIBRARIES.win.amd64 += VBoxOGLcrstate-x86256 VBoxOGLcrstate-x86_TEMPLATE = VBOXCROGLR3GUESTLIB257 VBoxOGLcrstate-x86_EXTENDS = VBoxOGLcrstate258 VBoxOGLcrstate-x86_BLD_TRG_ARCH = x86259 VBoxOGLcrstate-x86_DEFS = $(VBoxOGLcrstate_DEFS) VBOX_WDDM_WOW64260 endif261 262 263 #264 # Generate files for VBoxOGLcrstate.265 #266 267 268 $(VBOX_PATH_CROGL_GENFILES)/state_buffer_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_buffer.txt gendiffcode.py) | $$(dir $$@)269 $(call MSG_GENERATE,python,$@,$<)270 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py buffer Buffer $(<D)271 272 $(VBOX_PATH_CROGL_GENFILES)/state_client_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_client.txt gendiffcode.py) | $$(dir $$@)273 $(call MSG_GENERATE,python,$@,$<)274 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py client Client $(<D)275 276 $(VBOX_PATH_CROGL_GENFILES)/state_current_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_current.py convert.py) $(VBOX_CROGL_API_FILES) | $$(dir $$@)277 $(call MSG_GENERATE,python,$@,$<)278 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/state_current.py279 280 $(VBOX_PATH_CROGL_GENFILES)/state_fog_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_fog.txt gendiffcode.py) | $$(dir $$@)281 $(call MSG_GENERATE,python,$@,$<)282 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py fog Fog $(<D)283 284 $(VBOX_PATH_CROGL_GENFILES)/state_hint_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_hint.txt gendiffcode.py) | $$(dir $$@)285 $(call MSG_GENERATE,python,$@,$<)286 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py hint Hint $(<D)287 288 $(VBOX_PATH_CROGL_GENFILES)/state_lighting_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_lighting.txt gendiffcode.py) | $$(dir $$@)289 $(call MSG_GENERATE,python,$@,$<)290 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py lighting Lighting $(<D)291 292 $(VBOX_PATH_CROGL_GENFILES)/state_line_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_line.txt gendiffcode.py) | $$(dir $$@)293 $(call MSG_GENERATE,python,$@,$<)294 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py line Line $(<D)295 296 $(VBOX_PATH_CROGL_GENFILES)/state_multisample_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_multisample.txt gendiffcode.py) | $$(dir $$@)297 $(call MSG_GENERATE,python,$@,$<)298 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py multisample Multisample $(<D)299 300 $(VBOX_PATH_CROGL_GENFILES)/state_polygon_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_polygon.txt gendiffcode.py) | $$(dir $$@)301 $(call MSG_GENERATE,python,$@,$<)302 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py polygon Polygon $(<D)303 304 $(VBOX_PATH_CROGL_GENFILES)/state_regcombiner_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_regcombiner.txt gendiffcode.py) | $$(dir $$@)305 $(call MSG_GENERATE,python,$@,$<)306 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py regcombiner RegCombiner $(<D)307 308 $(VBOX_PATH_CROGL_GENFILES)/state_viewport_gen.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_viewport.txt gendiffcode.py) | $$(dir $$@)309 $(call MSG_GENERATE,python,$@,$<)310 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/gendiffcode.py viewport Viewport $(<D)311 312 $(VBOX_PATH_CROGL_GENFILES)/state_get.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_get.py state_get.txt state_extensions_get.txt get_components.py) $(VBOX_CROGL_API_FILES) | $$(dir $$@)313 $(call MSG_GENERATE,python,$@,$<)314 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/state_get.py $(VBOX_PATH_CROGL_GLAPI) $(<D)315 316 $(VBOX_PATH_CROGL_GENFILES)/state_isenabled.c: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_isenabled.py state_isenabled.txt state_extensions_isenabled.txt) $(VBOX_CROGL_API_FILES) | $$(dir $$@)317 $(call MSG_GENERATE,python,$@,$<)318 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/state_isenabled.py $(VBOX_PATH_CROGL_GLAPI) $(<D)319 320 $(VBOX_PATH_CROGL_GENFILES)/state.def: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_defs.py state_special state_select_special state_feedback_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)321 $(call MSG_GENERATE,python,$@,$<)322 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/state_defs.py $(VBOX_PATH_CROGL_GLAPI) $(<D)323 324 $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h: $(addprefix $(PATH_SUB_CURRENT)/state_tracker/, state_funcs.py state_special state_feedback_special state_select_special) $(VBOX_CROGL_API_FILES) | $$(dir $$@)325 $(call MSG_GENERATE,python,$@,$<)326 $(QUIET)$(call VBOX_CROGL_PYTHON_ENV,$(VBOX_PATH_CROGL_PYTHON_INCLUDE),$@) $(VBOX_BLD_PYTHON) $(<D)/state_funcs.py $(VBOX_PATH_CROGL_GLAPI) $(<D)327 328 329 330 56 include $(FILE_KBUILD_SUB_FOOTER) 331 57
Note:
See TracChangeset
for help on using the changeset viewer.
