Skip to content

Commit 0872a69

Browse files
num3ricmichdolandoug-walker
authored
Missing docs update for new texture dimensions API. (#1833)
* Missing docs update for new texture dimensions API. Signed-off-by: Eric Renaud-Houde <[email protected]> * Further docs update through using frozen docs generation. Signed-off-by: Eric Renaud-Houde <[email protected]> --------- Signed-off-by: Eric Renaud-Houde <[email protected]> Co-authored-by: Michael Dolan <[email protected]> Co-authored-by: Doug Walker <[email protected]>
1 parent 8854e13 commit 0872a69

File tree

2 files changed

+112
-2
lines changed

2 files changed

+112
-2
lines changed

docs/api/python/frozen/pyopencolorio_gpushadercreator.rst

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,47 @@
5050
} //
5151
5252
53+
.. py:attribute:: GpuShaderCreator.TEXTURE_1D
54+
:module: PyOpenColorIO
55+
:value: <TextureDimensions.TEXTURE_1D: 1>
56+
57+
58+
.. py:attribute:: GpuShaderCreator.TEXTURE_2D
59+
:module: PyOpenColorIO
60+
:value: <TextureDimensions.TEXTURE_2D: 2>
61+
62+
63+
.. py:class:: GpuShaderCreator.TextureDimensions
64+
:module: PyOpenColorIO
65+
:canonical: PyOpenColorIO.GpuShaderCreator.TextureDimensions
66+
67+
Dimension enum used to differentiate between 1D and 2D object/resource types.
68+
69+
Members:
70+
71+
TEXTURE_1D
72+
73+
TEXTURE_2D
74+
75+
76+
.. py:attribute:: GpuShaderCreator.TextureDimensions.TEXTURE_1D
77+
:module: PyOpenColorIO
78+
:value: <TextureDimensions.TEXTURE_1D: 1>
79+
80+
81+
.. py:attribute:: GpuShaderCreator.TextureDimensions.TEXTURE_2D
82+
:module: PyOpenColorIO
83+
:value: <TextureDimensions.TEXTURE_2D: 2>
84+
85+
86+
.. py:property:: GpuShaderCreator.TextureDimensions.name
87+
:module: PyOpenColorIO
88+
89+
90+
.. py:property:: GpuShaderCreator.TextureDimensions.value
91+
:module: PyOpenColorIO
92+
93+
5394
.. py:method:: GpuShaderCreator.addToDeclareShaderCode(self: PyOpenColorIO.GpuShaderCreator, shaderCode: str) -> None
5495
:module: PyOpenColorIO
5596

@@ -99,6 +140,10 @@
99140
:module: PyOpenColorIO
100141

101142

143+
.. py:method:: GpuShaderCreator.getAllowTexture1D(self: PyOpenColorIO.GpuShaderCreator) -> bool
144+
:module: PyOpenColorIO
145+
146+
102147
.. py:method:: GpuShaderCreator.getCacheID(self: PyOpenColorIO.GpuShaderCreator) -> str
103148
:module: PyOpenColorIO
104149

@@ -148,6 +193,12 @@
148193
:module: PyOpenColorIO
149194

150195

196+
.. py:method:: GpuShaderCreator.setAllowTexture1D(self: PyOpenColorIO.GpuShaderCreator, allowed: bool) -> None
197+
:module: PyOpenColorIO
198+
199+
Allow 1D GPU resource type, otherwise always using 2D resources for 1D LUTs.
200+
201+
151202
.. py:method:: GpuShaderCreator.setFunctionName(self: PyOpenColorIO.GpuShaderCreator, name: str) -> None
152203
:module: PyOpenColorIO
153204

docs/api/python/frozen/pyopencolorio_gpushaderdesc.rst

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,51 @@
146146
Create the default shader description.
147147

148148

149+
.. py:attribute:: GpuShaderDesc.TEXTURE_1D
150+
:module: PyOpenColorIO
151+
:value: <TextureDimensions.TEXTURE_1D: 1>
152+
153+
154+
.. py:attribute:: GpuShaderDesc.TEXTURE_2D
155+
:module: PyOpenColorIO
156+
:value: <TextureDimensions.TEXTURE_2D: 2>
157+
158+
159+
.. py:class:: GpuShaderDesc.TextureDimensions
160+
:module: PyOpenColorIO
161+
:canonical: PyOpenColorIO.GpuShaderCreator.TextureDimensions
162+
163+
Dimension enum used to differentiate between 1D and 2D object/resource types.
164+
165+
Members:
166+
167+
TEXTURE_1D
168+
169+
TEXTURE_2D
170+
171+
172+
.. py:attribute:: GpuShaderDesc.TextureDimensions.TEXTURE_1D
173+
:module: PyOpenColorIO
174+
:value: <TextureDimensions.TEXTURE_1D: 1>
175+
176+
177+
.. py:attribute:: GpuShaderDesc.TextureDimensions.TEXTURE_2D
178+
:module: PyOpenColorIO
179+
:value: <TextureDimensions.TEXTURE_2D: 2>
180+
181+
182+
.. py:method:: GpuShaderDesc.TextureDimensions.__init__(self: PyOpenColorIO.GpuShaderCreator.TextureDimensions, value: int) -> None
183+
:module: PyOpenColorIO
184+
185+
186+
.. py:property:: GpuShaderDesc.TextureDimensions.name
187+
:module: PyOpenColorIO
188+
189+
190+
.. py:property:: GpuShaderDesc.TextureDimensions.value
191+
:module: PyOpenColorIO
192+
193+
149194
.. py:method:: GpuShaderDesc.__init__(*args, **kwargs)
150195
:module: PyOpenColorIO
151196

@@ -159,10 +204,10 @@
159204
The 'values' parameter contains the 3D LUT data which must be used as-is as the dimension and origin are hard-coded in the fragment shader program. So, it means one GPU 3D texture per entry.
160205

161206

162-
.. py:method:: GpuShaderDesc.addTexture(self: PyOpenColorIO.GpuShaderDesc, textureName: str, samplerName: str, width: int, height: int, channel: PyOpenColorIO.GpuShaderCreator.TextureType, interpolation: PyOpenColorIO.Interpolation, values: buffer) -> None
207+
.. py:method:: GpuShaderDesc.addTexture(self: PyOpenColorIO.GpuShaderDesc, textureName: str, samplerName: str, width: int, height: int, channel: PyOpenColorIO.GpuShaderCreator.TextureType, dimensions: PyOpenColorIO.GpuShaderCreator.TextureDimensions, interpolation: PyOpenColorIO.Interpolation, values: buffer) -> None
163208
:module: PyOpenColorIO
164209

165-
Add a 2D texture (1D texture if height equals 1).
210+
Add a 1D or 2D texture
166211

167212
.. note::
168213
The 'values' parameter contains the LUT data which must be used as-is as the dimensions and origin are hard-coded in the fragment shader program. So, it means one GPU texture per entry.
@@ -221,6 +266,10 @@
221266
:module: PyOpenColorIO
222267

223268

269+
.. py:method:: GpuShaderDesc.getAllowTexture1D(self: PyOpenColorIO.GpuShaderCreator) -> bool
270+
:module: PyOpenColorIO
271+
272+
224273
.. py:method:: GpuShaderDesc.getCacheID(self: PyOpenColorIO.GpuShaderCreator) -> str
225274
:module: PyOpenColorIO
226275

@@ -284,6 +333,12 @@
284333
:module: PyOpenColorIO
285334

286335

336+
.. py:method:: GpuShaderDesc.setAllowTexture1D(self: PyOpenColorIO.GpuShaderCreator, allowed: bool) -> None
337+
:module: PyOpenColorIO
338+
339+
Allow 1D GPU resource type, otherwise always using 2D resources for 1D LUTs.
340+
341+
287342
.. py:method:: GpuShaderDesc.setFunctionName(self: PyOpenColorIO.GpuShaderCreator, name: str) -> None
288343
:module: PyOpenColorIO
289344

@@ -379,6 +434,10 @@
379434
:module: PyOpenColorIO.GpuShaderDesc
380435

381436

437+
.. py:property:: Texture.dimensions
438+
:module: PyOpenColorIO.GpuShaderDesc
439+
440+
382441
.. py:method:: Texture.getValues(self: PyOpenColorIO.GpuShaderDesc.Texture) -> numpy.ndarray
383442
:module: PyOpenColorIO.GpuShaderDesc
384443

0 commit comments

Comments
 (0)