mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 02:15:43 -04:00
Fix some compile warnings
This commit is contained in:
parent
1974b3e692
commit
bf26cecb32
@ -1492,11 +1492,15 @@ cg_compile_entry_point(const char *entry, const ShaderCaps &caps,
|
|||||||
compiler_args[nargs++] = "ATI_draw_buffers";
|
compiler_args[nargs++] = "ATI_draw_buffers";
|
||||||
}
|
}
|
||||||
|
|
||||||
char version_arg[16];
|
string version_arg;
|
||||||
if (!cg_glsl_version.empty() && cgGetProfileProperty((CGprofile) active, CG_IS_GLSL_PROFILE)) {
|
if (!cg_glsl_version.empty() && active != CG_PROFILE_UNKNOWN &&
|
||||||
snprintf(version_arg, 16, "version=%s", cg_glsl_version.c_str());
|
cgGetProfileProperty((CGprofile) active, CG_IS_GLSL_PROFILE)) {
|
||||||
|
|
||||||
|
version_arg = "version=";
|
||||||
|
version_arg += cg_glsl_version;
|
||||||
|
|
||||||
compiler_args[nargs++] = "-po";
|
compiler_args[nargs++] = "-po";
|
||||||
compiler_args[nargs++] = version_arg;
|
compiler_args[nargs++] = version_arg.c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
compiler_args[nargs] = 0;
|
compiler_args[nargs] = 0;
|
||||||
|
@ -514,9 +514,8 @@ INLINE_LINMATH size_t FLOATNAME(LVecBase2)::
|
|||||||
add_hash(size_t hash) const {
|
add_hash(size_t hash) const {
|
||||||
TAU_PROFILE("size_t LVecBase2::add_hash(size_t)", " ", TAU_USER);
|
TAU_PROFILE("size_t LVecBase2::add_hash(size_t)", " ", TAU_USER);
|
||||||
#ifdef FLOATTYPE_IS_INT
|
#ifdef FLOATTYPE_IS_INT
|
||||||
int_hash ihasher;
|
hash = int_hash::add_hash(hash, _v(0));
|
||||||
hash = ihasher.add_hash(hash, _v(0));
|
hash = int_hash::add_hash(hash, _v(1));
|
||||||
hash = ihasher.add_hash(hash, _v(1));
|
|
||||||
return hash;
|
return hash;
|
||||||
#else
|
#else
|
||||||
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
||||||
|
@ -674,10 +674,9 @@ INLINE_LINMATH size_t FLOATNAME(LVecBase3)::
|
|||||||
add_hash(size_t hash) const {
|
add_hash(size_t hash) const {
|
||||||
TAU_PROFILE("size_t LVecBase3::add_hash(size_t)", " ", TAU_USER);
|
TAU_PROFILE("size_t LVecBase3::add_hash(size_t)", " ", TAU_USER);
|
||||||
#ifdef FLOATTYPE_IS_INT
|
#ifdef FLOATTYPE_IS_INT
|
||||||
int_hash ihasher;
|
hash = int_hash::add_hash(hash, _v(0));
|
||||||
hash = ihasher.add_hash(hash, _v(0));
|
hash = int_hash::add_hash(hash, _v(1));
|
||||||
hash = ihasher.add_hash(hash, _v(1));
|
hash = int_hash::add_hash(hash, _v(2));
|
||||||
hash = ihasher.add_hash(hash, _v(2));
|
|
||||||
return hash;
|
return hash;
|
||||||
#else
|
#else
|
||||||
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
||||||
|
@ -663,11 +663,10 @@ INLINE_LINMATH size_t FLOATNAME(LVecBase4)::
|
|||||||
add_hash(size_t hash) const {
|
add_hash(size_t hash) const {
|
||||||
TAU_PROFILE("size_t LVecBase4::add_hash(size_t)", " ", TAU_USER);
|
TAU_PROFILE("size_t LVecBase4::add_hash(size_t)", " ", TAU_USER);
|
||||||
#ifdef FLOATTYPE_IS_INT
|
#ifdef FLOATTYPE_IS_INT
|
||||||
int_hash ihasher;
|
hash = int_hash::add_hash(hash, _v(0));
|
||||||
hash = ihasher.add_hash(hash, _v(0));
|
hash = int_hash::add_hash(hash, _v(1));
|
||||||
hash = ihasher.add_hash(hash, _v(1));
|
hash = int_hash::add_hash(hash, _v(2));
|
||||||
hash = ihasher.add_hash(hash, _v(2));
|
hash = int_hash::add_hash(hash, _v(3));
|
||||||
hash = ihasher.add_hash(hash, _v(3));
|
|
||||||
return hash;
|
return hash;
|
||||||
#else
|
#else
|
||||||
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
return add_hash(hash, NEARLY_ZERO(FLOATTYPE));
|
||||||
|
@ -227,7 +227,7 @@ BMPreadinfoheader(
|
|||||||
* for the required total.
|
* for the required total.
|
||||||
*/
|
*/
|
||||||
if (classv != C_OS2) {
|
if (classv != C_OS2) {
|
||||||
for (int i = 0; i < cbFix - 16; i += 4) {
|
for (int i = 0; i < (int)cbFix - 16; i += 4) {
|
||||||
GetLong(fp);
|
GetLong(fp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -650,10 +650,10 @@ writePackedRawRow(ostream * const fileP,
|
|||||||
const unsigned char * const packed_bits,
|
const unsigned char * const packed_bits,
|
||||||
int const cols) {
|
int const cols) {
|
||||||
|
|
||||||
int bytesWritten;
|
|
||||||
fileP->write((const char *)packed_bits, pbm_packed_bytes(cols));
|
fileP->write((const char *)packed_bits, pbm_packed_bytes(cols));
|
||||||
if (fileP->fail())
|
if (fileP->fail()) {
|
||||||
pm_error("I/O error writing packed row to raw PBM file.");
|
pm_error("I/O error writing packed row to raw PBM file.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -45,7 +45,8 @@ get_context() const {
|
|||||||
context->AddReference();
|
context->AddReference();
|
||||||
return py_context.ptr();
|
return py_context.ptr();
|
||||||
|
|
||||||
} catch (const python::error_already_set& e) {
|
} catch (const python::error_already_set &e) {
|
||||||
|
(void)e;
|
||||||
// Return NULL, which will trigger the exception in Python
|
// Return NULL, which will trigger the exception in Python
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user