aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llrender.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llrender/llrender.h')
-rw-r--r--linden/indra/llrender/llrender.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 8c648f3..7dcb504 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -135,12 +135,17 @@ public:
135 // Disables the current texture unit 135 // Disables the current texture unit
136 void disable(void); 136 void disable(void);
137 137
138 // Binds the LLImageGL to this texture unit (automatically enables the unit for the LLImageGL's texture type) 138 // Binds the LLImageGL to this texture unit
139 bool bind(const LLImageGL* texture); 139 // (automatically enables the unit for the LLImageGL's texture type)
140 // Binds a cubemap to this texture unit (automatically enables the texture unit for cubemaps) 140 bool bind(const LLImageGL* texture, bool forceBind = false);
141
142 // Binds a cubemap to this texture unit
143 // (automatically enables the texture unit for cubemaps)
141 bool bind(LLCubeMap* cubeMap); 144 bool bind(LLCubeMap* cubeMap);
145
142 // Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type) 146 // Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type)
143 bool bind(LLRenderTarget * renderTarget, bool bindDepth = false); 147 bool bind(LLRenderTarget * renderTarget, bool bindDepth = false);
148
144 // Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type) 149 // Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type)
145 bool bindManual(eTextureType type, U32 texture); 150 bool bindManual(eTextureType type, U32 texture);
146 151