ecere/gfx/newFonts/DrawManager: Fixes for FFP GL support

- Matrix was not being set
- Avoid querying current program
- Using GL_ALPHA rather than GL_RED

diff --git a/Makefile b/Makefile
index 7176ad8..eafad3b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -660,7 +660,9 @@ endif
        install $(OBJLIBDIR)libecereVanilla$(A) $(DESTSLIBDIR)/
        install -d $(DOCDIR)/
        install doc/tao.pdf $(DOCDIR)/"Ecere Tao of Programming [work in progress].pdf" >/dev/null 2>&1 || echo "The Ecere Tao of Programming is available at http://ecere.com/tao.pdf"
-       $(call cpr,$(DOC)/*.econ,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/ecere/,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/ecereCOM/,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/EDA/,"$(DOCDIR)/")
        mkdir -p $(MANDIR)/man1
        cp -pRf share/man/man1/* $(MANDIR)/man1
        mkdir -p $(SAMPLESDIR)
@@ -732,7 +734,9 @@ ifdef BSD_HOST
        install $(INSTALL_FLAGS) -d $(DOCDIR)
 endif
        install $(INSTALL_FLAGS) -m 644 doc/tao.pdf $(DOCDIR)/"Ecere Tao of Programming [work in progress].pdf" >/dev/null 2>&1 || echo "The Ecere Tao of Programming is available at http://ecere.com/tao.pdf"
-       $(call cpr,$(DOC)/*.econ,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/ecere/,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/ecereCOM/,"$(DOCDIR)/")
+       $(call cpr,$(DOC)/EDA/,"$(DOCDIR)/")
        mkdir -p $(MANDIR)/man1
        cp -pRf share/man/man1/* $(MANDIR)/man1
        mkdir -p $(SAMPLESDIR)

diff --git a/ecere/src/gfx/newFonts/drawManager.ec b/ecere/src/gfx/newFonts/drawManager.ec
index 41efbeb..9e87e36 100644 (file)
--- a/ecere/src/gfx/newFonts/drawManager.ec
+++ b/ecere/src/gfx/newFonts/drawManager.ec
@@ -1206,7 +1206,7 @@ public:
    {
       int mindex;
       float norminv;
-      if(!prevProgram)
+      if(!flags.prehistoricOpenGL && !prevProgram)
          glGetIntegerv(GL_CURRENT_PROGRAM, (GLint *)&prevProgram);
       // while(glGetError());
 
@@ -1233,6 +1233,16 @@ public:
       orderBarrierMask = 0;
 
       updateCount++;
+
+      if(flags.prehistoricOpenGL)
+      {
+         glMatrixMode(GL_PROJECTION);
+         glLoadMatrixf(matrix);
+
+         glMatrixMode(GL_MODELVIEW);
+         glLoadIdentity();
+         glScalef(4,4,4);
+      }
    }
 
    void drawImage( DMImage image, int offsetx, int offsety, int sizex, int sizey, uint32 color )

diff --git a/ecere/src/gfx/newFonts/fontRenderer.ec b/ecere/src/gfx/newFonts/fontRenderer.ec
index 0d76759..8acd718 100644 (file)
--- a/ecere/src/gfx/newFonts/fontRenderer.ec
+++ b/ecere/src/gfx/newFonts/fontRenderer.ec
@@ -106,12 +106,15 @@ public:
    {
      if(texture)
      {
+#ifdef SHADERS
         int glformat = GL_RED;
+#else
+        int glformat = GL_ALPHA;
+#endif
         int w = rect[2] - rect[0];
         int h = rect[3] - rect[1];
 
-        if( channelcount == 1 )
-          glformat = GL_RED;
+        if( channelcount == 1 );
         else if( channelcount == 2 )
           glformat = GL_RG;
         else if( channelcount == 3 )

diff --git a/ecere/src/gfx/newFonts/textureManager.ec b/ecere/src/gfx/newFonts/textureManager.ec
index cdca66f..a441b31 100644 (file)
--- a/ecere/src/gfx/newFonts/textureManager.ec
+++ b/ecere/src/gfx/newFonts/textureManager.ec
@@ -64,7 +64,13 @@ public:
      int glformat;
 
      if( image.format.bytesPerPixel == 1 )
+     {
+#ifdef SHADERS
        glformat = GL_RED;
+#else
+       glformat = GL_ALPHA;
+#endif
+     }
      else if( image.format.bytesPerPixel == 2 )
        glformat = GL_RG;
      else if( image.format.bytesPerPixel == 3 )