Skip to content

Commit f8b2239

Browse files
wchristiandevel-chm
authored andcommitted
Golf helpers (#30)
* deduplicate info log calls in Helpers * apply system-specific pack semantics to pointer sizes
1 parent f8f9555 commit f8b2239

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

lib/OpenGL/Modern/Helpers.pm

+8-13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ OpenGL::Modern::Helpers;
44
use strict;
55
use Exporter 'import';
66
use Carp qw(croak);
7+
use Config;
78

89
use OpenGL::Modern qw(
910
GL_NO_ERROR
@@ -158,6 +159,7 @@ $VERSION = '0.01_02';
158159
GL_TABLE_TOO_LARGE() => 'The specified table exceeds the implementation\'s maximum supported table size.',
159160
);
160161

162+
our $PACK_TYPE = $Config{ptrsize} == 4 ? 'L' : 'Q';
161163

162164
sub pack_GLuint {
163165
my @gluints = @_;
@@ -205,28 +207,21 @@ sub xs_buffer {
205207
$_[0];
206208
}
207209

208-
sub glGetShaderInfoLog_p {
209-
my $shader = $_[0];
210+
sub get_info_log_p {
211+
my ( $call, $id ) = @_;
210212
my $bufsize = 1024*64;
211213
my $buffer = "\0" x $bufsize;
212214
my $len = "\0" x 4;
213215
# void glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
214-
glGetShaderInfoLog_c( $shader, $bufsize, unpack('Q',pack('p',$len)), $buffer);
215-
$len = unpack 'I', $len;
216-
return substr $buffer, 0, $len;
217-
}
218-
219-
sub glGetProgramInfoLog_p {
220-
my $program = $_[0];
221-
my $bufsize = 1024*64;
222-
my $buffer = "\0" x $bufsize;
223-
my $len = "\0" x 4;
224216
# void glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog);
225-
glGetProgramInfoLog_c( $program, $bufsize, unpack('Q',pack('p',$len)), $buffer);
217+
$call->( $id, $bufsize, unpack( $PACK_TYPE, pack( 'p', $len ) ), $buffer );
226218
$len = unpack 'I', $len;
227219
return substr $buffer, 0, $len;
228220
}
229221

222+
sub glGetShaderInfoLog_p { get_info_log_p \&glGetShaderInfoLog, @_ }
223+
sub glGetProgramInfoLog_p { get_info_log_p \&glGetProgramInfoLog, @_ }
224+
230225
sub glGetVersion_p {
231226
# const GLubyte * GLAPIENTRY glGetString (GLenum name);
232227
my $glVersion = glGetString(GL_VERSION);

0 commit comments

Comments
 (0)