From 6a8e7cbbe511500c663d2ac715d8e7fc71ca4d48 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 20 Jul 2020 10:52:59 +0100 Subject: [PATCH] Fix python examples not being up to date with latest API changes --- docs/python_api/examples/renderdoc/decode_mesh.py | 3 +-- docs/python_api/examples/renderdoc/decode_mesh.rst | 3 +-- docs/python_api/examples/renderdoc/fetch_counters.rst | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/python_api/examples/renderdoc/decode_mesh.py b/docs/python_api/examples/renderdoc/decode_mesh.py index 1f9d7d3b9..adcf9c02a 100644 --- a/docs/python_api/examples/renderdoc/decode_mesh.py +++ b/docs/python_api/examples/renderdoc/decode_mesh.py @@ -46,7 +46,6 @@ def unpackData(fmt, data): formatChars[rd.CompType.UScaled] = formatChars[rd.CompType.UInt] formatChars[rd.CompType.SNorm] = formatChars[rd.CompType.SInt] formatChars[rd.CompType.SScaled] = formatChars[rd.CompType.SInt] - formatChars[rd.CompType.Double] = formatChars[rd.CompType.Float] # We need to fetch compCount components vertexFormat = str(fmt.compCount) + formatChars[fmt.compType][fmt.compByteWidth] @@ -164,7 +163,7 @@ def getMeshOutputs(controller, postvs): # while others will tightly pack fmt = meshOutputs[i].format - accumOffset += (8 if fmt.compType == rd.CompType.Double else 4) * fmt.compCount + accumOffset += (8 if fmt.compByteWidth > 4 else 4) * fmt.compCount return meshOutputs diff --git a/docs/python_api/examples/renderdoc/decode_mesh.rst b/docs/python_api/examples/renderdoc/decode_mesh.rst index fc5286d09..ed3ba6e94 100644 --- a/docs/python_api/examples/renderdoc/decode_mesh.rst +++ b/docs/python_api/examples/renderdoc/decode_mesh.rst @@ -105,7 +105,6 @@ For normalised formats - :py:attr:`~renderdoc.CompType.UNorm` and :py:attr:`~ren formatChars[rd.CompType.UScaled] = formatChars[rd.CompType.UInt] formatChars[rd.CompType.SNorm] = formatChars[rd.CompType.SInt] formatChars[rd.CompType.SScaled] = formatChars[rd.CompType.SInt] - formatChars[rd.CompType.Double] = formatChars[rd.CompType.Float] # We need to fetch compCount components vertexFormat = str(fmt.compCount) + formatChars[fmt.compType][fmt.compByteWidth] @@ -220,7 +219,7 @@ The position output is also treated specially - it always appears first, regardl # while others will tightly pack fmt = meshOutputs[i].format - accumOffset += (8 if fmt.compType == rd.CompType.Double else 4) * fmt.compCount + accumOffset += (8 if fmt.compByteWidth > 4 else 4) * fmt.compCount Example Source -------------- diff --git a/docs/python_api/examples/renderdoc/fetch_counters.rst b/docs/python_api/examples/renderdoc/fetch_counters.rst index eb0478e5c..3bcb87bcb 100644 --- a/docs/python_api/examples/renderdoc/fetch_counters.rst +++ b/docs/python_api/examples/renderdoc/fetch_counters.rst @@ -71,7 +71,7 @@ Sample output: Counter 1 (GPU Duration): Time taken for this event on the GPU, as measured by delta between two GPU timestamps. - Returns 8 byte CompType.Double, representing CounterUnit.Seconds + Returns 8 byte CompType.Float, representing CounterUnit.Seconds Counter 2 (Input Vertices Read): Number of vertices read by input assembler. Returns 8 byte CompType.UInt, representing CounterUnit.Absolute