Skip to content

Commit 25bd141

Browse files
mohawk2mohawk2
committed
fix tests to use latest OpenGL::Modern
1 parent cb568fa commit 25bd141

File tree

7 files changed

+22
-20
lines changed

7 files changed

+22
-20
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [ubuntu-latest]
16-
perl-version: ['5.10', '5.14', '5.20']
16+
perl-version: ['5.16', '5.20']
1717
include:
1818
- perl-version: '5.30'
1919
os: ubuntu-latest

‎Changes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
- fix tests to use latest OpenGL::Modern (glGetUniformLocation_c removed _c)
2+
13
0.0402 2025-04-11
24
- minimum Perl 5.10 for better Exporter
35
- add constants up to GLFW 3.4

‎Makefile.PL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ WriteMakefile(
1818
},
1919
MIN_PERL_VERSION => '5.010',
2020
TEST_REQUIRES => {
21-
'OpenGL::Modern' => 0.04,
21+
'OpenGL::Modern' => '0.0401',
2222
},
2323
ABSTRACT_FROM => 'lib/OpenGL/GLFW.pm', # retrieve abstract from module
2424
AUTHOR => 'Chris Marshall <[email protected]>',

‎examples/callback.pl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
# glUseProgram
3939
# glViewport
4040
#
41-
# glGetAttribLocation_c
42-
# glGetUniformLocation_c
41+
# glGetAttribLocation
42+
# glGetUniformLocation
4343
# glUniformMatrix4fv_c
4444
# glVertexAttribPointer_c
4545
#
@@ -260,9 +260,9 @@
260260
glAttachShader($program, $fragment_shader);
261261
glLinkProgram($program);
262262

263-
my $mvp_location = glGetUniformLocation_c($program, "MVP"); # TODO change name to _p or no-suffix
264-
my $vpos_location = glGetAttribLocation_c($program, "vPos"); # TODO change name to _p or no-suffix
265-
my $vcol_location = glGetAttribLocation_c($program, "vCol"); # TODO change name to _p or no-suffix
263+
my $mvp_location = glGetUniformLocation($program, "MVP"); # TODO change name to _p or no-suffix
264+
my $vpos_location = glGetAttribLocation($program, "vPos"); # TODO change name to _p or no-suffix
265+
my $vcol_location = glGetAttribLocation($program, "vCol"); # TODO change name to _p or no-suffix
266266

267267
glEnableVertexAttribArray($vpos_location);
268268
#------------------------------------------------------------ stride, offset

‎examples/checkimg.pl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@
231231
glAttachShader($program, $fragment_shader);
232232
glLinkProgram($program);
233233

234-
my $mvp_location = glGetUniformLocation_c($program, "MVP"); # TODO change name to _p or no-suffix
235-
my $vpos_location = glGetAttribLocation_c($program, "vPos"); # TODO change name to _p or no-suffix
236-
my $vcol_location = glGetAttribLocation_c($program, "vCol"); # TODO change name to _p or no-suffix
234+
my $mvp_location = glGetUniformLocation($program, "MVP"); # TODO change name to _p or no-suffix
235+
my $vpos_location = glGetAttribLocation($program, "vPos"); # TODO change name to _p or no-suffix
236+
my $vcol_location = glGetAttribLocation($program, "vCol"); # TODO change name to _p or no-suffix
237237

238238
glEnableVertexAttribArray($vpos_location);
239239
#------------------------------------------------------------ stride, offset

‎examples/simple.pl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
# glUseProgram
3939
# glViewport
4040
#
41-
# glGetAttribLocation_c
42-
# glGetUniformLocation_c
41+
# glGetAttribLocation
42+
# glGetUniformLocation
4343
# glUniformMatrix4fv_c
4444
# glVertexAttribPointer_c
4545
#
@@ -148,9 +148,9 @@
148148
glAttachShader( $program, $fragment_shader );
149149
glLinkProgram( $program );
150150

151-
my $mvp_location = glGetUniformLocation_c( $program, "MVP" ); # TODO change name to _p or no-suffix
152-
my $vpos_location = glGetAttribLocation_c( $program, "vPos" ); # TODO change name to _p or no-suffix
153-
my $vcol_location = glGetAttribLocation_c( $program, "vCol" ); # TODO change name to _p or no-suffix
151+
my $mvp_location = glGetUniformLocation( $program, "MVP" ); # TODO change name to _p or no-suffix
152+
my $vpos_location = glGetAttribLocation( $program, "vPos" ); # TODO change name to _p or no-suffix
153+
my $vcol_location = glGetAttribLocation( $program, "vCol" ); # TODO change name to _p or no-suffix
154154

155155
glEnableVertexAttribArray( $vpos_location );
156156

‎test.pl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
# glUseProgram
4747
# glViewport
4848
#
49-
# glGetAttribLocation_c
50-
# glGetUniformLocation_c
49+
# glGetAttribLocation
50+
# glGetUniformLocation
5151
# glUniformMatrix4fv_c
5252
# glVertexAttribPointer_c
5353
#
@@ -163,9 +163,9 @@
163163
glAttachShader($program, $fragment_shader);
164164
glLinkProgram($program);
165165

166-
my $mvp_location = glGetUniformLocation_c($program, "MVP"); # TODO change name to _p or no-suffix
167-
my $vpos_location = glGetAttribLocation_c($program, "vPos"); # TODO change name to _p or no-suffix
168-
my $vcol_location = glGetAttribLocation_c($program, "vCol"); # TODO change name to _p or no-suffix
166+
my $mvp_location = glGetUniformLocation($program, "MVP"); # TODO change name to _p or no-suffix
167+
my $vpos_location = glGetAttribLocation($program, "vPos"); # TODO change name to _p or no-suffix
168+
my $vcol_location = glGetAttribLocation($program, "vCol"); # TODO change name to _p or no-suffix
169169

170170
glEnableVertexAttribArray($vpos_location);
171171
#------------------------------------------------------------ stride, offset

0 commit comments

Comments
 (0)