incorporate from unreleased OpenGL::Shader 1.02

Author: bfree-github

Changes

@@ -1,4 +1,6 @@
 - OpenGL::Shader improved error reporting for shader compiles - thanks Ivan Baidakou
+- from unreleased OpenGL::Shader 1.02: add SetArray for setting integer uniforms
+- from unreleased OpenGL::Shader 1.02: update SetMatrix to handle both 3x3 and 4x4 matrices
 
 0.7004 2025-03-19
 - re-release with higher version number for OpenGL::Array

lib/OpenGL/Shader.pm

@@ -87,6 +87,7 @@ sub new {
   my $this = shift;
   my @types = @_ ? @_ : ('GLSL','CG','ARB');
   foreach my $type (@types) {
+    next if !$type;
     my $module = GetTypeModule($type);
     (my $file = $module) =~ s{::}{/}g;
     require "$file.pm";

lib/OpenGL/Shader/ARB.pm

@@ -78,11 +78,10 @@ sub new {
   my $ver = TypeVersion();
   return undef if (!$ver);
 
-  my $self = OpenGL::Shader::Objects->new(@_);
+  my $self = OpenGL::Shader::Objects->new('ARB');
   return undef if (!$self);
   bless($self,$class);
 
-  $self->{type} = 'ARB';
   $self->{version} = $ver;
   $self->{description} = TypeDescription();
 

lib/OpenGL/Shader/CG.pm

@@ -14,9 +14,9 @@ use Carp;
 
 use strict;
 use warnings;
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
-our $SHADER_VER;
+our $SHADER_VER = '1.0';
 our $DESCRIPTION = qq
 {nVidia's Cg Shader Language};
 
@@ -90,11 +90,10 @@ sub new
   my $ver = TypeVersion();
   return undef if (!$ver);
 
-  my $self = OpenGL::Shader::Objects->new(@_);
+  my $self = OpenGL::Shader::Objects->new('CG');
   return undef if (!$self);
   bless($self,$class);
 
-  $self->{type} = 'CG';
   $self->{version} = $ver;
   $self->{description} = $DESCRIPTION;
 

lib/OpenGL/Shader/Common.pm

@@ -14,7 +14,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 =head1 NAME
 

lib/OpenGL/Shader/GLSL.pm

@@ -14,7 +14,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 our $SHADER_VER;
 our $DESCRIPTION = qq
@@ -79,18 +79,14 @@ sub new {
   # Check for additional required OpenGL extensions
   my $ver = TypeVersion();
   return undef if (!$ver);
-  my $self = OpenGL::Shader::Objects->new(@_);
+  my $self = OpenGL::Shader::Objects->new('GLSL');
   return undef if (!$self);
   bless($self,$class);
-  $self->{type} = 'GLSL';
   $self->{version} = $ver;
   $self->{description} = $DESCRIPTION;
   $self->{fragment_const} = GL_FRAGMENT_SHADER;
   $self->{vertex_const} = GL_VERTEX_SHADER;
   return $self;
 }
 
-
 1;
-__END__
-

lib/OpenGL/Shader/Objects.pm

@@ -16,7 +16,7 @@ use strict;
 use warnings;
 use Carp;
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 
 use OpenGL::Shader::Common;
 our @ISA = qw(OpenGL::Shader::Common);
@@ -51,14 +51,14 @@ modify it under the same terms as Perl itself.
 sub new {
   my $this = shift;
   my $class = ref($this) || $this;
-  my $self = OpenGL::Shader::Common->new(@_);
+  my($type) = @_;
+  my $self = OpenGL::Shader::Common->new($type);
   return undef if (!$self);
   bless($self,$class);
   # Check for required OpenGL extensions
   return undef if (OpenGL::glpCheckExtension('GL_ARB_shader_objects'));
   return undef if (OpenGL::glpCheckExtension('GL_ARB_fragment_shader'));
   return undef if (OpenGL::glpCheckExtension('GL_ARB_vertex_shader'));
-  $self->{type} = '';
   $self->{version} = '';
   $self->{description} = '';
   $self->{fragment_const} = '';
@@ -154,7 +154,17 @@ sub Map {
   return $id;
 }
 
-# Set shader vector
+# Set shader Uniform integer array
+sub SetArray {
+  my($self,$var,@values) = @_;
+  my $id = $self->Map($var);
+  return 'Unable to map $var' if (!defined($id));
+  my $count = scalar(@values);
+  eval('glUniform'.$count.'iARB($id,@values)');
+  return '';
+}
+
+# Set shader Uniform float array
 sub SetVector {
   my($self,$var,@values) = @_;
   my $id = $self->Map($var);
@@ -164,13 +174,18 @@ sub SetVector {
   return '';
 }
 
-
-# Set shader 4x4 matrix
+# Set shader matrix
 sub SetMatrix {
   my($self,$var,$oga) = @_;
   my $id = $self->Map($var);
   return 'Unable to map $var' if (!defined($id));
-  glUniformMatrix4fvARB_c($id,1,0,$oga->ptr());
+  if ($oga->elements == 16) {
+    glUniformMatrix4fvARB_c($id,1,0,$oga->ptr());
+  } elsif ($oga->elements == 9) {
+    glUniformMatrix3fvARB_c($id,1,0,$oga->ptr());
+  } else {
+    return 'Only supports 3x3 and 4x4 matrices';
+  }
   return '';
 }
 

t/shader.t

@@ -44,7 +44,7 @@ die "No known shader types available" if !$good;
 
 pass "at least one test";
 test_shader('ARB');
-test_shader('CG');
+test_shader('CG') if !OpenGL::glpCheckExtension('GL_EXT_Cg_shader');
 test_shader('GLSL');
 
 sub test_shader {