Changeset 2962 for trunk/src/opengl/mesa/blend.c

Timestamp:

Mar 1, 2000, 7:50:02 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/blend.c (modified) (8 diffs)

trunk/src/opengl/mesa/blend.c

@@ -1 @@
-/* $Id: blend.c,v 1.1 2000-02-29 00:49:59 sandervl Exp $ */
+/* $Id: blend.c,v 1.2 2000-03-01 18:49:23 jeroen Exp $ */
 
 /*
@@ -275 +275 @@
  * Common transparency blending mode.
  */
-static void blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_transparency( GLcontext *ctx, GLuint n, const GLubyte mask[],
                                 GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -320 +320 @@
  * Add src and dest.
  */
-static void blend_add( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_add( GLcontext *ctx, GLuint n, const GLubyte mask[],
                        GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -348 +348 @@
  * Blend min function  (for GL_EXT_blend_minmax)
  */
-static void blend_min( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_min( GLcontext *ctx, GLuint n, const GLubyte mask[],
                        GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -370 +370 @@
  * Blend max function  (for GL_EXT_blend_minmax)
  */
-static void blend_max( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_max( GLcontext *ctx, GLuint n, const GLubyte mask[],
                        GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -392 +392 @@
  * Modulate:  result = src * dest
  */
-static void blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_modulate( GLcontext *ctx, GLuint n, const GLubyte mask[],
                             GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -421 +421 @@
  * Input:  dest - the pixels from the dest color buffer
  */
-static void blend_general( GLcontext *ctx, GLuint n, const GLubyte mask[],
+static void __cdecl blend_general( GLcontext *ctx, GLuint n, const GLubyte mask[],
                            GLubyte rgba[][4], CONST GLubyte dest[][4] )
 {
@@ -481 +481 @@
                break;
             case GL_SRC_ALPHA_SATURATE:
+#ifdef __WIN32OS2__
+               if(As < 255 - Ad) {
+#else
                if (As < 1.0F - (GLfloat) Ad * ascale) {
+#endif
                   sR = sG = sB = (GLfloat) As * ascale;
                }