C++ fixes, mostly casts (Stephane Conversy)

diff --git a/configs/darwin b/configs/darwin
index 0c8a6ec47a74b1123d3cd07d33376ef7176d5b37..5abd16448bef83192cd160d40a90647c2560e9e0 100644 (file)
--- a/configs/darwin
+++ b/configs/darwin
@@ -5,11 +5,13 @@ include $(TOP)/configs/default
 CONFIG_NAME = darwin
 
 # Compiler and flags
-CC = cc
-CXX = cc
+CC = c++
+CXX = c++
 CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
 
+MKLIB_OPTIONS = -cplusplus
+
 # Library names (actual file names)
 GL_LIB_NAME = libGL.dylib
 GLU_LIB_NAME = libGLU.dylib

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 1933fed0673ed3d5c3e8b381a330cd5521187266..24fc6fe6abea85f369d4523e29e5eb9e5a9867db 100644 (file)
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -345,7 +345,7 @@ save_glx_visual( Display *dpy, XVisualInfo *vinfo,
        */
       xmvis->vishandle = vinfo;
       /* Allocate more space for additional visual */
-      VisualTable = _mesa_realloc( VisualTable, 
+      VisualTable = (XMesaVisual *) _mesa_realloc( VisualTable, 
                                    sizeof(XMesaVisual) * NumVisuals, 
                                    sizeof(XMesaVisual) * (NumVisuals + 1));
       /* add xmvis to the list */

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index a92db42bfd0c465b0c020441d8231633d0e907e1..711464aab29419e837731d12744dfa1dcec4b275 100644 (file)
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -998,7 +998,7 @@ create_new_program(struct state_key *key, GLcontext *ctx,
    p.program = program;
 
    p.program->Base.Instructions =
-      _mesa_malloc(sizeof(struct prog_instruction) * MAX_INSTRUCTIONS);
+      (struct prog_instruction*) _mesa_malloc(sizeof(struct prog_instruction) * MAX_INSTRUCTIONS);
    p.program->Base.NumInstructions = 0;
    p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
    p.program->NumTexIndirections = 1;  /* correct? */

diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 09b1caeaaeb3b4bb008ac74cc8aceac726d9f8d8..a64360adbe37cfe35d28e701beee7b98f20cf295 100644 (file)
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -2488,7 +2488,7 @@ parse_src_reg (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
                   return 1;
                }
 
-               *File = src->param_binding_type;
+               *File = (enum register_file) src->param_binding_type;
 
                switch (*(*inst)++) {
                   case ARRAY_INDEX_ABSOLUTE:
@@ -2536,7 +2536,7 @@ parse_src_reg (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
                if (parse_param_use (ctx, inst, vc_head, Program, &src))
                   return 1;
 
-               *File = src->param_binding_type;
+               *File = (enum register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
          }
@@ -2563,7 +2563,7 @@ parse_src_reg (GLcontext * ctx, GLubyte ** inst, struct var_cache **vc_head,
 
                /* XXX: We have to handle offsets someplace in here!  -- or are those above? */
             case vt_param:
-               *File = src->param_binding_type;
+               *File = (enum register_file) src->param_binding_type;
                *Index = src->param_binding_begin;
                break;
 
@@ -4056,7 +4056,7 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
    GLuint i;
 
    ASSERT(target == GL_FRAGMENT_PROGRAM_ARB);
-   if (!_mesa_parse_arb_program(ctx, target, str, len, &ap)) {
+   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len, &ap)) {
       /* Error in the program. Just return. */
       return;
    }
@@ -4108,7 +4108,7 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
 
    ASSERT(target == GL_VERTEX_PROGRAM_ARB);
 
-   if (!_mesa_parse_arb_program(ctx, target, str, len, &ap)) {
+   if (!_mesa_parse_arb_program(ctx, target, (const GLubyte*) str, len, &ap)) {
       /* Error in the program. Just return. */
       return;
    }

diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index e56bf589fbb0529320a666ea03c1db0856755e3d..95d3e42ef7001fc83466e542436aeba5b11eb0f6 100644 (file)
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1213,7 +1213,7 @@ Parse_PrintInstruction(struct parse_state *parseState,
    for (len = 0; str[len] != '\''; len++) /* find closing quote */
       ;
    parseState->pos += len + 1;
-   msg = _mesa_malloc(len + 1);
+   msg = (GLubyte*) _mesa_malloc(len + 1);
 
    _mesa_memcpy(msg, str, len);
    msg[len] = 0;

diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index fc44a49d4c7683096677c120ea22d5971882a52a..7aac631934a337148ed1ba2fe93730788d472308 100644 (file)
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -1048,7 +1048,7 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
    for (len = 0; str[len] != '\''; len++) /* find closing quote */
       ;
    parseState->pos += len + 1;
-   msg = _mesa_malloc(len + 1);
+   msg = (GLubyte*) _mesa_malloc(len + 1);
 
    _mesa_memcpy(msg, str, len);
    msg[len] = 0;

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index c668ce8a5a081782241c6a81b611c8eaf18e5c26..4e8dacea7e328212f969fb53c74af138ca73f0c9 100644 (file)
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -369,7 +369,7 @@ add_parameter(struct program_parameter_list *paramList,
                       paramList->Size * sizeof(struct program_parameter));
 
       tmp = paramList->ParameterValues;
-      paramList->ParameterValues = ALIGN_MALLOC(paramList->Size * 4 * sizeof(GLfloat), 16);
+      paramList->ParameterValues = (GLfloat(*)[4]) ALIGN_MALLOC(paramList->Size * 4 * sizeof(GLfloat), 16);
       if (tmp) {
         _mesa_memcpy(paramList->ParameterValues, tmp, 
                      n * 4 * sizeof(GLfloat));
@@ -1153,17 +1153,17 @@ make_state_string(const GLint state[6])
    char tmp[30];
 
    append(str, "state.");
-   append_token(str, state[0]);
+   append_token(str, (enum state_index) state[0]);
 
    switch (state[0]) {
    case STATE_MATERIAL:
       append_face(str, state[1]);
-      append_token(str, state[2]);
+      append_token(str, (enum state_index) state[2]);
       break;
    case STATE_LIGHT:
       append(str, "light");
       append_index(str, state[1]); /* light number [i]. */
-      append_token(str, state[2]); /* coefficients */
+      append_token(str, (enum state_index) state[2]); /* coefficients */
       break;
    case STATE_LIGHTMODEL_AMBIENT:
       append(str, "lightmodel.ambient");
@@ -1179,11 +1179,11 @@ make_state_string(const GLint state[6])
    case STATE_LIGHTPROD:
       append_index(str, state[1]); /* light number [i]. */
       append_face(str, state[2]);
-      append_token(str, state[3]);
+      append_token(str, (enum state_index) state[3]);
       break;
    case STATE_TEXGEN:
       append_index(str, state[1]); /* tex unit [i] */
-      append_token(str, state[2]); /* plane coef */
+      append_token(str, (enum state_index) state[2]); /* plane coef */
       break;
    case STATE_TEXENV_COLOR:
       append_index(str, state[1]); /* tex unit [i] */
@@ -1206,11 +1206,11 @@ make_state_string(const GLint state[6])
          /* state[3] = first column to fetch */
          /* state[4] = last column to fetch */
          /* state[5] = transpose, inverse or invtrans */
-         const enum state_index mat = state[1];
+         const enum state_index mat = (enum state_index) state[1];
          const GLuint index = (GLuint) state[2];
          const GLuint first = (GLuint) state[3];
          const GLuint last = (GLuint) state[4];
-         const enum state_index modifier = state[5];
+         const enum state_index modifier = (enum state_index) state[5];
          append_token(str, mat);
          if (index)
             append_index(str, index);
@@ -1229,7 +1229,7 @@ make_state_string(const GLint state[6])
    case STATE_VERTEX_PROGRAM:
       /* state[1] = {STATE_ENV, STATE_LOCAL} */
       /* state[2] = parameter index          */
-      append_token(str, state[1]);
+      append_token(str, (enum state_index) state[1]);
       append_index(str, state[2]);
       break;
    case STATE_INTERNAL:
@@ -1523,7 +1523,7 @@ static void
 print_dst_reg(const struct prog_dst_register *dstReg)
 {
    _mesa_printf(" %s[%d]%s",
-                program_file_string(dstReg->File),
+                program_file_string((enum register_file) dstReg->File),
                 dstReg->Index,
                 writemask_string(dstReg->WriteMask));
 }
@@ -1532,7 +1532,7 @@ static void
 print_src_reg(const struct prog_src_register *srcReg)
 {
    _mesa_printf("%s[%d]%s",
-                program_file_string(srcReg->File),
+                program_file_string((enum register_file) srcReg->File),
                 srcReg->Index,
                 swizzle_string(srcReg->Swizzle,
                                srcReg->NegateBase, GL_FALSE));
@@ -1551,7 +1551,7 @@ _mesa_print_instruction(const struct prog_instruction *inst)
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
          _mesa_printf(", ");
          _mesa_printf("%s[%d]%s",
-                      program_file_string(inst->SrcReg[0].File),
+                      program_file_string((enum register_file) inst->SrcReg[0].File),
                       inst->SrcReg[0].Index,
                       swizzle_string(inst->SrcReg[0].Swizzle,
                                      inst->SrcReg[0].NegateBase, GL_FALSE));
@@ -1564,7 +1564,7 @@ _mesa_print_instruction(const struct prog_instruction *inst)
          _mesa_printf("_SAT");
       print_dst_reg(&inst->DstReg);
       _mesa_printf("%s[%d], %s;\n",
-                   program_file_string(inst->SrcReg[0].File),
+                   program_file_string((enum register_file) inst->SrcReg[0].File),
                    inst->SrcReg[0].Index,
                    swizzle_string(inst->SrcReg[0].Swizzle,
                                   inst->SrcReg[0].NegateBase, GL_TRUE));
@@ -1611,7 +1611,7 @@ _mesa_print_instruction(const struct prog_instruction *inst)
 
          if (inst->DstReg.File != PROGRAM_UNDEFINED) {
             _mesa_printf(" %s[%d]%s",
-                         program_file_string(inst->DstReg.File),
+                         program_file_string((enum register_file) inst->DstReg.File),
                          inst->DstReg.Index,
                          writemask_string(inst->DstReg.WriteMask));
          }

diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index 27a77b14af7e21b24368b03656eae5cb099e0608..8a2d08b58eacc0321930f9de2bdaededda933ebb 100644 (file)
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -1136,7 +1136,7 @@ _swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span )
          zbuffer = zbuffer16;
       }
       else {
-         zbuffer = rb->GetPointer(ctx, rb, span->x, span->y);
+         zbuffer = (GLushort*) rb->GetPointer(ctx, rb, span->x, span->y);
          if (!zbuffer) {
             rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer16);
             zbuffer = zbuffer16;
@@ -1163,7 +1163,7 @@ _swrast_depth_bounds_test( GLcontext *ctx, struct sw_span *span )
          zbuffer = zbuffer32;
       }
       else {
-         zbuffer = rb->GetPointer(ctx, rb, span->x, span->y);
+         zbuffer = (GLuint*) rb->GetPointer(ctx, rb, span->x, span->y);
          if (!zbuffer) {
             rb->GetRow(ctx, rb, count, span->x, span->y, zbuffer32);
             zbuffer = zbuffer32;

diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index effe4a6a52fc1201fee1988e28b7434f1c043bbc..1c78f848e137072972ae59f105353f4416a951b6 100644 (file)
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -426,7 +426,7 @@ stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span, GLuint face)
    }
 #endif
 
-   stencil = rb->GetPointer(ctx, rb, x, y);
+   stencil = (GLstencil *) rb->GetPointer(ctx, rb, x, y);
    if (!stencil) {
       rb->GetRow(ctx, rb, n, x, y, stencilRow);
       stencil = stencilRow;
@@ -1173,7 +1173,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
          if (rb->DataType == GL_UNSIGNED_BYTE) {
             GLint i, j;
             for (i = 0; i < height; i++) {
-               GLubyte *stencil = rb->GetPointer(ctx, rb, x, y + i);
+               GLubyte *stencil = (GLubyte*) rb->GetPointer(ctx, rb, x, y + i);
                for (j = 0; j < width; j++) {
                   stencil[j] = (stencil[j] & invMask) | clearVal;
                }
@@ -1182,7 +1182,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
          else {
             GLint i, j;
             for (i = 0; i < height; i++) {
-               GLushort *stencil = rb->GetPointer(ctx, rb, x, y + i);
+               GLushort *stencil = (GLushort*) rb->GetPointer(ctx, rb, x, y + i);
                for (j = 0; j < width; j++) {
                   stencil[j] = (stencil[j] & invMask) | clearVal;
                }
@@ -1194,7 +1194,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
          if (width == rb->Width && rb->DataType == GL_UNSIGNED_BYTE) {
             /* optimized case */
             /* Note: bottom-to-top raster assumed! */
-            GLubyte *stencil = rb->GetPointer(ctx, rb, x, y);
+            GLubyte *stencil = (GLubyte *) rb->GetPointer(ctx, rb, x, y);
             GLuint len = width * height * sizeof(GLubyte);
             _mesa_memset(stencil, clearVal, len);
          }
@@ -1207,7 +1207,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
                   _mesa_memset(stencil, clearVal, width);
                }
                else {
-                  _mesa_memset16(stencil, clearVal, width);
+                  _mesa_memset16((short unsigned int*) stencil, clearVal, width);
                }
             }
          }

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 30b2947323a356300d33320f0746957124ccf674..d9777bfe6d71cc8ed92750566cf914f697e5376b 100644 (file)
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -87,11 +87,11 @@ _tnl_CreateContext( GLcontext *ctx )
    _tnl_vtx_init( ctx );
 
    if (ctx->_MaintainTnlProgram) {
-      tnl->vp_cache = MALLOC(sizeof(*tnl->vp_cache));
+      tnl->vp_cache = (struct tnl_cache *) MALLOC(sizeof(*tnl->vp_cache));
       tnl->vp_cache->size = 5;
       tnl->vp_cache->n_items = 0;
-      tnl->vp_cache->items = MALLOC(tnl->vp_cache->size *
-                               sizeof(*tnl->vp_cache->items));
+      tnl->vp_cache->items = (struct tnl_cache_item**)
+         _mesa_malloc(tnl->vp_cache->size * sizeof(*tnl->vp_cache->items));
       _mesa_memset(tnl->vp_cache->items, 0, tnl->vp_cache->size *
                                sizeof(*tnl->vp_cache->items));
       

diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index da225b518eb10cf689db5119633d6e86d685764a..753f59257a04d3dcbc117f670f8b3b615577dea7 100644 (file)
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -563,7 +563,7 @@ struct tnl_clipspace_fastpath {
    GLuint attr_count;
    GLboolean match_strides;
 
-   struct {
+   struct attr_type {
       GLuint format;
       GLuint size;
       GLuint stride;

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 4aa2e80d5529f3b8be1d1063921cabdd8ba9e088..38182c1ba1ce493c769ba501895f68c842c1b4ee 100644 (file)
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -582,11 +582,11 @@ static void print_RSW( union instruction op )
 
 static void print_ALU( union instruction op )
 {
-   _mesa_printf("%s ", _mesa_opcode_string(op.alu.opcode));
+   _mesa_printf("%s ", _mesa_opcode_string((enum prog_opcode) op.alu.opcode));
    print_reg(0, op.alu.dst);
    _mesa_printf(", ");
    print_reg(op.alu.file0, op.alu.idx0);
-   if (_mesa_num_inst_src_regs(op.alu.opcode) > 1) {
+   if (_mesa_num_inst_src_regs((enum prog_opcode) op.alu.opcode) > 1) {
       _mesa_printf(", ");
       print_reg(op.alu.file1, op.alu.idx1);
    }
@@ -1082,7 +1082,7 @@ static void cvp_emit_inst( struct compilation *cp,
 
 static void free_tnl_data( struct vertex_program *program  )
 {
-   struct tnl_compiled_program *p = program->TnlData;
+   struct tnl_compiled_program *p = (struct tnl_compiled_program *) program->TnlData;
    if (p->compiled_func)
       _mesa_free((void *)p->compiled_func);
    _mesa_free(p);
@@ -1460,7 +1460,7 @@ static GLboolean init_vertex_program( GLcontext *ctx,
     */
    m->VB = VB;
 
-   m->File[0] = ALIGN_MALLOC(REG_MAX * sizeof(GLfloat) * 4, 16);
+   m->File[0] = (GLfloat(*)[4])ALIGN_MALLOC(REG_MAX * sizeof(GLfloat) * 4, 16);
 
    /* Initialize regs where necessary:
     */

diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index ca3aad14046b5f9cec7e94eeb9af819042689032..b532a20142cca6b4a0832a1e58091c69f392139c 100644 (file)
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -87,7 +87,8 @@ void _tnl_register_fastpath( struct tnl_clipspace *vtx,
    fastpath->attr_count = vtx->attr_count;
    fastpath->match_strides = match_strides;
    fastpath->func = vtx->emit;
-   fastpath->attr = MALLOC(vtx->attr_count * sizeof(fastpath->attr[0]));
+   fastpath->attr = (struct attr_type *)
+      _mesa_malloc(vtx->attr_count * sizeof(fastpath->attr[0]));
 
    for (i = 0; i < vtx->attr_count; i++) {
       fastpath->attr[i].format = vtx->attr[i].format;
@@ -425,7 +426,7 @@ void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
 
    /* Note: dest should not be adjusted for non-zero 'start' values:
     */
-   vtx->emit( ctx, end - start, dest );        
+   vtx->emit( ctx, end - start, (GLubyte*) dest );     
    return (void *)((GLubyte *)dest + vtx->vertex_size * (end - start));
 }
 

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 77e105115c80eaef7d64bb2b5288a896b594e3df..7e28bbbc3c8b77687427a9ce8778d835a3149521 100644 (file)
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -514,7 +514,7 @@ static void emit_op3fn(struct tnl_program *p,
       return;
    }
       
-   inst->Opcode = op; 
+   inst->Opcode = (enum prog_opcode) op; 
    inst->StringPos = 0;
    inst->Data = 0;
    
@@ -1406,7 +1406,7 @@ create_new_program( const struct state_key *key,
       p.temp_reserved = ~((1<<max_temps)-1);
 
    p.program->Base.Instructions
-      = MALLOC(sizeof(struct prog_instruction) * MAX_INSN);
+      = (struct prog_instruction*) MALLOC(sizeof(struct prog_instruction) * MAX_INSN);
    p.program->Base.String = 0;
    p.program->Base.NumInstructions =
    p.program->Base.NumTemporaries =
@@ -1441,7 +1441,7 @@ static void rehash( struct tnl_cache *cache )
    GLuint size, i;
 
    size = cache->size * 3;
-   items = MALLOC(size * sizeof(*items));
+   items = (struct tnl_cache_item**) _mesa_malloc(size * sizeof(*items));
    _mesa_memset(items, 0, size * sizeof(*items));
 
    for (i = 0; i < cache->size; i++)
@@ -1461,7 +1461,7 @@ static void cache_item( struct tnl_cache *cache,
                        void *key,
                        void *data )
 {
-   struct tnl_cache_item *c = MALLOC(sizeof(*c));
+   struct tnl_cache_item *c = (struct tnl_cache_item*) _mesa_malloc(sizeof(*c));
    c->hash = hash;
    c->key = key;
    c->data = data;