diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-05 07:36:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-05 07:36:16 +0100 |
| commit | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (patch) | |
| tree | 24c2eebc8ef3536e89b355b099d844083646d190 /mesalib/src/mesa/main/queryobj.c | |
| parent | 67c290de36ddc1caae94c0892157ac16b90e4f99 (diff) | |
| download | vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.tar.gz vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.tar.bz2 vcxsrv-1cc98f5a48924d750fbef7ea6b05a1ba49c28589.zip | |
xserver mesa xkbcomp git update 5 nov 2012
xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a
mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072
xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
Diffstat (limited to 'mesalib/src/mesa/main/queryobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/queryobj.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index d21691328..1e39adc49 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -321,13 +321,19 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) q = _mesa_lookup_query_object(ctx, id); if (!q) { - /* create new object */ - q = ctx->Driver.NewQueryObject(ctx, id); - if (!q) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}"); + if (ctx->API == API_OPENGL_CORE) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "glBeginQuery{Indexed}(non-gen name)"); return; + } else { + /* create new object */ + q = ctx->Driver.NewQueryObject(ctx, id); + if (!q) { + _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}"); + return; + } + _mesa_HashInsert(ctx->Query.QueryObjects, id, q); } - _mesa_HashInsert(ctx->Query.QueryObjects, id, q); } else { /* pre-existing object */ |