mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-04-23 23:19:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix prepare_scene

Browse Source
This commit is contained in:
David Rose
2008-12-10 21:37:08 +00:00
parent e31be8e3f0
commit 4d09989995
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panda/src/tinydisplay/tinyGraphicsStateGuardian.cxx
+30 -2
View File
@@ -1559,7 +1559,7 @@ prepare_texture(Texture *tex) {
////////////////////////////////////////////////////////////////////
// Function: TinyGraphicsStateGuardian::update_texture
// Access: Public
// Access: Public, Virtual
// Description: Ensures that the current Texture data is refreshed
// onto the GSG. This means updating the texture
// properties and/or re-uploading the texture image, if
@@ -1574,7 +1574,7 @@ prepare_texture(Texture *tex) {
// true).
////////////////////////////////////////////////////////////////////
bool TinyGraphicsStateGuardian::
update_texture(TextureContext *tc, bool force, int stage_index) {
update_texture(TextureContext *tc, bool force) {
apply_texture(tc);
TinyTextureContext *gtc = DCAST(TinyTextureContext, tc);
@@ -1592,6 +1592,34 @@ update_texture(TextureContext *tc, bool force, int stage_index) {
}
gtc->enqueue_lru(&_prepared_objects->_graphics_memory_lru);
return true;
}
////////////////////////////////////////////////////////////////////
// Function: TinyGraphicsStateGuardian::update_texture
// Access: Public
// Description: Ensures that the current Texture data is refreshed
// onto the GSG. This means updating the texture
// properties and/or re-uploading the texture image, if
// necessary. This should only be called within the
// draw thread.
//
// If force is true, this function will not return until
// the texture has been fully uploaded. If force is
// false, the function may choose to upload a simple
// version of the texture instead, if the texture is not
// fully resident (and if get_incomplete_render() is
// true).
////////////////////////////////////////////////////////////////////
bool TinyGraphicsStateGuardian::
update_texture(TextureContext *tc, bool force, int stage_index) {
if (!update_texture(tc, force)) {
return false;
}
TinyTextureContext *gtc = DCAST(TinyTextureContext, tc);
GLTexture *gltex = &gtc->_gltex;
_c->current_textures[stage_index] = gltex;
_c->zb->current_textures[stage_index] = gltex->levels;
panda/src/tinydisplay/tinyGraphicsStateGuardian.h
+1
View File
@@ -82,6 +82,7 @@ public:
const TransformState *transform);
virtual TextureContext *prepare_texture(Texture *tex);
virtual bool update_texture(TextureContext *tc, bool force);
bool update_texture(TextureContext *tc, bool force, int stage_index);
virtual void release_texture(TextureContext *tc);