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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.37 by root, Sun Apr 16 07:25:29 2006 UTC vs.
Revision 1.40 by root, Tue Apr 18 01:51:06 2006 UTC

… …
93mkdir "$Crossfire::VARDIR/pclient", 0777; 93mkdir "$Crossfire::VARDIR/pclient", 0777;
94 94
95our $DB_ENV = new BerkeleyDB::Env 95our $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 96 -Home => "$Crossfire::VARDIR/pclient",
97 -Cachesize => 1_000_000, 97 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 98 -ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",
99 -ErrPrefix => "DATABASE", 99# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 101 -Flags => DB_CREATE | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";
103 103
104sub db_table($) { 104sub db_table($) {
105 my ($table) = @_;
106
107 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
105 new CFClient::Database 109 new CFClient::Database
106 -Env => $DB_ENV, 110 -Env => $DB_ENV,
111 -Filename => $table,
107 -Filename => "database", 112# -Filename => "database",
108 -Subname => $_[0], 113# -Subname => $table,
109 -Flags => DB_CREATE | DB_UPGRADE, 114 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 115 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";
111} 116}
112 117
113package CFClient::Database; 118package CFClient::Database;
… …
259 } 264 }
260 } 265 }
261 266
262 $self->{s} = $self->{w} / $tw; 267 $self->{s} = $self->{w} / $tw;
263 $self->{t} = $self->{h} / $th; 268 $self->{t} = $self->{h} / $th;
269
270 glGetError;
264 271
265 $self->{name} ||= (glGenTextures 1)->[0]; 272 $self->{name} ||= (glGenTextures 1)->[0];
266 273
267 glBindTexture GL_TEXTURE_2D, $self->{name}; 274 glBindTexture GL_TEXTURE_2D, $self->{name};
268 275
… …
277 $tw, $th, # need to pad texture first 284 $tw, $th, # need to pad texture first
278 0, 285 0,
279 $self->{format}, 286 $self->{format},
280 $self->{type}, 287 $self->{type},
281 $data; 288 $data;
282 glGetError and die; 289 if (my $error = glGetError) {
290 warn sprintf "texture upload error: %x %dx%d i=%x f=%x t=%x\n",
291 $error, $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
292 }
283 } else { 293 } else {
284 glCopyTexImage2D GL_TEXTURE_2D, 0, 294 glCopyTexImage2D GL_TEXTURE_2D, 0,
285 $self->{internalformat}, 295 $self->{internalformat},
286 0, 0, 296 0, 0,
287 $tw, $th, 297 $tw, $th,

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines