buildSrc/src/main/java/com/sun/scenario/effect/compiler/JSLC.java

*** 179,188 ****
--- 179,189 ----
                                        long sourceTime,
                                        ParserInfo pinfo)
          throws Exception
      {
          int outTypes = jslcinfo.outTypes;
+         String genericsName = jslcinfo.genericsName;
          String interfaceName = jslcinfo.interfaceName;
          String peerName = jslcinfo.peerName;
          String shaderName = jslcinfo.shaderName;
          if (peerName == null) peerName = shaderName;
  
*** 208,218 ****
          if ((outTypes & OUT_JAVA) != 0) {
              File outFile = jslcinfo.getOutputFile(OUT_JAVA);
              if (jslcinfo.force || outOfDate(outFile, sourceTime)) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  JSWBackend javaBackend = new JSWBackend(pinfo.parser, pinfo.program);
!                 String genCode = javaBackend.getGenCode(shaderName, peerName, interfaceName);
                  write(genCode, outFile);
              }
          }
          
          if ((outTypes & OUT_SSE) != 0) {
--- 209,219 ----
          if ((outTypes & OUT_JAVA) != 0) {
              File outFile = jslcinfo.getOutputFile(OUT_JAVA);
              if (jslcinfo.force || outOfDate(outFile, sourceTime)) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  JSWBackend javaBackend = new JSWBackend(pinfo.parser, pinfo.program);
!                 String genCode = javaBackend.getGenCode(shaderName, peerName, genericsName, interfaceName);
                  write(genCode, outFile);
              }
          }
          
          if ((outTypes & OUT_SSE) != 0) {
*** 225,235 ****
              boolean genCFileStale = outOfDate(genCFile, sourceTime);
              if (jslcinfo.force || outFileStale || genCFileStale) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  SSEBackend sseBackend = new SSEBackend(pinfo.parser, pinfo.program);
                  SSEBackend.GenCode gen =
!                     sseBackend.getGenCode(shaderName, peerName, interfaceName);
  
                  // write impl class
                  if (outFileStale) {
                      write(gen.javaCode, outFile);
                  }
--- 226,236 ----
              boolean genCFileStale = outOfDate(genCFile, sourceTime);
              if (jslcinfo.force || outFileStale || genCFileStale) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  SSEBackend sseBackend = new SSEBackend(pinfo.parser, pinfo.program);
                  SSEBackend.GenCode gen =
!                     sseBackend.getGenCode(shaderName, peerName, genericsName, interfaceName);
  
                  // write impl class
                  if (outFileStale) {
                      write(gen.javaCode, outFile);
                  }
*** 251,261 ****
              boolean genCFileStale = outOfDate(genCFile, sourceTime);
              if (jslcinfo.force || outFileStale || genCFileStale) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  MEBackend sseBackend = new MEBackend(pinfo.parser, pinfo.program);
                  MEBackend.GenCode gen =
!                     sseBackend.getGenCode(shaderName, peerName, interfaceName);
  
                  // write impl class
                  if (outFileStale) {
                      write(gen.javaCode, outFile);
                  }
--- 252,262 ----
              boolean genCFileStale = outOfDate(genCFile, sourceTime);
              if (jslcinfo.force || outFileStale || genCFileStale) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  MEBackend sseBackend = new MEBackend(pinfo.parser, pinfo.program);
                  MEBackend.GenCode gen =
!                     sseBackend.getGenCode(shaderName, peerName, genericsName, interfaceName);
  
                  // write impl class
                  if (outFileStale) {
                      write(gen.javaCode, outFile);
                  }
*** 270,280 ****
          if ((outTypes & OUT_PRISM) != 0) {
              File outFile = jslcinfo.getOutputFile(OUT_PRISM);
              if (jslcinfo.force || outOfDate(outFile, sourceTime)) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  PrismBackend prismBackend = new PrismBackend(pinfo.parser, pinfo.program);
!                 String genCode = prismBackend.getGlueCode(shaderName, peerName, interfaceName);
                  write(genCode, outFile);
              }
          }
  
          return pinfo;
--- 271,281 ----
          if ((outTypes & OUT_PRISM) != 0) {
              File outFile = jslcinfo.getOutputFile(OUT_PRISM);
              if (jslcinfo.force || outOfDate(outFile, sourceTime)) {
                  if (pinfo == null) pinfo = getParserInfo(stream);
                  PrismBackend prismBackend = new PrismBackend(pinfo.parser, pinfo.program);
!                 String genCode = prismBackend.getGlueCode(shaderName, peerName, genericsName, interfaceName);
                  write(genCode, outFile);
              }
          }
  
          return pinfo;
*** 310,319 ****
--- 311,321 ----
          public String outDir;
          public boolean trimToOutDir;
          public List<String> srcDirs = new ArrayList<String>();
          public String shaderName;
          public String peerName;
+         public String genericsName;
          public String interfaceName;
          public String pkgName = rootPkg;
          public Map<Integer, String> outNameMap = initDefaultInfoMap();
  
          private String extraOpts;