ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Texture.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Texture.pm (file contents):
Revision 1.8 by root, Sat Jun 17 15:07:53 2006 UTC vs.
Revision 1.9 by root, Sat Jun 17 15:48:59 2006 UTC

161 $self->{type}, 161 $self->{type},
162 $data; 162 $data;
163 gl_check "uploading texture %dx%d if=%x f=%x t=%x", 163 gl_check "uploading texture %dx%d if=%x f=%x t=%x",
164 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type}; 164 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
165 } else { 165 } else {
166 exists $self->{render_cb} or die;
166 glCopyTexImage2D GL_TEXTURE_2D, 0, 167 glCopyTexImage2D GL_TEXTURE_2D, 0,
167 $self->{internalformat}, 168 $self->{internalformat},
168 0, 0, 169 0, 0,
169 $tw, $th, 170 $tw, $th,
170 0; 171 0;
174} 175}
175 176
176sub shutdown { 177sub shutdown {
177 my ($self) = @_; 178 my ($self) = @_;
178 179
179 glDeleteTexture delete $self->{name} 180 glDeleteTexture $self->{name}
180 if $self->{name}; 181 if $self->{name};
181} 182}
182 183
183sub DESTROY { 184sub DESTROY {
184 my ($self) = @_; 185 my ($self) = @_;
187 188
188 $self->shutdown; 189 $self->shutdown;
189} 190}
190 191
191$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub { 192$CFClient::OpenGL::INIT_HOOK{"CFClient::Texture"} = sub {
193 # first mark all existing texture names as in-use, in case the context lost textures
194 glBindTexture GL_TEXTURE_2D, $_->{name}
195 for values %TEXTURES;
192 $_->upload 196 $_->upload
193 for values %TEXTURES; 197 for values %TEXTURES;
194}; 198};
195 199
196$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub { 200$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Texture"} = sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines