diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 05:09:51 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-12-18 05:09:51 +0000 |
| commit | a340c4f6ef7395ac0b15f10c76d4c77db83b7d62 (patch) | |
| tree | 47a274ba153f830a502e210fb794ff6eb2ab05b0 | |
| parent | 781f27575c9753ffd85bfd852c5e91f287b92cd9 (diff) | |
disable blocks of GGI code so it at least compiles instead of bombingmesa_4_0_1
| -rw-r--r-- | src/mesa/drivers/ggi/default/linear.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/ggi/default/stubs.c | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/ggi/ggimesa.c | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/drivers/ggi/default/linear.c b/src/mesa/drivers/ggi/default/linear.c index e105cd0e59..60d4a3d4f5 100644 --- a/src/mesa/drivers/ggi/default/linear.c +++ b/src/mesa/drivers/ggi/default/linear.c @@ -295,7 +295,7 @@ void GGIread_rgba_pixels(const GLcontext *ctx, int GGIsetup_driver(GGIMesaContext ggictx, struct ggi_mesa_info *info) { GLcontext *ctx = ggictx->gl_ctx; - +#if 0 ctx->Driver.WriteRGBASpan = GGIwrite_rgba_span; ctx->Driver.WriteRGBSpan = GGIwrite_rgb_span; // ctx->Driver.WriteMonoRGBASpan = GGIwrite_mono_span; @@ -312,7 +312,7 @@ int GGIsetup_driver(GGIMesaContext ggictx, struct ggi_mesa_info *info) ctx->Driver.ReadRGBASpan = GGIread_rgba_span; ctx->Driver.ReadCI32Pixels = GGIread_ci32_pixels; ctx->Driver.ReadRGBAPixels = GGIread_rgba_pixels; - +#endif info->red_bits = R; info->green_bits =G; info->blue_bits = B; diff --git a/src/mesa/drivers/ggi/default/stubs.c b/src/mesa/drivers/ggi/default/stubs.c index 07999276fb..5ae6bbeae8 100644 --- a/src/mesa/drivers/ggi/default/stubs.c +++ b/src/mesa/drivers/ggi/default/stubs.c @@ -33,6 +33,7 @@ #include "swrast/s_context.h" #include "swrast/s_depth.h" #include "swrast/s_triangle.h" +#include "swrast/s_trispan.h" /**********************************************************************/ /***** Write spans of pixels *****/ @@ -303,7 +304,7 @@ static swrast_tri_func ggimesa_stubs_get_triangle_func(GLcontext *ctx); int GGIsetup_driver(GGIMesaContext ggictx, struct ggi_mesa_info *info) { GLcontext *ctx = ggictx->gl_ctx; - +#if 0 ctx->Driver.WriteRGBASpan = GGIwrite_rgba_span; ctx->Driver.WriteRGBSpan = GGIwrite_rgb_span; ctx->Driver.WriteRGBAPixels = GGIwrite_rgba_pixels; @@ -316,13 +317,15 @@ int GGIsetup_driver(GGIMesaContext ggictx, struct ggi_mesa_info *info) ctx->Driver.ReadRGBASpan = GGIread_rgba_span; ctx->Driver.ReadCI32Pixels = GGIread_ci32_pixels; ctx->Driver.ReadRGBAPixels = GGIread_rgba_pixels; - +#endif return 0; } void GGIupdate_state(GLcontext *ctx) { +#if 0 ctx->Driver.TriangleFunc = _swsetup_Triangle; +#endif } diff --git a/src/mesa/drivers/ggi/ggimesa.c b/src/mesa/drivers/ggi/ggimesa.c index 2674fee3b1..a0409a0b82 100644 --- a/src/mesa/drivers/ggi/ggimesa.c +++ b/src/mesa/drivers/ggi/ggimesa.c @@ -224,6 +224,7 @@ static void gl_ggiSetupPointers(GLcontext *ctx) ctx->Driver.ColorMask = gl_ggiColorMask; ctx->Driver.Enable = gl_ggiEnable; +#if 0 ctx->Driver.SetDrawBuffer = gl_ggiSetDrawBuffer; ctx->Driver.SetReadBuffer = gl_ggiSetReadBuffer; @@ -239,7 +240,7 @@ static void gl_ggiSetupPointers(GLcontext *ctx) ctx->Driver.LineFunc = _swsetup_Line; ctx->Driver.TriangleFunc = _swsetup_Triangle; ctx->Driver.QuadFunc = _swsetup_Quad; - +#endif } static int gl_ggiInitInfo(GGIMesaContext ctx, struct ggi_mesa_info *info) |