diff --git a/.gitignore b/.gitignore index 7c06cad..9cd8037 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ /build/ /target/ +conformance/*.xml +conformance/*.qpa **/*.rs.bk Cargo.lock diff --git a/Makefile b/Makefile index 62a15e8..0d077ce 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ VULKAN_DIR=modules/vulkan-docs/src +CTS_DIR=../VK-GL-CTS BINDING=target/vulkan.rs NATIVE_DIR=target/native TARGET=$(NATIVE_DIR)/test @@ -31,9 +32,10 @@ else endif endif +FULL_LIBRARY_PATH=$(CURDIR)/target/debug LIBRARY=target/debug/libportability.$(LIB_EXTENSION) -.PHONY: all binding run +.PHONY: all binding run cts all: $(TARGET) @@ -55,6 +57,12 @@ $(TARGET): $(LIBRARY) $(OBJECTS) Makefile run: $(TARGET) $(TARGET) +cts: $(TARGET) + -LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) $(CTS_DIR)/build/external/vulkancts/modules/vulkan/deqp-vk + python $(CTS_DIR)/scripts/log/log_to_xml.py TestResults.qpa conformance/last.xml + mv TestResults.qpa conformance/last.qpa + firefox conformance/last.xml + clean: rm -f $(OBJECTS) $(TARGET) $(BINDING) cargo clean diff --git a/conformance/testlog.css b/conformance/testlog.css new file mode 100644 index 0000000..10fe798 --- /dev/null +++ b/conformance/testlog.css @@ -0,0 +1,121 @@ +body +{ + font-size: 10pt; + font-family: verdana; +} + +h1 +{ + font-size: 16pt; + font-weight: normal; + width: 100%; + padding: 4pt 0pt 6pt 0pt; + margin: 0px 0px 10pt 0px; +} + +h2 +{ + font-size: 14pt; + font-weight: normal; + background: #cccccc; + width: 100%; + padding: 2pt 0pt 4pt 0pt; + margin: 0pt 0pt 2pt 0pt; +} + +h3 +{ + font-size: 12pt; + font-weight: normal; + width: 100%; + padding: 2pt 0pt 4pt 0pt; + margin: 0pt 0pt 0pt 0pt; +} + +div.Section +{ + border: 1px solid #aaaaaa; + margin: 2pt 2pt 4pt 10pt; + padding: 0pt; +} + +div.CompileInfo +{ + border: 1px solid #aaaaaa; + margin: 2pt 2pt 4pt 10pt; + padding: 0pt; +} + +div.Shader +{ + border: 1px solid #aaaaaa; + margin: 2pt 2pt 4pt 10pt; + padding: 0pt; +} + +div.ImageSet +{ + border: 1px solid #aaaaaa; + margin: 2pt 2pt 4pt 10pt; + padding: 0pt; +} + +div.Image +{ + border: none; + margin: 2pt; + text-align: center; +} + +pre.InfoLog +{ + background: #ddddee; + margin: 0px; +} + +td.ConfigListTitle +{ + font-weight: bold; + text-align: right; +} + +td.ConfigListValue +{ + text-align: right; +} + +table.Totals +{ + border-collapse: collapse; + text-align: right; +} + +table.Totals td +{ + padding: 2pt 4pt 2pt 4pt; +} + +div.TestCaseResult +{ + border: 1px solid #aaaaaa; + margin: 15pt 2pt 2pt 2pt; + padding: 0pt; +} + +/* Background colors based on status code / status. */ +.Pass { background: #80ff80; } +.Fail { background: #ff4040; } +.QualityWarning { background: #ffff00; } +.CompatibilityWarning { background: #ffff00; } +.Pending { background: #808080; } +.Running { background: #d3d3d3; } +.NotSupported { background: #ff69b4; } +.ResourceError { background: #ff4040; } +.InternalError { background: #ff1493; } +.Canceled { background: #808080; } +.Crash { background: #ffa500; } +.Timeout { background: #ffa500; } +.Disabled { background: #808080; } +.Terminated { background: #ffa500; } +.Missing { background: #808080; } +.OK { background: #80ff80; } diff --git a/conformance/testlog.xsl b/conformance/testlog.xsl new file mode 100644 index 0000000..f8e1400 --- /dev/null +++ b/conformance/testlog.xsl @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + <xsl:value-of select="@FileName"/> + + + + + + + + + + + + + + + + + + +
Total cases
Pass
Fail
Quality warning
Compatibility warning
Not supported
Resource error
Internal error
Timeout
Crash
Disabled
+ + + +
+ + + + + + <xsl:value-of select="@CasePath"/> + + +

: ()

+ + + +
+ + +
+

: ()

+ +
+
+ + +
+

+ +
+
+ + +
+

+ +
+
+ + +
+
+ +
+
+ + +
+

+ +
+
+ + +
+

Shader Program

+ +
+
+ + +
+

Vertex Shader

+ +
+
+ + +
+

Fragment Shader

+ +
+
+ + + :
+
+ + + + + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+

+ + + + + + + + + + + + +
IDRGBADSmS
+
+
+ + + + + + + + + + + + + + +