summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/i915/intel_ioctl.c4
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c
index 9691627ebc3..83bb77f3851 100644
--- a/src/mesa/drivers/dri/i915/intel_ioctl.c
+++ b/src/mesa/drivers/dri/i915/intel_ioctl.c
@@ -45,7 +45,7 @@
static int intelEmitIrqLocked( intelContextPtr intel )
{
drmI830IrqEmit ie;
- int ret, seq;
+ int ret, seq = 0;
assert(((*(int *)intel->driHwLock) & ~DRM_LOCK_CONT) ==
(DRM_LOCK_HELD|intel->hHWContext));
@@ -398,7 +398,7 @@ void intelClear(GLcontext *ctx, GLbitfield mask, GLboolean all,
void *intelAllocateAGP( intelContextPtr intel, GLsizei size )
{
- int region_offset;
+ int region_offset = 0;
drmI830MemAlloc alloc;
int ret;
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 06caa1a6bea..082c36b88e1 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -81,7 +81,7 @@ static GLboolean intelInitDriver(__DRIscreenPrivate *sPriv)
/* Allocate the private area */
- intelScreen = (intelScreenPrivate *)MALLOC(sizeof(intelScreenPrivate));
+ intelScreen = (intelScreenPrivate *)CALLOC(sizeof(intelScreenPrivate));
if (!intelScreen) {
fprintf(stderr,"\nERROR! Allocating private area failed\n");
return GL_FALSE;