Changeset 245233 in webkit

Timestamp:

May 13, 2019 6:59:59 AM (5 years ago)

Author:

Darin Adler

Message:

WHLSLPrepare.cpp always recompiles, even if nothing was changed
​https://bugs.webkit.org/show_bug.cgi?id=197151

Reviewed by Dan Bernstein and Keith Rollin.

• DerivedSources-input.xcfilelist: Script updated this automatically after

DerivedSources.make was corrected.

• DerivedSources-output.xcfilelist: Ditto, although I had to manually remove

one bogus leftover reference to WHLSLStandardLibrary.cpp.

• DerivedSources.make: Updated the rule that builds WHSLStandardLibrary.h to

no longer refer to nonexistent WHLSLStandardLibrary.cpp. Because the dependency
was on a file that was never created, the rule to regenerate WHSLStandardLibrary.h
was running on every build, instead of only when one of the dependencies changed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• DerivedSources-input.xcfilelist (modified) (2 diffs)
• DerivedSources-output.xcfilelist (modified) (1 diff)
• DerivedSources.make (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-13  Darin Adler  <darin@apple.com>
+
+        WHLSLPrepare.cpp always recompiles, even if nothing was changed
+        https://bugs.webkit.org/show_bug.cgi?id=197151
+
+        Reviewed by Dan Bernstein and Keith Rollin.
+
+        * DerivedSources-input.xcfilelist: Script updated this automatically after
+        DerivedSources.make was corrected.
+        * DerivedSources-output.xcfilelist: Ditto, although I had to manually remove
+        one bogus leftover reference to WHLSLStandardLibrary.cpp.
+
+        * DerivedSources.make: Updated the rule that builds WHSLStandardLibrary.h to
+        no longer refer to nonexistent WHLSLStandardLibrary.cpp. Because the dependency
+        was on a file that was never created, the rule to regenerate WHSLStandardLibrary.h
+        was running on every build, instead of only when one of the dependencies changed.
+
 2019-05-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/DerivedSources-input.xcfilelist

@@ -16 +16 @@
 $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR)/make-js-file-arrays.py
 $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR)/wkbuiltins.py
+$(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR)/xxd.pl
 $(PROJECT_DIR)/Configurations/FeatureDefines.xcconfig
 $(PROJECT_DIR)/DerivedSources.make
@@ -343 +344 @@
 $(PROJECT_DIR)/Modules/webgpu/GPUVertexInputDescriptor.idl
 $(PROJECT_DIR)/Modules/webgpu/NavigatorGPU.idl
+$(PROJECT_DIR)/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
 $(PROJECT_DIR)/Modules/webgpu/WebGPU.idl
 $(PROJECT_DIR)/Modules/webgpu/WebGPUAdapter.idl

trunk/Source/WebCore/DerivedSources-output.xcfilelist

@@ -2089 +2089 @@
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/UserAgentScriptsData.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/UserAgentStyleSheets.h
-$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WHLSLStandardLibrary.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WHLSLStandardLibrary.h
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreJSBuiltinInternals.cpp
 $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCoreJSBuiltinInternals.h

trunk/Source/WebCore/DerivedSources.make

@@ -1635 +1635 @@
 # WHLSL Standard Library
 
-all : WHLSLStandardLibrary.cpp
-
-WHLSLStandardLibrary.cpp : $(JavaScriptCore_SCRIPTS_DIR)/xxd.pl $(WebCore)/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
-        $(PERL) $(JavaScriptCore_SCRIPTS_DIR)/xxd.pl WHLSLStandardLibrary $(WebCore)/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt WHLSLStandardLibrary.h
+all : WHLSLStandardLibrary.h
+
+WHLSLStandardLibrary.h : $(JavaScriptCore_SCRIPTS_DIR)/xxd.pl $(WebCore)/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt
+        $(PERL) $< WHLSLStandardLibrary $(WebCore)/Modules/webgpu/WHLSL/WHLSLStandardLibrary.txt $@
 
 # --------