TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

CommonFilters: give passes a unique name for debugging/PStats

Browse Source
This commit is contained in:
rdb 2018-11-19 22:15:31 +01:00
parent d902ea5ce4
commit b1eec5fae0
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
direct/src/filter/CommonFilters.py
View File

@ -184,8 +184,8 @@ class CommonFilters:
if ("BlurSharpen" in configuration):
blur0=self.textures["blur0"]
blur1=self.textures["blur1"]
self.blur.append(self.manager.renderQuadInto(colortex=blur0,div=2))
self.blur.append(self.manager.renderQuadInto(colortex=blur1))
self.blur.append(self.manager.renderQuadInto("filter-blur0", colortex=blur0,div=2))
self.blur.append(self.manager.renderQuadInto("filter-blur1", colortex=blur1))
self.blur[0].setShaderInput("src", self.textures["color"])
self.blur[0].setShader(self.loadShader("filter-blurx.sha"))
self.blur[1].setShaderInput("src", blur0)
@ -195,9 +195,9 @@ class CommonFilters:
ssao0=self.textures["ssao0"]
ssao1=self.textures["ssao1"]
ssao2=self.textures["ssao2"]
self.ssao.append(self.manager.renderQuadInto(colortex=ssao0))
self.ssao.append(self.manager.renderQuadInto(colortex=ssao1,div=2))
self.ssao.append(self.manager.renderQuadInto(colortex=ssao2))
self.ssao.append(self.manager.renderQuadInto("filter-ssao0", colortex=ssao0))
self.ssao.append(self.manager.renderQuadInto("filter-ssao1", colortex=ssao1,div=2))
self.ssao.append(self.manager.renderQuadInto("filter-ssao2", colortex=ssao2))
self.ssao[0].setShaderInput("depth", self.textures["depth"])
self.ssao[0].setShaderInput("normal", self.textures["aux"])
self.ssao[0].setShaderInput("random", loader.loadTexture("maps/random.rgb"))
@ -215,21 +215,21 @@ class CommonFilters:
bloom3=self.textures["bloom3"]
if (bloomconf.size == "large"):
scale=8
downsampler="filter-down4.sha"
downsampler="filter-down4"
elif (bloomconf.size == "medium"):
scale=4
downsampler="filter-copy.sha"
downsampler="filter-copy"
else:
scale=2
downsampler="filter-copy.sha"
self.bloom.append(self.manager.renderQuadInto(colortex=bloom0, div=2, align=scale))
self.bloom.append(self.manager.renderQuadInto(colortex=bloom1, div=scale, align=scale))
self.bloom.append(self.manager.renderQuadInto(colortex=bloom2, div=scale, align=scale))
self.bloom.append(self.manager.renderQuadInto(colortex=bloom3, div=scale, align=scale))
downsampler="filter-copy"
self.bloom.append(self.manager.renderQuadInto("filter-bloomi", colortex=bloom0, div=2, align=scale))
self.bloom.append(self.manager.renderQuadInto(downsampler, colortex=bloom1, div=scale, align=scale))
self.bloom.append(self.manager.renderQuadInto("filter-bloomx", colortex=bloom2, div=scale, align=scale))
self.bloom.append(self.manager.renderQuadInto("filter-bloomy", colortex=bloom3, div=scale, align=scale))
self.bloom[0].setShaderInput("src", self.textures["color"])
self.bloom[0].setShader(self.loadShader("filter-bloomi.sha"))
self.bloom[1].setShaderInput("src", bloom0)
self.bloom[1].setShader(self.loadShader(downsampler))
self.bloom[1].setShader(self.loadShader(downsampler + ".sha"))
self.bloom[2].setShaderInput("src", bloom1)
self.bloom[2].setShader(self.loadShader("filter-bloomx.sha"))
self.bloom[3].setShaderInput("src", bloom2)

4
direct/src/filter/FilterManager.py
View File

@ -236,7 +236,7 @@ class FilterManager(DirectObject):
return quad
def renderQuadInto(self, mul=1, div=1, align=1, depthtex=None, colortex=None, auxtex0=None, auxtex1=None):
def renderQuadInto(self, name="filter-stage", mul=1, div=1, align=1, depthtex=None, colortex=None, auxtex0=None, auxtex1=None):
""" Creates an offscreen buffer for an intermediate
computation. Installs a quad into the buffer. Returns
@ -250,7 +250,7 @@ class FilterManager(DirectObject):
depthbits = bool(depthtex != None)
buffer = self.createBuffer("filter-stage", winx, winy, texgroup, depthbits)
buffer = self.createBuffer(name, winx, winy, texgroup, depthbits)
if (buffer == None):
return None